Add Tree.htmlContentsAllowed (#7717)

Change-Id: I5c773da806b8358ee203c9c12fd2e2b6fec1970f

2 files changed, 124 insertions, 0 deletions

diff --git a/uitest/src/com/vaadin/tests/components/tree/TreeHtmlContentAllowed.java b/uitest/src/com/vaadin/tests/components/tree/TreeHtmlContentAllowed.java
new file mode 100644
index 0000000000..b20b7c3aab
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/tree/TreeHtmlContentAllowed.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2000-2014 Vaadin Ltd.
+ * 
+ * Licensed 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 com.vaadin.tests.components.tree;
+
+import com.vaadin.data.Property.ValueChangeEvent;
+import com.vaadin.data.Property.ValueChangeListener;
+import com.vaadin.server.VaadinRequest;
+import com.vaadin.tests.components.AbstractTestUI;
+import com.vaadin.ui.CheckBox;
+import com.vaadin.ui.Tree;
+
+public class TreeHtmlContentAllowed extends AbstractTestUI {
+
+    @Override
+    protected void setup(VaadinRequest request) {
+        String textParent = "Just text";
+        String htmlParent = "Some <b>html</b>";
+        String textChild = "Child text";
+        String htmlChild = "Child <i>html</i>";
+
+        final Tree tree = new Tree("A tree");
+        tree.addItem(textParent);
+        tree.addItem(htmlParent);
+        tree.addItem(textChild);
+        tree.addItem(htmlChild);
+
+        tree.setParent(textChild, textParent);
+        tree.setParent(htmlChild, htmlParent);
+
+        tree.setChildrenAllowed(textChild, false);
+        tree.setChildrenAllowed(htmlChild, false);
+
+        final CheckBox toggle = new CheckBox("HTML content allowed",
+                tree.isHtmlContentAllowed());
+        toggle.addValueChangeListener(new ValueChangeListener() {
+            @Override
+            public void valueChange(ValueChangeEvent event) {
+                tree.setHtmlContentAllowed(toggle.getValue().booleanValue());
+            }
+        });
+
+        addComponents(tree, toggle);
+    }
+
+}
diff --git a/uitest/src/com/vaadin/tests/components/tree/TreeHtmlContentAllowedTest.java b/uitest/src/com/vaadin/tests/components/tree/TreeHtmlContentAllowedTest.java
new file mode 100644
index 0000000000..351eda6c90
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/tree/TreeHtmlContentAllowedTest.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright 2000-2014 Vaadin Ltd.
+ * 
+ * Licensed 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 com.vaadin.tests.components.tree;
+
+import java.util.List;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.openqa.selenium.By;
+import org.openqa.selenium.WebElement;
+
+import com.vaadin.testbench.elements.CheckBoxElement;
+import com.vaadin.testbench.elements.TreeElement;
+import com.vaadin.tests.tb3.SingleBrowserTest;
+
+public class TreeHtmlContentAllowedTest extends SingleBrowserTest {
+
+    @Test
+    public void testTreeHtmlContentAllowed() {
+        openTestURL();
+
+        CheckBoxElement toggle = $(CheckBoxElement.class).first();
+        Assert.assertEquals("HTML content should be disabled by default",
+                "unchecked", toggle.getValue());
+
+        // Markup is seen as plain text
+        assertTreeCaptionTexts("Just text", "Some <b>html</b>");
+
+        toggle.click();
+        assertTreeCaptionTexts("Just text", "Some html");
+
+        // Expand the HTML parent
+        findElements(By.className("v-tree-node")).get(1).click();
+
+        assertTreeCaptionTexts("Just text", "Some html", "Child html");
+
+        toggle.click();
+        assertTreeCaptionTexts("Just text", "Some <b>html</b>",
+                "Child <i>html</i>");
+    }
+
+    private void assertTreeCaptionTexts(String... captions) {
+        TreeElement tree = $(TreeElement.class).first();
+        List<WebElement> nodes = tree.findElements(By
+                .className("v-tree-node-caption"));
+
+        Assert.assertEquals(captions.length, nodes.size());
+        for (int i = 0; i < captions.length; i++) {
+            Assert.assertEquals(captions[i], nodes.get(i).getText());
+        }
+    }
+
+}