You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by jr...@apache.org on 2010/05/24 09:18:14 UTC

svn commit: r947554 - in /wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/internal: EnclosurePageExpectedResult_11.html EnclosurePage_11.html EnclosurePage_11.java SimplePanel.html SimplePanel.java

Author: jrthomerson
Date: Mon May 24 07:18:14 2010
New Revision: 947554

URL: http://svn.apache.org/viewvc?rev=947554&view=rev
Log:
(oops - left out added files in previous commit)
this is a test for WICKET-2882 - it currently fails

the fix is committed to 1.4.x - but can not be committed to trunk until
WICKET-2485 is fixed again.  It looks like it was fixed in r818379, but then
jdonnerstag reverted the changes in r828977

I'll leave this broken test as a reminder that we need to fix these in trunk:
WICKET-2882, WICKET-2485, WICKET-2506


Added:
    wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_11.html
    wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePage_11.html
    wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePage_11.java
    wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/internal/SimplePanel.html
    wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/internal/SimplePanel.java

Added: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_11.html
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_11.html?rev=947554&view=auto
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_11.html (added)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_11.html Mon May 24 07:18:14 2010
@@ -0,0 +1,12 @@
+<html xmlns:wicket>
+<body>
+	<wicket:enclosure child="autoCreatedPanel">
+		<div>
+			<span wicket:id="autoCreatedPanel"><span wicket:id="autoCreatedPanel"><wicket:panel>
+	This is a simple test panel.
+	With this component: <span wicket:id="label">hello world</span>
+</wicket:panel></span></span>
+		</div>
+	</wicket:enclosure>
+</body>
+</html>

Added: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePage_11.html
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePage_11.html?rev=947554&view=auto
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePage_11.html (added)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePage_11.html Mon May 24 07:18:14 2010
@@ -0,0 +1,9 @@
+<html xmlns:wicket>
+<body>
+	<wicket:enclosure>
+		<div>
+			<span wicket:id="autoCreatedPanel"></span>
+		</div>
+	</wicket:enclosure>
+</body>
+</html>

Added: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePage_11.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePage_11.java?rev=947554&view=auto
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePage_11.java (added)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePage_11.java Mon May 24 07:18:14 2010
@@ -0,0 +1,54 @@
+/*
+ * 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.internal;
+
+import org.apache.wicket.Component;
+import org.apache.wicket.MarkupContainer;
+import org.apache.wicket.markup.ComponentTag;
+import org.apache.wicket.markup.MarkupStream;
+import org.apache.wicket.markup.WicketTag;
+import org.apache.wicket.markup.html.WebPage;
+import org.apache.wicket.markup.resolver.IComponentResolver;
+
+
+/**
+ * Mock page for testing (see WICKET-2882).
+ * 
+ * @author Jeremy Thomerson
+ */
+public class EnclosurePage_11 extends WebPage implements IComponentResolver
+{
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * Construct.
+	 */
+	public EnclosurePage_11()
+	{
+	}
+
+	public Component resolve(MarkupContainer container, MarkupStream markupStream, ComponentTag tag)
+	{
+		if (tag instanceof WicketTag)
+		{
+			// this resolver does not handle wicket tags
+			return null;
+		}
+
+		return "autoCreatedPanel".equals(tag.getId()) ? new SimplePanel(tag.getId()) : null;
+	}
+}

Added: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/internal/SimplePanel.html
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/internal/SimplePanel.html?rev=947554&view=auto
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/internal/SimplePanel.html (added)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/internal/SimplePanel.html Mon May 24 07:18:14 2010
@@ -0,0 +1,4 @@
+<wicket:panel>
+	This is a simple test panel.
+	With this component: <span wicket:id="label">[some label]</span>
+</wicket:panel>
\ No newline at end of file

Added: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/internal/SimplePanel.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/internal/SimplePanel.java?rev=947554&view=auto
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/internal/SimplePanel.java (added)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/internal/SimplePanel.java Mon May 24 07:18:14 2010
@@ -0,0 +1,44 @@
+/*
+ * 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.internal;
+
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.panel.Panel;
+import org.apache.wicket.model.Model;
+
+/**
+ * Just a simple panel for testing purposes.
+ * 
+ * @author Jeremy Thomerson
+ */
+public class SimplePanel extends Panel
+{
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * simple constructor.
+	 * 
+	 * @param id
+	 */
+	public SimplePanel(String id)
+	{
+		super(id);
+		add(new Label("label", new Model<String>("hello world")));
+	}
+
+}