Author: ivaynberg
Date: Mon Dec 25 12:17:09 2006
New Revision: 490166
URL: http://svn.apache.org/viewvc?view=rev&rev=490166
Log:
fragment + markup inheritance test
Added:
incubator/wicket/trunk/wicket/src/test/java/wicket/markup/html/panel/FragmentInheritanceBasePage.html
incubator/wicket/trunk/wicket/src/test/java/wicket/markup/html/panel/FragmentInheritanceBasePage.java
incubator/wicket/trunk/wicket/src/test/java/wicket/markup/html/panel/FragmentInheritanceTest.java
incubator/wicket/trunk/wicket/src/test/java/wicket/markup/html/panel/FragmentInheritanceTestPage.html
incubator/wicket/trunk/wicket/src/test/java/wicket/markup/html/panel/FragmentInheritanceTestPage.java
Modified:
incubator/wicket/trunk/wicket/src/main/java/wicket/markup/loader/InheritedMarkupMarkupLoader.java
Modified:
incubator/wicket/trunk/wicket/src/main/java/wicket/markup/loader/InheritedMarkupMarkupLoader.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/main/java/wicket/markup/loader/InheritedMarkupMarkupLoader.java?view=diff&rev=490166&r1=490165&r2=490166
==============================================================================
---
incubator/wicket/trunk/wicket/src/main/java/wicket/markup/loader/InheritedMarkupMarkupLoader.java
(original)
+++
incubator/wicket/trunk/wicket/src/main/java/wicket/markup/loader/InheritedMarkupMarkupLoader.java
Mon Dec 25 12:17:09 2006
@@ -448,7 +448,7 @@
ComponentTag tag = fragment.getTag();
if (tag.getName().equals("fragment"))
{
-
+ //FIXME TEMP FIX FOR
FragmentInheritanceTest
}
else
{
Added:
incubator/wicket/trunk/wicket/src/test/java/wicket/markup/html/panel/FragmentInheritanceBasePage.html
URL:
http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/test/java/wicket/markup/html/panel/FragmentInheritanceBasePage.html?view=auto&rev=490166
==============================================================================
---
incubator/wicket/trunk/wicket/src/test/java/wicket/markup/html/panel/FragmentInheritanceBasePage.html
(added)
+++
incubator/wicket/trunk/wicket/src/test/java/wicket/markup/html/panel/FragmentInheritanceBasePage.html
Mon Dec 25 12:17:09 2006
@@ -0,0 +1 @@
+<html><body><wicket:child/></body></html>
\ No newline at end of file
Added:
incubator/wicket/trunk/wicket/src/test/java/wicket/markup/html/panel/FragmentInheritanceBasePage.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/test/java/wicket/markup/html/panel/FragmentInheritanceBasePage.java?view=auto&rev=490166
==============================================================================
---
incubator/wicket/trunk/wicket/src/test/java/wicket/markup/html/panel/FragmentInheritanceBasePage.java
(added)
+++
incubator/wicket/trunk/wicket/src/test/java/wicket/markup/html/panel/FragmentInheritanceBasePage.java
Mon Dec 25 12:17:09 2006
@@ -0,0 +1,31 @@
+/*
+ * 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 wicket.markup.html.panel;
+
+import wicket.markup.html.WebPage;
+
+/**
+ * See [EMAIL PROTECTED] FragmentInheritanceTest}
+ *
+ * @author ivaynberg
+ */
+public class FragmentInheritanceBasePage extends WebPage
+{
+
+ private static final long serialVersionUID = 1L;
+
+}
Added:
incubator/wicket/trunk/wicket/src/test/java/wicket/markup/html/panel/FragmentInheritanceTest.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/test/java/wicket/markup/html/panel/FragmentInheritanceTest.java?view=auto&rev=490166
==============================================================================
---
incubator/wicket/trunk/wicket/src/test/java/wicket/markup/html/panel/FragmentInheritanceTest.java
(added)
+++
incubator/wicket/trunk/wicket/src/test/java/wicket/markup/html/panel/FragmentInheritanceTest.java
Mon Dec 25 12:17:09 2006
@@ -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 wicket.markup.html.panel;
+
+import wicket.WicketTestCase;
+
+/**
+ * Test the use of fragments in combination with markup inheritance
+ *
+ * @author ivaynberg
+ */
+public class FragmentInheritanceTest extends WicketTestCase
+{
+
+ /**
+ * Test fragment resolutio when it is defined within wicket:extend tag
+ *
+ * @throws Exception
+ */
+ public void testFragmentInInheritance() throws Exception
+ {
+
assertTrue(accessPage(FragmentInheritanceTestPage.class).getDocument()
+
.equals("<html><body><wicket:child><wicket:extend><span
wicket:id=\"fragment\">fragment</span></wicket:extend></wicket:child></body></html>"));
+ }
+
+}
Added:
incubator/wicket/trunk/wicket/src/test/java/wicket/markup/html/panel/FragmentInheritanceTestPage.html
URL:
http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/test/java/wicket/markup/html/panel/FragmentInheritanceTestPage.html?view=auto&rev=490166
==============================================================================
---
incubator/wicket/trunk/wicket/src/test/java/wicket/markup/html/panel/FragmentInheritanceTestPage.html
(added)
+++
incubator/wicket/trunk/wicket/src/test/java/wicket/markup/html/panel/FragmentInheritanceTestPage.html
Mon Dec 25 12:17:09 2006
@@ -0,0 +1 @@
+<wicket:extend><span wicket:id="fragment"></span><wicket:fragment
wicket:id="fragmentdef">fragment</wicket:fragment></wicket:extend>
\ No newline at end of file
Added:
incubator/wicket/trunk/wicket/src/test/java/wicket/markup/html/panel/FragmentInheritanceTestPage.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/test/java/wicket/markup/html/panel/FragmentInheritanceTestPage.java?view=auto&rev=490166
==============================================================================
---
incubator/wicket/trunk/wicket/src/test/java/wicket/markup/html/panel/FragmentInheritanceTestPage.java
(added)
+++
incubator/wicket/trunk/wicket/src/test/java/wicket/markup/html/panel/FragmentInheritanceTestPage.java
Mon Dec 25 12:17:09 2006
@@ -0,0 +1,37 @@
+/*
+ * 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 wicket.markup.html.panel;
+
+
+/**
+ * See [EMAIL PROTECTED] FragmentInheritanceTest}
+ *
+ * @author ivaynberg
+ */
+public class FragmentInheritanceTestPage extends FragmentInheritanceBasePage
+{
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * Construct.
+ */
+ public FragmentInheritanceTestPage()
+ {
+ new Fragment(this, "fragment", "fragmentdef");
+ }
+}
