--- old/modules/controls/src/test/java/test/javafx/scene/chart/BarChartTest.java 2016-07-27 13:44:34.107480400 +0300 +++ new/modules/controls/src/test/java/test/javafx/scene/chart/BarChartTest.java 2016-07-27 13:44:33.883467600 +0300 @@ -40,6 +40,7 @@ import javafx.scene.chart.XYChart.Series; import javafx.scene.chart.XYChartShim; import javafx.scene.layout.StackPane; +import org.junit.Ignore; public class BarChartTest extends XYChartTestBase { @@ -73,14 +74,12 @@ return bc; } + @Ignore("JDK-8162547") @Test public void testAddingCustomStyleClassToBarChartBarNodes() { startApp(); XYChart.Series series = new XYChart.Series(); - ObservableList> seriesData = series.getData(); - String xValue = "A"; - Number yValue = Integer.valueOf(20); - XYChart.Data item = new XYChart.Data(xValue, yValue); + XYChart.Data item = new XYChart.Data("A", 20); Node bar = item.getNode(); if (bar == null) { bar = new StackPane(); @@ -88,9 +87,9 @@ String myStyleClass = "my-style"; bar.getStyleClass().add(myStyleClass); item.setNode(bar); - seriesData.add(item); + series.getData().add(item); bc.getData().add(series); - assertEquals("my-style", bar.getStyleClass().get(0)); + checkStyleClass(bar, myStyleClass); } @Test @@ -142,4 +141,41 @@ s.getData().remove(0); assertEquals(2, XYChartShim.Series_getDataSize(s)); } + + @Override + ObservableList> createTestSeries() { + ObservableList> list = FXCollections.observableArrayList(); + for (int i = 0; i != 10; i++) { + XYChart.Series 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)); + series.getData().add(new XYChart.Data<>(Integer.toString(i*30), i*30)); + list.add(series); + } + return list; + } + + @Override + void checkSeriesStyleClasses(XYChart.Series series, + int seriesIndex, int colorIndex) { + // TODO: legend + } + + @Override + void checkDataStyleClasses(XYChart.Data data, + int seriesIndex, int dataIndex, int colorIndex) { + Node bar = data.getNode(); + checkStyleClass(bar, "series"+seriesIndex, "data"+dataIndex, "default-color"+colorIndex); + } + + @Test + public void testSeriesRemoveAnimatedStyleClasses() { + startApp(); + bc.getData().clear(); + xAxis.getCategories().clear(); + xAxis.setAutoRanging(true); + pulse(); + int nodesPerSeries = 3; // 3 bars + checkSeriesRemoveAnimatedStyleClasses(bc, nodesPerSeries, 700); + } }