Author: ivaynberg
Date: Thu Aug 30 20:58:13 2007
New Revision: 571363
URL: http://svn.apache.org/viewvc?rev=571363&view=rev
Log:
WICKET-871 Markup hirarchy gets messed up when value of attribute 'background'
is a relative path
Added:
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/PageExpectedResult_3.html
(with props)
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/Page_3.html
(with props)
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/Page_3.java
(with props)
Modified:
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/RelativePathPrefixHandlerTest.java
Added:
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/PageExpectedResult_3.html
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/PageExpectedResult_3.html?rev=571363&view=auto
==============================================================================
---
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/PageExpectedResult_3.html
(added)
+++
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/PageExpectedResult_3.html
Thu Aug 30 20:58:13 2007
@@ -0,0 +1,7 @@
+<html xmlns:wicket>
+<body>
+ <span background="../images/bg.jpg">
+ <p wicket:id="myname">Hello</p>
+ </span>
+</body>
+</html>
Propchange:
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/PageExpectedResult_3.html
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added:
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/Page_3.html
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/Page_3.html?rev=571363&view=auto
==============================================================================
---
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/Page_3.html
(added)
+++
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/Page_3.html
Thu Aug 30 20:58:13 2007
@@ -0,0 +1,7 @@
+<html xmlns:wicket>
+<body>
+ <span background="images/bg.jpg">
+ <p wicket:id="myname">Hello</p>
+ </span>
+</body>
+</html>
Propchange:
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/Page_3.html
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added:
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/Page_3.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/Page_3.java?rev=571363&view=auto
==============================================================================
---
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/Page_3.java
(added)
+++
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/Page_3.java
Thu Aug 30 20:58:13 2007
@@ -0,0 +1,40 @@
+/*
+ * 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.parser;
+
+import org.apache.wicket.markup.html.WebPage;
+import org.apache.wicket.markup.html.basic.Label;
+
+
+/**
+ * Mock page for testing.
+ *
+ * @author Chris Turner
+ */
+public class Page_3 extends WebPage
+{
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * Construct.
+ *
+ */
+ public Page_3()
+ {
+ add(new Label("myname", "Hello"));
+ }
+}
Propchange:
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/Page_3.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified:
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/RelativePathPrefixHandlerTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/RelativePathPrefixHandlerTest.java?rev=571363&r1=571362&r2=571363&view=diff
==============================================================================
---
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/RelativePathPrefixHandlerTest.java
(original)
+++
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/RelativePathPrefixHandlerTest.java
Thu Aug 30 20:58:13 2007
@@ -51,7 +51,7 @@
{
executeTest(Page_1.class, "PageExpectedResult_1.html");
}
-
+
/**
* @throws Exception
*/
@@ -59,5 +59,13 @@
{
executeTest(Page_2.class, "PageExpectedResult_2.html");
}
-
+
+ /**
+ * @throws Exception
+ */
+ public final void testTransparency() throws Exception
+ {
+ executeTest(Page_3.class, "PageExpectedResult_3.html");
+ }
+
}
