8239822: Intermittent unit test failures in RegionCSSTest

Reviewed-by: aghaisas

Author: kevinrushforth

modules/javafx.graphics/src/test/java/test/com/sun/javafx/css/StyleManagerTest.java

@@ -41,6 +41,7 @@
 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;
 
@@ -62,8 +63,7 @@ public class StyleManagerTest {
     public StyleManagerTest() {
     }
 
-    @Before
-    public void setUp() {
+    private static void resetStyleManager() {
         StyleManagerShim sm = StyleManagerShim.getInstance();
         sm.userAgentStylesheetContainers_clear();
         sm.platformUserAgentStylesheetContainers_clear();
@@ -72,6 +72,16 @@ public void setUp() {
         sm.set_hasDefaultUserAgentStylesheet(false);
     }
 
+    @Before
+    public void setUp() {
+        resetStyleManager();
+    }
+
+    @AfterClass
+    public static void cleanupOnce() {
+        resetStyleManager();
+    }
+
     @Test
     public void testMethod_getInstance() {
         Scene scene = new Scene(new Group());

modules/javafx.graphics/src/test/java/test/javafx/css/Node_cssStateTransition_Test.java

@@ -41,6 +41,7 @@
 import javafx.scene.shape.Rectangle;
 import static org.junit.Assert.*;
 
+import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -49,8 +50,7 @@ public class Node_cssStateTransition_Test {
     public Node_cssStateTransition_Test() {
     }
 
-    @Before
-    public void setUp() {
+    private static void resetStyleManager() {
         StyleManager sm = StyleManager.getInstance();
         sm.userAgentStylesheetContainers.clear();
         sm.platformUserAgentStylesheetContainers.clear();
@@ -59,6 +59,16 @@ public void setUp() {
         sm.hasDefaultUserAgentStylesheet = false;
     }
 
+    @Before
+    public void setUp() {
+        resetStyleManager();
+    }
+
+    @AfterClass
+    public static void cleanupOnce() {
+        resetStyleManager();
+    }
+
     @Test
     public void testPropertiesResetOnStyleclassChange() {
 

modules/javafx.graphics/src/test/java/test/javafx/scene/CssStyleHelperTest.java

@@ -40,6 +40,7 @@
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
+import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -49,19 +50,27 @@ public class CssStyleHelperTest {
     private Stage stage;
     private StackPane root;
 
+    private static void resetStyleManager() {
+        StyleManager sm = StyleManager.getInstance();
+        sm.userAgentStylesheetContainers.clear();
+        sm.platformUserAgentStylesheetContainers.clear();
+        sm.stylesheetContainerMap.clear();
+        sm.cacheContainerMap.clear();
+        sm.hasDefaultUserAgentStylesheet = false;
+    }
+
     @Before
     public void setup() {
         root = new StackPane();
         scene = new Scene(root);
         stage = new Stage();
         stage.setScene(scene);
+        resetStyleManager();
+    }
 
-        StyleManager sm = StyleManager.getInstance();
-        sm.userAgentStylesheetContainers.clear();
-        sm.platformUserAgentStylesheetContainers.clear();
-        sm.stylesheetContainerMap.clear();
-        sm.cacheContainerMap.clear();
-        sm.hasDefaultUserAgentStylesheet = false;
+    @AfterClass
+    public static void cleanupOnce() {
+        resetStyleManager();
     }
 
     @Test