svn commit: r815959 [3/3] - in /wicket/trunk: wicket-examples/src/main/java/org/apache/wicket/examples/portlet/menu/ wicket-examples/src/main/java/org/apache/wicket/examples/repeater/ wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/ma...

[jdonnerstag]

Modified: 
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPage_5.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPage_5.java?rev=815959&r1=815958&r2=815959&view=diff
==============================================================================
--- 
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPage_5.java
 (original)
+++ 
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPage_5.java
 Wed Sep 16 20:48:23 2009
@@ -17,6 +17,7 @@
 package org.apache.wicket.markup.html.panel;
 
 import org.apache.wicket.MarkupContainer;
+import org.apache.wicket.markup.IMarkupFragment;
 import org.apache.wicket.markup.MarkupStream;
 import org.apache.wicket.markup.html.WebPage;
 
@@ -63,5 +64,14 @@
                {
                        return getAssociatedMarkupStream(false);
                }
+
+               /**
+                * @see org.apache.wicket.markup.html.panel.Fragment#getMarkup()
+                */
+               @Override
+               public IMarkupFragment getMarkup()
+               {
+                       return getAssociatedMarkup();
+               }
        }
 }

Modified: 
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/XmlPullParserTest.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/XmlPullParserTest.java?rev=815959&r1=815958&r2=815959&view=diff
==============================================================================
--- 
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/XmlPullParserTest.java
 (original)
+++ 
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/XmlPullParserTest.java
 Wed Sep 16 20:48:23 2009
@@ -343,6 +343,31 @@
         * 
         * @throws Exception
         */
+       public final void testConditionalComments2() throws Exception
+       {
+               final XmlPullParser parser = new XmlPullParser();
+               parser.parse("<!--[if IE]><a href='test.html'>my 
link</a><![endif]-->");
+               int type = parser.next();
+               assertEquals(type, XmlPullParser.CONDITIONAL_COMMENT);
+               type = parser.next();
+               assertEquals(type, XmlPullParser.TAG);
+               assertTrue(((XmlTag)parser.getElement()).isOpen());
+               type = parser.next();
+               assertEquals(type, XmlPullParser.BODY);
+               type = parser.next();
+               assertEquals(type, XmlPullParser.TAG);
+               assertEquals("a", ((XmlTag)parser.getElement()).getName());
+               assertTrue(((XmlTag)parser.getElement()).isClose());
+               type = parser.next();
+               assertEquals(type, XmlPullParser.CONDITIONAL_COMMENT);
+               type = parser.next();
+               assertEquals(0, type);
+       }
+
+       /**
+        * 
+        * @throws Exception
+        */
        public final void testNames() throws Exception
        {
                final XmlPullParser parser = new XmlPullParser();