< prev index next >

modules/controls/src/test/java/javafx/scene/chart/LineChartTest.java

Print this page
rev 8907 : RT-46086: StackedAreaChart doesn't fade out removed series

*** 23,57 **** * questions. */ package javafx.scene.chart; ! /** ! * ! * @author paru ! */ ! import org.junit.Test; ! import static org.junit.Assert.assertEquals; ! import javafx.collections.*; ! ! import com.sun.javafx.pgstub.StubToolkit; ! import com.sun.javafx.tk.Toolkit; ! import javafx.scene.Node; ! import javafx.scene.Scene; ! import javafx.scene.Group; ! import javafx.stage.Stage; ! import javafx.scene.shape.*; ! import org.junit.Ignore; ! public class LineChartTest extends XYChartTestBase { - private Scene scene; - private StubToolkit toolkit; - private Stage stage; LineChart<Number,Number> lineChart; final XYChart.Series<Number, Number> series1 = new XYChart.Series<Number, Number>(); @Override protected Chart createChart() { final NumberAxis xAxis = new NumberAxis(); --- 23,42 ---- * questions. */ package javafx.scene.chart; ! import com.sun.javafx.scene.control.infrastructure.ControlTestUtils; ! import javafx.collections.ObservableList; import javafx.scene.Node; ! import javafx.scene.shape.Path; ! import static org.junit.Assert.assertEquals; import org.junit.Ignore; ! import org.junit.Test; public class LineChartTest extends XYChartTestBase { LineChart<Number,Number> lineChart; final XYChart.Series<Number, Number> series1 = new XYChart.Series<Number, Number>(); @Override protected Chart createChart() { final NumberAxis xAxis = new NumberAxis();
*** 81,105 **** } return sb; } @Test ! public void testSeriesRemoveWithCreateSymbolsFalse() { startApp(); lineChart.getData().addAll(series1); pulse(); lineChart.setCreateSymbols(false); ! System.out.println("Line Path = "+getSeriesLineFromPlot()); ! if (!lineChart.getData().isEmpty()) { lineChart.getData().remove(0); pulse(); ! StringBuffer sb = getSeriesLineFromPlot(); ! assertEquals(sb.toString(), ""); } } ! @Test public void testCreateSymbols() { startApp(); lineChart.setCreateSymbols(false); pulse(); lineChart.getData().addAll(series1); pulse(); --- 66,124 ---- } return sb; } @Test ! public void testSeriesRemove() { startApp(); lineChart.getData().addAll(series1); pulse(); + // 5 symbols and 1 line node + assertEquals(6, lineChart.getPlotChildren().size()); + lineChart.getData().remove(0); + pulse(); + assertEquals(0, lineChart.getPlotChildren().size()); + } + + @Test + public void testSeriesRemoveWithoutSymbols() { + startApp(); lineChart.setCreateSymbols(false); ! lineChart.getData().addAll(series1); ! pulse(); ! // 1 line node ! assertEquals(1, lineChart.getPlotChildren().size()); lineChart.getData().remove(0); pulse(); ! assertEquals(0, lineChart.getPlotChildren().size()); } + + @Test + public void testSeriesRemoveWithoutSymbolsAnimated_rt_22124() { + startApp(); + lineChart.setCreateSymbols(false); + lineChart.getData().addAll(series1); + pulse(); + // 1 line node + assertEquals(1, lineChart.getPlotChildren().size()); + + lineChart.setAnimated(true); + Thread.UncaughtExceptionHandler exceptionHandler = ControlTestUtils.setHandler(); + try { + lineChart.getData().remove(0); + } finally { + ControlTestUtils.resetHandler(exceptionHandler); + } + toolkit.setAnimationTime(450); + assertEquals(1, lineChart.getPlotChildren().size()); + assertEquals(0.5, lineChart.getPlotChildren().get(0).getOpacity(), 0.0); + toolkit.setAnimationTime(900); + assertEquals(0, lineChart.getPlotChildren().size()); } ! @Test ! public void testCreateSymbols() { startApp(); lineChart.setCreateSymbols(false); pulse(); lineChart.getData().addAll(series1); pulse();
< prev index next >