Author: gseitz
Date: Sat Nov 3 13:28:34 2007
New Revision: 591676
URL: http://svn.apache.org/viewvc?rev=591676&view=rev
Log:
WICKET-975:
added unit tests for ImageButton
had to move super.onComponentTag(tag) to the end of the method to not confuse
localizedImageResource with the generated value attribute in
Button#onComponentTag
Added:
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/imagebutton/
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/imagebutton/Beer.gif
(with props)
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/imagebutton/Beer_da_DK.gif
(with props)
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/imagebutton/Beer_de_DE.gif
(with props)
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/imagebutton/Beer_en_CA.gif
(with props)
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/imagebutton/Beer_nl_NL.gif
(with props)
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/imagebutton/Beer_zh_CN.gif
(with props)
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/imagebutton/Home.html
(with props)
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/imagebutton/Home.java
(with props)
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/imagebutton/ImageButtonTest.java
(with props)
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/imagebutton/InvalidImageButtonPage.html
(with props)
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/imagebutton/InvalidImageButtonPage.java
(with props)
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/imagebutton/InvalidImageButtonTest.java
(with props)
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/imagebutton/PubApplication.java
(with props)
Modified:
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/ImageButton.java
Modified:
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/ImageButton.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/ImageButton.java?rev=591676&r1=591675&r2=591676&view=diff
==============================================================================
---
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/ImageButton.java
(original)
+++
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/ImageButton.java
Sat Nov 3 13:28:34 2007
@@ -216,7 +216,6 @@
{
checkComponentTag(tag, "input");
checkComponentTagAttribute(tag, "type", "image");
- super.onComponentTag(tag);
final Resource resource = getImageResource();
if (resource != null)
@@ -229,6 +228,7 @@
localizedImageResource.setResourceReference(resourceReference);
}
localizedImageResource.setSrcAttribute(tag);
+ super.onComponentTag(tag);
}
/**
Added:
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/imagebutton/Beer.gif
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/imagebutton/Beer.gif?rev=591676&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/imagebutton/Beer.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/imagebutton/Beer_da_DK.gif
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/imagebutton/Beer_da_DK.gif?rev=591676&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/imagebutton/Beer_da_DK.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/imagebutton/Beer_de_DE.gif
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/imagebutton/Beer_de_DE.gif?rev=591676&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/imagebutton/Beer_de_DE.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/imagebutton/Beer_en_CA.gif
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/imagebutton/Beer_en_CA.gif?rev=591676&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/imagebutton/Beer_en_CA.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/imagebutton/Beer_nl_NL.gif
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/imagebutton/Beer_nl_NL.gif?rev=591676&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/imagebutton/Beer_nl_NL.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/imagebutton/Beer_zh_CN.gif
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/imagebutton/Beer_zh_CN.gif?rev=591676&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/imagebutton/Beer_zh_CN.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/imagebutton/Home.html
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/imagebutton/Home.html?rev=591676&view=auto
==============================================================================
---
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/imagebutton/Home.html
(added)
+++
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/imagebutton/Home.html
Sat Nov 3 13:28:34 2007
@@ -0,0 +1,22 @@
+<html xmlns:wicket="http://wicket.apache.org/";>
+<head>
+ <title>Wicket Examples - pub</title>
+ <link rel="stylesheet" type="text/css" href="style.css"/>
+</head>
+<body>
+ <p>
+ This is tooootally the best beer you can get for under a buck.
+ </p>
+ <p>
+ <input type = "image" wicket:id = "beer" src = "Beer.gif"/>
+ </p>
+ <p>
+ <a href="#" wicket:id="goCanadian">[go Canadian]</a>
+ <a href="#" wicket:id="goUS">[go US]</a>
+ <a href="#" wicket:id="goDutch">[go Dutch]</a>
+ <a href="#" wicket:id="goGerman">[go German]</a>
+ <a href="#" wicket:id="goChinese">[go Chinese]</a>
+ <a href="#" wicket:id="goDanish">[go Danish]</a>
+ </p>
+</body>
+</html>
Propchange:
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/imagebutton/Home.html
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added:
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/imagebutton/Home.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/imagebutton/Home.java?rev=591676&view=auto
==============================================================================
---
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/imagebutton/Home.java
(added)
+++
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/imagebutton/Home.java
Sat Nov 3 13:28:34 2007
@@ -0,0 +1,104 @@
+/*
+ * 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.form.imagebutton;
+
+import java.util.Locale;
+
+import org.apache.wicket.PageParameters;
+import org.apache.wicket.markup.html.WebPage;
+import org.apache.wicket.markup.html.form.ImageButton;
+import org.apache.wicket.markup.html.link.Link;
+
+
+/**
+ * Demonstrates localization.
+ *
+ * @author Jonathan Locke
+ * @author Eelco Hillenius
+ */
+public final class Home extends WebPage
+{
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * Constructor
+ *
+ * @param parameters
+ * Page parameters (ignored since this is the home page)
+ */
+ public Home(final PageParameters parameters)
+ {
+ add(new ImageButton("beer"));
+
+ // Add a couple of links to be able to play around with the
session
+ // locale
+ add(new Link("goCanadian")
+ {
+ private static final long serialVersionUID = 1L;
+
+ public void onClick()
+ {
+ getSession().setLocale(Locale.CANADA);
+ }
+ });
+ add(new Link("goUS")
+ {
+ private static final long serialVersionUID = 1L;
+
+ public void onClick()
+ {
+ getSession().setLocale(Locale.US);
+ }
+ });
+ add(new Link("goDutch")
+ {
+ private static final long serialVersionUID = 1L;
+
+ public void onClick()
+ {
+ getSession().setLocale(new Locale("nl", "NL"));
+ }
+ });
+ add(new Link("goGerman")
+ {
+ private static final long serialVersionUID = 1L;
+
+ public void onClick()
+ {
+ getSession().setLocale(new Locale("de", "DE"));
+ }
+ });
+ add(new Link("goChinese")
+ {
+ private static final long serialVersionUID = 1L;
+
+ public void onClick()
+ {
+ getSession().setLocale(new Locale("zh", "CN"));
+ }
+ });
+ add(new Link("goDanish")
+ {
+ private static final long serialVersionUID = 1L;
+
+ public void onClick()
+ {
+ getSession().setLocale(new Locale("da", "DK"));
+ }
+ });
+ }
+}
Propchange:
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/imagebutton/Home.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added:
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/imagebutton/ImageButtonTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/imagebutton/ImageButtonTest.java?rev=591676&view=auto
==============================================================================
---
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/imagebutton/ImageButtonTest.java
(added)
+++
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/imagebutton/ImageButtonTest.java
Sat Nov 3 13:28:34 2007
@@ -0,0 +1,74 @@
+/*
+ * 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.form.imagebutton;
+
+import org.apache.wicket.WicketTestCase;
+
+/**
+ * @author Juergen Donnerstag
+ */
+public class ImageButtonTest extends WicketTestCase
+{
+ /**
+ * Construct.
+ *
+ * @param name
+ */
+ public ImageButtonTest(String name)
+ {
+ super(name);
+ }
+
+ /**
+ *
+ * @throws Exception
+ */
+ public void test_1() throws Exception
+ {
+ tester.startPage(Home.class);
+
+ tester.clickLink("goCanadian");
+ tester.startPage(Home.class);
+ tester
+
.assertContains("src=\"resources/org.apache.wicket.markup.html.form.imagebutton.Home/Beer_en_CA.gif\"");
+
+ tester.clickLink("goChinese");
+ tester.startPage(Home.class);
+ tester
+
.assertContains("src=\"resources/org.apache.wicket.markup.html.form.imagebutton.Home/Beer_zh_CN.gif\"");
+
+ tester.clickLink("goDanish");
+ tester.startPage(Home.class);
+ tester
+
.assertContains("src=\"resources/org.apache.wicket.markup.html.form.imagebutton.Home/Beer_da_DK.gif\"");
+
+ tester.clickLink("goDutch");
+ tester.startPage(Home.class);
+ tester
+
.assertContains("src=\"resources/org.apache.wicket.markup.html.form.imagebutton.Home/Beer_nl_NL.gif\"");
+
+ tester.clickLink("goGerman");
+ tester.startPage(Home.class);
+ tester
+
.assertContains("src=\"resources/org.apache.wicket.markup.html.form.imagebutton.Home/Beer_de_DE.gif\"");
+
+ tester.clickLink("goUS");
+ tester.startPage(Home.class);
+ tester
+
.assertContains("src=\"resources/org.apache.wicket.markup.html.form.imagebutton.Home/Beer_en_US.gif\"");
+ }
+}
Propchange:
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/imagebutton/ImageButtonTest.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added:
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/imagebutton/InvalidImageButtonPage.html
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/imagebutton/InvalidImageButtonPage.html?rev=591676&view=auto
==============================================================================
---
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/imagebutton/InvalidImageButtonPage.html
(added)
+++
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/imagebutton/InvalidImageButtonPage.html
Sat Nov 3 13:28:34 2007
@@ -0,0 +1,5 @@
+<html>
+ <body>
+ <input type="image" wicket:id="invalidImage"/>
+ </body>
+</html>
Propchange:
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/imagebutton/InvalidImageButtonPage.html
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added:
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/imagebutton/InvalidImageButtonPage.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/imagebutton/InvalidImageButtonPage.java?rev=591676&view=auto
==============================================================================
---
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/imagebutton/InvalidImageButtonPage.java
(added)
+++
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/imagebutton/InvalidImageButtonPage.java
Sat Nov 3 13:28:34 2007
@@ -0,0 +1,34 @@
+/*
+ * 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.form.imagebutton;
+
+import org.apache.wicket.markup.html.WebPage;
+import org.apache.wicket.markup.html.form.ImageButton;
+import org.apache.wicket.model.Model;
+
+public class InvalidImageButtonPage extends WebPage
+{
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
+ public InvalidImageButtonPage()
+ {
+ add(new ImageButton("invalidImage", new Model("toto.gif")));
+ }
+}
Propchange:
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/imagebutton/InvalidImageButtonPage.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added:
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/imagebutton/InvalidImageButtonTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/imagebutton/InvalidImageButtonTest.java?rev=591676&view=auto
==============================================================================
---
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/imagebutton/InvalidImageButtonTest.java
(added)
+++
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/imagebutton/InvalidImageButtonTest.java
Sat Nov 3 13:28:34 2007
@@ -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 org.apache.wicket.markup.html.form.imagebutton;
+
+import org.apache.wicket.WicketTestCase;
+
+public class InvalidImageButtonTest extends WicketTestCase
+{
+ public void testInvalidImage()
+ {
+ tester.startPage(InvalidImageButtonPage.class);
+ tester.assertRenderedPage(InvalidImageButtonPage.class);
+ tester.createRequestCycle();
+ tester.startPage(new InvalidImageButtonPage());
+ tester.assertRenderedPage(InvalidImageButtonPage.class);
+ }
+}
Propchange:
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/imagebutton/InvalidImageButtonTest.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added:
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/imagebutton/PubApplication.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/imagebutton/PubApplication.java?rev=591676&view=auto
==============================================================================
---
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/imagebutton/PubApplication.java
(added)
+++
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/imagebutton/PubApplication.java
Sat Nov 3 13:28:34 2007
@@ -0,0 +1,43 @@
+/*
+ * 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.form.imagebutton;
+
+import org.apache.wicket.protocol.http.WebApplication;
+
+/**
+ * WicketServlet class for the linkomatic example.
+ *
+ * @author Jonathan Locke
+ */
+public class PubApplication extends WebApplication
+{
+ /**
+ * Constructor
+ */
+ public PubApplication()
+ {
+ }
+
+ /**
+ * @see org.apache.wicket.Application#getHomePage()
+ */
+ public Class getHomePage()
+ {
+ return Home.class;
+ }
+
+}
Propchange:
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/imagebutton/PubApplication.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
