8221334: TableViewSkin: must initialize flow's cellCount in constructor

Reviewed-by: aghaisas
openjdk · Dec 6, 2019 · 07af89a · 07af89a
1 parent 4ddf554
commit 07af89a
Show file tree

Hide file tree

Showing 2 changed files with 113 additions and 0 deletions.
diff --git a/modules/javafx.controls/src/main/java/javafx/scene/control/skin/TableViewSkin.java b/modules/javafx.controls/src/main/java/javafx/scene/control/skin/TableViewSkin.java
@@ -133,6 +133,7 @@ public TableViewSkin(final TableView<T> control) {
 
         registerChangeListener(control.fixedCellSizeProperty(), e -> flow.setFixedCellSize(getSkinnable().getFixedCellSize()));
 
+        updateItemCount();
     }
 
 

diff --git a/...x.controls/src/test/java/test/javafx/scene/control/skin/ConcreteVirtualContainerTest.java b/...x.controls/src/test/java/test/javafx/scene/control/skin/ConcreteVirtualContainerTest.java
@@ -0,0 +1,112 @@
+/*
+ * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * 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.control.skin;
+
+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;
+import javafx.scene.control.TreeItem;
+import javafx.scene.control.TreeTableView;
+import javafx.scene.control.TreeView;
+import javafx.scene.control.skin.ListViewSkin;
+import javafx.scene.control.skin.TableViewSkin;
+import javafx.scene.control.skin.TreeTableViewSkin;
+import javafx.scene.control.skin.TreeViewSkin;
+
+/**
+ * Contains tests that should pass for all concrete implementations
+ * of VirtualContainerBase.
+ */
+public class ConcreteVirtualContainerTest {
+
+    /**
+     * Test for JDK-8221334: flow's cellCount must be initialized.
+     */
+    @Test
+    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());
+            }
+        });
+    }
+
+    @Test
+    public void testTreeTableSkinCellCountInitial() {
+        List<TreeItem<Locale>> treeItems = Arrays.stream(Locale.getAvailableLocales())
+                .map(TreeItem::new)
+                .collect(Collectors.toList());
+        TreeItem<Locale> root = new TreeItem<>(new Locale("dummy"));
+        root.setExpanded(true);
+        root.getChildren().addAll(treeItems);
+        TreeTableView<Locale> control = new TreeTableView<>(root);
+        control.setSkin(new TreeTableViewSkin<>(control) {
+            {
+                assertEquals("flow's cellCount must be initialized", treeItems.size() + 1,
+                        getVirtualFlow().getCellCount());
+            }
+        });
+    }
+
+    @Test
+    public void testTreeSkinCellCountInitial() {
+        List<TreeItem<Locale>> treeItems = Arrays.stream(Locale.getAvailableLocales())
+                .map(TreeItem::new)
+                .collect(Collectors.toList());
+        TreeItem<Locale> root = new TreeItem<>(new Locale("dummy"));
+        root.setExpanded(true);
+        root.getChildren().addAll(treeItems);
+        TreeView<Locale> control = new TreeView<>(root);
+        control.setSkin(new TreeViewSkin<>(control) {
+            {
+                assertEquals("flow's cellCount must be initialized", treeItems.size() +1,
+                        getVirtualFlow().getCellCount());
+            }
+        });
+    }
+
+    @Test
+    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());
+            }
+        });
+    }
+}