You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2013/09/02 13:59:12 UTC

[2/2] git commit: WICKET-5325 ComponentRenderer.renderComponent does not render markup for ListView

WICKET-5325 ComponentRenderer.renderComponent does not render markup for ListView

Add a test case


Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/e9df8592
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/e9df8592
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/e9df8592

Branch: refs/heads/wicket-6.x
Commit: e9df85929d7b268115769e0c3c4a06aa94409543
Parents: fb71b7f
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Mon Sep 2 14:58:35 2013 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Mon Sep 2 14:58:35 2013 +0300

----------------------------------------------------------------------
 .../ComponentRendererTest.java                  | 15 ++++++
 .../componentrenderer/PageWithRepeater.java     | 52 ++++++++++++++++++++
 2 files changed, 67 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/wicket/blob/e9df8592/wicket-core/src/test/java/org/apache/wicket/core/util/string/componentrenderer/ComponentRendererTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/core/util/string/componentrenderer/ComponentRendererTest.java b/wicket-core/src/test/java/org/apache/wicket/core/util/string/componentrenderer/ComponentRendererTest.java
index 8631dec..43a4214 100644
--- a/wicket-core/src/test/java/org/apache/wicket/core/util/string/componentrenderer/ComponentRendererTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/core/util/string/componentrenderer/ComponentRendererTest.java
@@ -37,4 +37,19 @@ public class ComponentRendererTest extends WicketTestCase
 	{
 		ComponentRenderer.renderComponent(new EnclosurePanel("anyId"));
 	}
+
+	/**
+	 * https://issues.apache.org/jira/browse/WICKET-5325
+	 *
+	 * Tests that ComponentRenderer#renderComponent() will use the component's
+	 * markup if available
+	 */
+	@Test
+	public void renderListViewItems()
+	{
+		PageWithRepeater page = new PageWithRepeater();
+		CharSequence listViewOutput = ComponentRenderer.renderComponent(page.get("listView"));
+		assertEquals("<div wicket:id=\"listView\"><span wicket:id=\"label\">one</span></div>" +
+				"<div wicket:id=\"listView\"><span wicket:id=\"label\">two</span></div>", listViewOutput.toString());
+	}
 }

http://git-wip-us.apache.org/repos/asf/wicket/blob/e9df8592/wicket-core/src/test/java/org/apache/wicket/core/util/string/componentrenderer/PageWithRepeater.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/core/util/string/componentrenderer/PageWithRepeater.java b/wicket-core/src/test/java/org/apache/wicket/core/util/string/componentrenderer/PageWithRepeater.java
new file mode 100644
index 0000000..41c4296
--- /dev/null
+++ b/wicket-core/src/test/java/org/apache/wicket/core/util/string/componentrenderer/PageWithRepeater.java
@@ -0,0 +1,52 @@
+/*
+ * 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.core.util.string.componentrenderer;
+
+import java.util.Arrays;
+
+import org.apache.wicket.MarkupContainer;
+import org.apache.wicket.markup.IMarkupResourceStreamProvider;
+import org.apache.wicket.markup.html.WebPage;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.list.ListItem;
+import org.apache.wicket.markup.html.list.ListView;
+import org.apache.wicket.util.resource.IResourceStream;
+import org.apache.wicket.util.resource.StringResourceStream;
+
+/**
+ * A page for testing https://issues.apache.org/jira/browse/WICKET-5325
+ */
+class PageWithRepeater extends WebPage implements IMarkupResourceStreamProvider
+{
+	PageWithRepeater()
+	{
+		add(new ListView<String>("listView", Arrays.asList("one", "two")) {
+
+			@Override
+			protected void populateItem(ListItem<String> item)
+			{
+				item.add(new Label("label", item.getModelObject()));
+			}
+		});
+	}
+
+	@Override
+	public IResourceStream getMarkupResourceStream(MarkupContainer container, Class<?> containerClass)
+	{
+		return new StringResourceStream("<html><body><div wicket:id='listView'><span wicket:id='label'></span></div></body></html>");
+	}
+}