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

@@ -55,10 +55,11 @@
 import javafx.css.converter.BooleanConverter;
 import com.sun.javafx.geom.BaseBounds;
 import com.sun.javafx.geom.transform.BaseTransform;
 import com.sun.javafx.jmx.MXNodeAlgorithm;
 import com.sun.javafx.jmx.MXNodeAlgorithmContext;
+import com.sun.javafx.scene.NodeHelper;
 import javafx.css.CompoundSelector;
 import javafx.css.CssMetaData;
 import javafx.css.CssParser;
 import javafx.css.Declaration;
 import javafx.css.DeclarationShim;

@@ -217,24 +218,10 @@
      */
     @Test
     public void testEquals() {
         TestNode testNode = new TestNode();
         Node node = new Node() {
-            @Override
-            public BaseBounds impl_computeGeomBounds(BaseBounds bb, BaseTransform bt) {
-                throw new UnsupportedOperationException("Not supported yet.");
-            }
-
-            @Override
-            protected boolean impl_computeContains(double d, double d1) {
-                throw new UnsupportedOperationException("Not supported yet.");
-            }
-
-            @Override
-            public Object impl_processMXNode(MXNodeAlgorithm mxna, MXNodeAlgorithmContext mxnac) {
-                throw new UnsupportedOperationException("Not supported yet.");
-            }
         };
 
         CssMetaData testNodeOpacity = get(TestNode.getClassCssMetaData(), "-fx-opacity");
         CssMetaData nodeOpacity = get(Node.getClassCssMetaData(), "-fx-opacity");
 

@@ -356,11 +343,11 @@
         Stage stage = new Stage();
         stage.setScene(scene);
         stage.show();
 
         final CssMetaData FILL = get(rectangle.getCssMetaData(), "-fx-fill");
-        final List<Style> actuals = Node.impl_getMatchingStyles(FILL, rectangle);
+        final List<Style> actuals = NodeHelper.getMatchingStyles(FILL, rectangle);
 
         //        System.err.println("matchingStyles: " + matchingStyles);
         //        System.err.println("expecteds: " + expecteds);
         //        System.err.println("actuals: " + actuals);
 

@@ -476,11 +463,11 @@
         Stage stage = new Stage();
         stage.setScene(scene);
         stage.show();
 
         final CssMetaData FILL = get(rectangle.getCssMetaData(), "-fx-fill");
-        final List<Style> actuals = Node.impl_getMatchingStyles(FILL, rectangle);
+        final List<Style> actuals = NodeHelper.getMatchingStyles(FILL, rectangle);
 
         //        System.err.println("matchingStyles: " + matchingStyles);
         //        System.err.println("expecteds: " + expecteds);
         //        System.err.println("actuals: " + actuals);
 

@@ -599,11 +586,11 @@
         Stage stage = new Stage();
         stage.setScene(scene);
         stage.show();
 
         final CssMetaData FILL = get(rectangle.getCssMetaData(), "-fx-fill");
-        final List<Style> actuals = Node.impl_getMatchingStyles(FILL, rectangle);
+        final List<Style> actuals = NodeHelper.getMatchingStyles(FILL, rectangle);
 
         //        System.err.println("matchingStyles: " + matchingStyles);
         //        System.err.println("expecteds: " + expecteds);
         //        System.err.println("actuals: " + actuals);
 

@@ -726,11 +713,11 @@
         Stage stage = new Stage();
         stage.setScene(scene);
         stage.show();
 
         final CssMetaData FILL = get(rectangle.getCssMetaData(), "-fx-fill");
-        final List<Style> actuals = Node.impl_getMatchingStyles(FILL, rectangle);
+        final List<Style> actuals = NodeHelper.getMatchingStyles(FILL, rectangle);
 
         //        System.err.println("matchingStyles: " + matchingStyles);
         //        System.err.println("expecteds: " + expecteds);
         //        System.err.println("actuals: " + actuals);
 

@@ -837,11 +824,11 @@
         Stage stage = new Stage();
         stage.setScene(scene);
         stage.show();
 
         final CssMetaData FILL = get(rectangle.getCssMetaData(), "-fx-fill");
-        final List<Style> actuals = Node.impl_getMatchingStyles(FILL, rectangle);
+        final List<Style> actuals = NodeHelper.getMatchingStyles(FILL, rectangle);
 
         //        System.err.println("matchingStyles: " + matchingStyles);
         //        System.err.println("expecteds: " + expecteds);
         //        System.err.println("actuals: " + actuals);
 

@@ -945,11 +932,11 @@
         Stage stage = new Stage();
         stage.setScene(scene);
         stage.show();
 
         final CssMetaData FILL = get(rectangle.getCssMetaData(), "-fx-fill");
-        final List<Style> actuals = Node.impl_getMatchingStyles(FILL, rectangle);
+        final List<Style> actuals = NodeHelper.getMatchingStyles(FILL, rectangle);
 
         //        System.err.println("matchingStyles: " + matchingStyles);
         //        System.err.println("expecteds: " + expecteds);
         //        System.err.println("actuals: " + actuals);
 

@@ -1024,11 +1011,11 @@
         Stage stage = new Stage();
         stage.setScene(scene);
         stage.show();
 
         final CssMetaData FONT = get(text.getCssMetaData(), "-fx-font");
-        final List<Style> actuals = Node.impl_getMatchingStyles(FONT, text);
+        final List<Style> actuals = NodeHelper.getMatchingStyles(FONT, text);
 
         //        System.err.println("matchingStyles: " + matchingStyles);
         //        System.err.println("expecteds: " + expecteds);
         //        System.err.println("actuals: " + actuals);
 

@@ -1108,11 +1095,11 @@
         Stage stage = new Stage();
         stage.setScene(scene);
         stage.show();
 
         final CssMetaData FONT = get(text.getCssMetaData(), "-fx-font");
-        final List<Style> actuals = Node.impl_getMatchingStyles(FONT, text);
+        final List<Style> actuals = NodeHelper.getMatchingStyles(FONT, text);
 
         //        System.err.println("matchingStyles: " + matchingStyles);
         //        System.err.println("expecteds: " + expecteds);
         //        System.err.println("actuals: " + actuals);
 

@@ -1293,11 +1280,11 @@
         Stage stage = new Stage();
         stage.setScene(scene);
         stage.show();
 
         CssMetaData prop = ((StyleableProperty)text.fillProperty()).getCssMetaData();
-        List list = Node.impl_getMatchingStyles(prop, text);
+        List list = NodeHelper.getMatchingStyles(prop, text);
 
         assertEquals(3, list.size(), 0);
 
     }