You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by pe...@apache.org on 2011/01/07 17:30:08 UTC
svn commit: r1056377 - in /wicket/trunk/wicket-core/src:
main/java/org/apache/wicket/markup/html/tree/AbstractTree.java
test/java/org/apache/wicket/markup/html/tree/
test/java/org/apache/wicket/markup/html/tree/TreeTest.java
Author: pedro
Date: Fri Jan 7 16:30:08 2011
New Revision: 1056377
URL: http://svn.apache.org/viewvc?rev=1056377&view=rev
Log:
Testing for not presented root nodes on root less trees
Issue: WICKET-3309
Added:
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/tree/
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/tree/TreeTest.java
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/tree/AbstractTree.java
Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/tree/AbstractTree.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/tree/AbstractTree.java?rev=1056377&r1=1056376&r2=1056377&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/tree/AbstractTree.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/tree/AbstractTree.java Fri Jan 7 16:30:08 2011
@@ -832,13 +832,17 @@ public abstract class AbstractTree exten
{
wasLeaf = eventChildren.contains(getChildAt(parentNode, i));
}
-
- if (wasLeaf)
+ // if parent was a leaf, testing if wasn't an not presented root
+ if (wasLeaf && !(parentItem.getParentItem() == null && isRootLess()))
{
- // parentNode now has children for the first time, so we need to invalidate
+ // parentNode now has children for the first time, so we may need to invalidate
// grandparent so that parentNode's junctionLink gets rebuilt with a plus/minus link
Object grandparentNode = getParentNode(parentNode);
- invalidateNodeWithChildren(grandparentNode);
+ // not invalidating if the grandparent is a not presented root
+ if (!(getParentNode(grandparentNode) == null && isRootLess()))
+ {
+ invalidateNodeWithChildren(grandparentNode);
+ }
getTreeState().expandNode(parentNode);
}
else
Added: wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/tree/TreeTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/tree/TreeTest.java?rev=1056377&view=auto
==============================================================================
--- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/tree/TreeTest.java (added)
+++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/tree/TreeTest.java Fri Jan 7 16:30:08 2011
@@ -0,0 +1,123 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.wicket.markup.html.tree;
+
+import javax.swing.tree.DefaultMutableTreeNode;
+import javax.swing.tree.DefaultTreeModel;
+
+import org.apache.wicket.MarkupContainer;
+import org.apache.wicket.WicketTestCase;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.markup.html.AjaxLink;
+import org.apache.wicket.markup.IMarkupResourceStreamProvider;
+import org.apache.wicket.markup.html.WebPage;
+import org.apache.wicket.util.resource.IResourceStream;
+import org.apache.wicket.util.resource.StringResourceStream;
+
+/**
+ * Test cases preventing the two related bugs at:
+ *
+ * @see <a href="https://issues.apache.org/jira/browse/WICKET-3309">WICKET-3309</a>
+ * @author Pedro Santos
+ */
+public class TreeTest extends WicketTestCase
+{
+
+ /**
+ * Asserting that {@link AbstractTree#treeNodesInserted(javax.swing.event.TreeModelEvent)} adds
+ * the new item to the dirtyItemsCreateDOM, since there is no parent node at client to be
+ * recreated.
+ */
+ public void testAddChildOnRootAtAnOnRootLessTree()
+ {
+ TestPage testPage = new TestPage();
+ testPage.tree.setRootLess(true);
+ tester.startPage(testPage);
+ tester.clickLink("addToRoot", true);
+ assertTrue(tester.getLastResponseAsString().contains("rootChild"));
+ }
+
+ /**
+ * Asserting that {@link AbstractTree#treeNodesInserted(javax.swing.event.TreeModelEvent)} don't
+ * add and not presented node to the AJAX response by invalidating it.
+ */
+ public void testAddGrandchildOnRootAtAnRootLessTree()
+ {
+ TestPage testPage = new TestPage();
+ testPage.tree.setRootLess(true);
+ DefaultMutableTreeNode rootChild = new DefaultMutableTreeNode("rootChild");
+ testPage.rootNode.add(rootChild);
+ testPage.tree.getTreeState().selectNode(rootChild, true);
+ tester.startPage(testPage);
+ tester.clickLink("addChildToSelected", true);
+ assertTrue(tester.getLastResponseAsString().contains("newNode"));
+ }
+
+ /** */
+ public static class TestPage extends WebPage implements IMarkupResourceStreamProvider
+ {
+ AbstractTree tree;
+ DefaultTreeModel treeModel;
+ DefaultMutableTreeNode rootNode;
+
+ /** */
+ public TestPage()
+ {
+ rootNode = new DefaultMutableTreeNode("ROOT");
+ treeModel = new DefaultTreeModel(rootNode);
+ tree = new LinkTree("tree", treeModel);
+ add(tree);
+ add(new AjaxLink<Void>("addToRoot")
+ {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public void onClick(AjaxRequestTarget target)
+ {
+ DefaultMutableTreeNode child = new DefaultMutableTreeNode("rootChild");
+ treeModel.insertNodeInto(child, rootNode, rootNode.getChildCount());
+ tree.updateTree(target);
+ }
+ });
+ add(new AjaxLink<Void>("addChildToSelected")
+ {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public void onClick(AjaxRequestTarget target)
+ {
+ DefaultMutableTreeNode selectedNode = (DefaultMutableTreeNode)tree.getTreeState()
+ .getSelectedNodes()
+ .iterator()
+ .next();
+ treeModel.insertNodeInto(new DefaultMutableTreeNode("newNode"), selectedNode,
+ selectedNode.getChildCount());
+ tree.updateTree(target);
+ }
+ });
+ }
+
+ public IResourceStream getMarkupResourceStream(MarkupContainer container,
+ Class<?> containerClass)
+ {
+ return new StringResourceStream("<html><body>" + "<div wicket:id=\"tree\"></div>"
+ + "<a wicket:id=\"addToRoot\"></a><a wicket:id=\"addChildToSelected\"></a>"
+ + "</body></html>");
+ }
+
+ }
+}