You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by hn...@apache.org on 2024/03/19 11:34:34 UTC
(myfaces-tobago) branch tobago-5.x updated: fix(customClass): treeListbox
This is an automated email from the ASF dual-hosted git repository.
hnoeth pushed a commit to branch tobago-5.x
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
The following commit(s) were added to refs/heads/tobago-5.x by this push:
new 2e4cd78b7a fix(customClass): treeListbox
2e4cd78b7a is described below
commit 2e4cd78b7a4ebd9278651b9470089ed1869e773b
Author: Henning Noeth <hn...@apache.org>
AuthorDate: Tue Mar 19 08:47:31 2024 +0100
fix(customClass): treeListbox
* add test
* customClass is now rendered on treeListbox
Issue: TOBAGO-2294
---
.../renderkit/renderer/TreeListboxRenderer.java | 1 +
.../internal/config/AbstractTobagoTestBase.java | 22 ++++---
.../renderer/TreeListboxRendererUnitTest.java | 76 ++++++++++++++++++++++
.../treeListbox/treeListbox-customClass.html | 61 +++++++++++++++++
.../renderer/treeListbox/treeListbox.html | 61 +++++++++++++++++
5 files changed, 213 insertions(+), 8 deletions(-)
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TreeListboxRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TreeListboxRenderer.java
index 162d0fa550..2b1eb32fe7 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TreeListboxRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TreeListboxRenderer.java
@@ -72,6 +72,7 @@ public class TreeListboxRenderer<T extends AbstractUITreeListbox> extends Render
writer.startElement(HtmlElements.TOBAGO_TREE_LISTBOX);
writer.writeIdAttribute(clientId);
+ writer.writeClassAttribute(component.getCustomClass());
HtmlRendererUtils.writeDataAttributes(facesContext, writer, component);
writer.writeAttribute(DataAttributes.SELECTION_MODE, component.getSelectable().name(), false);
diff --git a/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/config/AbstractTobagoTestBase.java b/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/config/AbstractTobagoTestBase.java
index 6f5c9dfc94..5f714a278b 100644
--- a/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/config/AbstractTobagoTestBase.java
+++ b/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/config/AbstractTobagoTestBase.java
@@ -64,12 +64,11 @@ import org.apache.myfaces.tobago.component.UITabGroup;
import org.apache.myfaces.tobago.component.UITextarea;
import org.apache.myfaces.tobago.component.UITree;
import org.apache.myfaces.tobago.component.UITreeIndent;
+import org.apache.myfaces.tobago.component.UITreeLabel;
+import org.apache.myfaces.tobago.component.UITreeListbox;
import org.apache.myfaces.tobago.component.UITreeNode;
import org.apache.myfaces.tobago.component.UITreeSelect;
import org.apache.myfaces.tobago.config.TobagoConfig;
-
-import static org.apache.myfaces.tobago.config.TobagoConfig.TOBAGO_CONFIG;
-
import org.apache.myfaces.tobago.context.TobagoContext;
import org.apache.myfaces.tobago.internal.behavior.EventBehavior;
import org.apache.myfaces.tobago.internal.renderkit.renderer.BadgeRenderer;
@@ -110,13 +109,12 @@ import org.apache.myfaces.tobago.internal.renderkit.renderer.TabRenderer;
import org.apache.myfaces.tobago.internal.renderkit.renderer.TextareaRenderer;
import org.apache.myfaces.tobago.internal.renderkit.renderer.TobagoClientBehaviorRenderer;
import org.apache.myfaces.tobago.internal.renderkit.renderer.TreeIndentRenderer;
+import org.apache.myfaces.tobago.internal.renderkit.renderer.TreeLabelRenderer;
+import org.apache.myfaces.tobago.internal.renderkit.renderer.TreeListboxRenderer;
import org.apache.myfaces.tobago.internal.renderkit.renderer.TreeNodeRenderer;
import org.apache.myfaces.tobago.internal.renderkit.renderer.TreeRenderer;
import org.apache.myfaces.tobago.internal.renderkit.renderer.TreeSelectRenderer;
import org.apache.myfaces.tobago.internal.webapp.HtmlResponseWriter;
-
-import static org.apache.myfaces.tobago.util.ResourceUtils.TOBAGO_RESOURCE_BUNDLE;
-
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
@@ -131,6 +129,9 @@ import java.nio.charset.StandardCharsets;
import java.util.Date;
import java.util.Locale;
+import static org.apache.myfaces.tobago.config.TobagoConfig.TOBAGO_CONFIG;
+import static org.apache.myfaces.tobago.util.ResourceUtils.TOBAGO_RESOURCE_BUNDLE;
+
/**
* <p>Abstract JUnit test case base class, which sets up the JavaServer Faces
* mock object environment for a particular simulated request.
@@ -207,8 +208,10 @@ public abstract class AbstractTobagoTestBase extends AbstractJsfTestCase {
application.addComponent(Tags.tabGroup.componentType(), UITabGroup.class.getName());
application.addComponent(Tags.textarea.componentType(), UITextarea.class.getName());
application.addComponent(Tags.tree.componentType(), UITree.class.getName());
- application.addComponent(Tags.treeNode.componentType(), UITreeNode.class.getName());
application.addComponent(Tags.treeIndent.componentType(), UITreeIndent.class.getName());
+ application.addComponent(Tags.treeLabel.componentType(), UITreeLabel.class.getName());
+ application.addComponent(Tags.treeListbox.componentType(), UITreeListbox.class.getName());
+ application.addComponent(Tags.treeNode.componentType(), UITreeNode.class.getName());
application.addComponent(Tags.treeSelect.componentType(), UITreeSelect.class.getName());
application.addComponent(UIParameter.COMPONENT_TYPE, UIParameter.class.getName());
@@ -268,9 +271,12 @@ public abstract class AbstractTobagoTestBase extends AbstractJsfTestCase {
renderKit.addRenderer(UITabGroup.COMPONENT_FAMILY, RendererTypes.TAB_GROUP, new TabGroupRenderer<UITabGroup>());
renderKit.addRenderer(UITextarea.COMPONENT_FAMILY, RendererTypes.TEXTAREA, new TextareaRenderer<UITextarea>());
renderKit.addRenderer(UITree.COMPONENT_FAMILY, RendererTypes.TREE, new TreeRenderer<UITree>());
- renderKit.addRenderer(UITreeNode.COMPONENT_FAMILY, RendererTypes.TREE_NODE, new TreeNodeRenderer<UITreeNode>());
renderKit.addRenderer(UITreeIndent.COMPONENT_FAMILY, RendererTypes.TREE_INDENT,
new TreeIndentRenderer<UITreeIndent>());
+ renderKit.addRenderer(UITreeLabel.COMPONENT_FAMILY, RendererTypes.TREE_LABEL, new TreeLabelRenderer<UITreeLabel>());
+ renderKit.addRenderer(UITreeListbox.COMPONENT_FAMILY, RendererTypes.TREE_LISTBOX,
+ new TreeListboxRenderer<UITreeListbox>());
+ renderKit.addRenderer(UITreeNode.COMPONENT_FAMILY, RendererTypes.TREE_NODE, new TreeNodeRenderer<UITreeNode>());
renderKit.addRenderer(UITreeSelect.COMPONENT_FAMILY, RendererTypes.TREE_SELECT,
new TreeSelectRenderer<UITreeSelect>());
diff --git a/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TreeListboxRendererUnitTest.java b/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TreeListboxRendererUnitTest.java
new file mode 100644
index 0000000000..5cf71d135a
--- /dev/null
+++ b/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TreeListboxRendererUnitTest.java
@@ -0,0 +1,76 @@
+/*
+ * 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.myfaces.tobago.internal.renderkit.renderer;
+
+import org.apache.myfaces.tobago.component.RendererTypes;
+import org.apache.myfaces.tobago.component.Tags;
+import org.apache.myfaces.tobago.component.UITreeLabel;
+import org.apache.myfaces.tobago.component.UITreeListbox;
+import org.apache.myfaces.tobago.component.UITreeNode;
+import org.apache.myfaces.tobago.renderkit.css.CustomClass;
+import org.apache.myfaces.tobago.util.ComponentUtils;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+import java.io.IOException;
+
+public class TreeListboxRendererUnitTest extends RendererTestBase {
+
+ @Test
+ public void treeListbox() throws IOException {
+ final UITreeListbox treeListbox = (UITreeListbox) ComponentUtils.createComponent(
+ facesContext, Tags.treeListbox.componentType(), RendererTypes.TreeListbox, "treeListbox");
+ treeListbox.setVar("node");
+ treeListbox.setValue(getTreeSample());
+
+ final UITreeNode treeNode = (UITreeNode) ComponentUtils.createComponent(
+ facesContext, Tags.treeNode.componentType(), RendererTypes.TreeNode, "treeNode");
+ treeListbox.getChildren().add(treeNode);
+
+ final UITreeLabel treeLabel = (UITreeLabel) ComponentUtils.createComponent(
+ facesContext, Tags.treeLabel.componentType(), RendererTypes.TreeLabel, "treeLabel");
+ treeNode.getChildren().add(treeLabel);
+
+ treeListbox.encodeAll(facesContext);
+
+ Assertions.assertEquals(loadHtml("renderer/treeListbox/treeListbox.html"), formattedResult());
+ }
+
+ @Test
+ public void treeListboxCustomClass() throws IOException {
+ final UITreeListbox treeListbox = (UITreeListbox) ComponentUtils.createComponent(
+ facesContext, Tags.treeListbox.componentType(), RendererTypes.TreeListbox, "treeListbox");
+ treeListbox.setVar("node");
+ treeListbox.setValue(getTreeSample());
+ treeListbox.setCustomClass(new CustomClass("custom-class"));
+
+ final UITreeNode treeNode = (UITreeNode) ComponentUtils.createComponent(
+ facesContext, Tags.treeNode.componentType(), RendererTypes.TreeNode, "treeNode");
+ treeListbox.getChildren().add(treeNode);
+
+ final UITreeLabel treeLabel = (UITreeLabel) ComponentUtils.createComponent(
+ facesContext, Tags.treeLabel.componentType(), RendererTypes.TreeLabel, "treeLabel");
+ treeNode.getChildren().add(treeLabel);
+
+ treeListbox.encodeAll(facesContext);
+
+ Assertions.assertEquals(loadHtml("renderer/treeListbox/treeListbox-customClass.html"), formattedResult());
+ }
+}
diff --git a/tobago-core/src/test/resources/renderer/treeListbox/treeListbox-customClass.html b/tobago-core/src/test/resources/renderer/treeListbox/treeListbox-customClass.html
new file mode 100644
index 0000000000..fa5721df7e
--- /dev/null
+++ b/tobago-core/src/test/resources/renderer/treeListbox/treeListbox-customClass.html
@@ -0,0 +1,61 @@
+<!--
+ ~ 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.
+ -->
+
+<tobago-tree-listbox id='treeListbox' class='custom-class' data-tobago-selection-mode='single'>
+ <input type='hidden' name='treeListbox::selected' id='treeListbox::selected' value='[]'>
+ <div class='tobago-level'>
+ <select class='tobago-selected' id='treeListbox:0:treeNode::parent' size='10'>
+ <option value='treeListbox:1:treeNode' id='treeListbox:1:treeNode' row-index='1'>
+ </option>
+ <option value='treeListbox:2:treeNode' id='treeListbox:2:treeNode' row-index='2'>
+ </option>
+ <option value='treeListbox:3:treeNode' id='treeListbox:3:treeNode' row-index='3'> →
+ </option>
+ <option value='treeListbox:7:treeNode' id='treeListbox:7:treeNode' row-index='7'>
+ </option>
+ <option value='treeListbox:8:treeNode' id='treeListbox:8:treeNode' row-index='8'> →
+ </option></select>
+ </div>
+ <div class='tobago-level'>
+ <select disabled='disabled' size='10' class='tobago-selected'></select>
+ <select class='tobago-selected' id='treeListbox:3:treeNode::parent' size='10'>
+ <option value='treeListbox:4:treeNode' id='treeListbox:4:treeNode' row-index='4'>
+ </option>
+ <option value='treeListbox:5:treeNode' id='treeListbox:5:treeNode' row-index='5'>
+ </option>
+ <option value='treeListbox:6:treeNode' id='treeListbox:6:treeNode' row-index='6'> →
+ </option></select>
+ <select class='tobago-selected' id='treeListbox:8:treeNode::parent' size='10'>
+ <option value='treeListbox:9:treeNode' id='treeListbox:9:treeNode' row-index='9'> →
+ </option>
+ <option value='treeListbox:10:treeNode' id='treeListbox:10:treeNode' row-index='10'>
+ </option>
+ <option value='treeListbox:11:treeNode' id='treeListbox:11:treeNode' row-index='11'> →
+ </option></select>
+ </div>
+ <div class='tobago-level'>
+ <select disabled='disabled' size='10' class='tobago-selected'></select>
+ <select class='tobago-selected' id='treeListbox:6:treeNode::parent' size='10'></select>
+ <select class='tobago-selected' id='treeListbox:9:treeNode::parent' size='10'></select>
+ <select class='tobago-selected' id='treeListbox:11:treeNode::parent' size='10'></select>
+ </div>
+ <div class='tobago-level'>
+ <select disabled='disabled' size='10' class='tobago-selected'></select>
+ </div>
+</tobago-tree-listbox>
diff --git a/tobago-core/src/test/resources/renderer/treeListbox/treeListbox.html b/tobago-core/src/test/resources/renderer/treeListbox/treeListbox.html
new file mode 100644
index 0000000000..6e244d0d44
--- /dev/null
+++ b/tobago-core/src/test/resources/renderer/treeListbox/treeListbox.html
@@ -0,0 +1,61 @@
+<!--
+ ~ 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.
+ -->
+
+<tobago-tree-listbox id='treeListbox' data-tobago-selection-mode='single'>
+ <input type='hidden' name='treeListbox::selected' id='treeListbox::selected' value='[]'>
+ <div class='tobago-level'>
+ <select class='tobago-selected' id='treeListbox:0:treeNode::parent' size='10'>
+ <option value='treeListbox:1:treeNode' id='treeListbox:1:treeNode' row-index='1'>
+ </option>
+ <option value='treeListbox:2:treeNode' id='treeListbox:2:treeNode' row-index='2'>
+ </option>
+ <option value='treeListbox:3:treeNode' id='treeListbox:3:treeNode' row-index='3'> →
+ </option>
+ <option value='treeListbox:7:treeNode' id='treeListbox:7:treeNode' row-index='7'>
+ </option>
+ <option value='treeListbox:8:treeNode' id='treeListbox:8:treeNode' row-index='8'> →
+ </option></select>
+ </div>
+ <div class='tobago-level'>
+ <select disabled='disabled' size='10' class='tobago-selected'></select>
+ <select class='tobago-selected' id='treeListbox:3:treeNode::parent' size='10'>
+ <option value='treeListbox:4:treeNode' id='treeListbox:4:treeNode' row-index='4'>
+ </option>
+ <option value='treeListbox:5:treeNode' id='treeListbox:5:treeNode' row-index='5'>
+ </option>
+ <option value='treeListbox:6:treeNode' id='treeListbox:6:treeNode' row-index='6'> →
+ </option></select>
+ <select class='tobago-selected' id='treeListbox:8:treeNode::parent' size='10'>
+ <option value='treeListbox:9:treeNode' id='treeListbox:9:treeNode' row-index='9'> →
+ </option>
+ <option value='treeListbox:10:treeNode' id='treeListbox:10:treeNode' row-index='10'>
+ </option>
+ <option value='treeListbox:11:treeNode' id='treeListbox:11:treeNode' row-index='11'> →
+ </option></select>
+ </div>
+ <div class='tobago-level'>
+ <select disabled='disabled' size='10' class='tobago-selected'></select>
+ <select class='tobago-selected' id='treeListbox:6:treeNode::parent' size='10'></select>
+ <select class='tobago-selected' id='treeListbox:9:treeNode::parent' size='10'></select>
+ <select class='tobago-selected' id='treeListbox:11:treeNode::parent' size='10'></select>
+ </div>
+ <div class='tobago-level'>
+ <select disabled='disabled' size='10' class='tobago-selected'></select>
+ </div>
+</tobago-tree-listbox>