You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by eh...@apache.org on 2007/08/27 00:35:32 UTC
svn commit: r569898 - in
/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket:
markup/html/form/ properties/
Author: ehillenius
Date: Sun Aug 26 15:35:31 2007
New Revision: 569898
URL: http://svn.apache.org/viewvc?rev=569898&view=rev
Log:
tests for WICKET-891
Added:
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/properties/MyApplication_en.properties
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/properties/MyApplication_mystyle_en.properties
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/properties/MyTesterApplication_nl.properties
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/properties/TestForm_nl.properties
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/properties/TestPage_nl.properties
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/properties/TestPanel_nl.properties
Modified:
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/ValidatorPropertiesTest.java
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/properties/PropertiesTest.java
Modified: wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/ValidatorPropertiesTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/ValidatorPropertiesTest.java?rev=569898&r1=569897&r2=569898&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/ValidatorPropertiesTest.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/ValidatorPropertiesTest.java Sun Aug 26 15:35:31 2007
@@ -16,6 +16,7 @@
*/
package org.apache.wicket.markup.html.form;
+import java.util.Locale;
import java.util.MissingResourceException;
import junit.framework.TestCase;
@@ -50,6 +51,9 @@
{
tester.setupRequestAndResponse();
WebRequestCycle cycle = tester.createRequestCycle();
+ cycle.getSession().setLocale(Locale.ENGLISH);
+
+ // test English/ default
TestPage page = new TestPage();
Form form = (Form)page.get("form1");
@@ -107,6 +111,66 @@
// Test caching
assertEquals("Default message: text8-Label required", page.getText8().getFeedbackMessage()
+ .getMessage().toString());
+
+ // now test Dutch
+
+ cycle.getSession().setLocale(new Locale("nl"));
+ page = new TestPage();
+ form = (Form)page.get("form1");
+ assertNotNull(form);
+
+ page.getText1().setInput("");
+ page.getText1().validateRequired();
+ page.getText2().setInput("");
+ page.getText2().validateRequired();
+ page.getText3().setInput("");
+ page.getText3().validateRequired();
+ page.getText4().setInput("");
+ page.getText4().validateRequired();
+ page.getText5().setInput("");
+ page.getText5().validateRequired();
+ page.getText6().setInput("");
+ page.getText6().validateRequired();
+ page.getText7().setInput("");
+ page.getText7().validateRequired();
+ page.getText8().setInput("");
+ page.getText8().validateRequired();
+ page.getText9().setInput("");
+ page.getText9().validateRequired();
+ page.getText10().setInput("");
+ page.getText10().validateRequired();
+ page.getText11().setInput("");
+ page.getText11().validateRequired();
+ page.getText12().setInput("");
+ page.getText12().validateRequired();
+
+ assertEquals("text1label is verplicht", page.getText1().getFeedbackMessage().getMessage()
+ .toString());
+ assertEquals("text2 is verplicht", page.getText2().getFeedbackMessage().getMessage()
+ .toString());
+ assertEquals("ok: text3333 mist", page.getText3().getFeedbackMessage().getMessage()
+ .toString());
+ assertEquals("ok: Text4Label mist", page.getText4().getFeedbackMessage().getMessage()
+ .toString());
+ assertEquals("ok: text mist", page.getText5().getFeedbackMessage().getMessage().toString());
+ assertEquals("Default message: text6 verplicht", page.getText6().getFeedbackMessage()
+ .getMessage().toString());
+ assertEquals("input for text7-Label mist", page.getText7().getFeedbackMessage()
+ .getMessage().toString());
+ assertEquals("Default message: text8-Label verplicht", page.getText8().getFeedbackMessage()
+ .getMessage().toString());
+ assertEquals("gevonden in panel", page.getText9().getFeedbackMessage().getMessage()
+ .toString());
+ assertEquals("gevonden in form", page.getText10().getFeedbackMessage().getMessage()
+ .toString());
+ assertEquals("gevonden in page", page.getText11().getFeedbackMessage().getMessage()
+ .toString());
+ assertEquals("gevonden in page", page.getText12().getFeedbackMessage().getMessage()
+ .toString());
+
+ // Test caching
+ assertEquals("Default message: text8-Label verplicht", page.getText8().getFeedbackMessage()
.getMessage().toString());
}
Added: wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/properties/MyApplication_en.properties
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/properties/MyApplication_en.properties?rev=569898&view=auto
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/properties/MyApplication_en.properties (added)
+++ wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/properties/MyApplication_en.properties Sun Aug 26 15:35:31 2007
@@ -0,0 +1 @@
+test2 = MyApplication_en
\ No newline at end of file
Added: wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/properties/MyApplication_mystyle_en.properties
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/properties/MyApplication_mystyle_en.properties?rev=569898&view=auto
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/properties/MyApplication_mystyle_en.properties (added)
+++ wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/properties/MyApplication_mystyle_en.properties Sun Aug 26 15:35:31 2007
@@ -0,0 +1 @@
+test4 = MyApplication_mystyle_en
\ No newline at end of file
Added: wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/properties/MyTesterApplication_nl.properties
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/properties/MyTesterApplication_nl.properties?rev=569898&view=auto
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/properties/MyTesterApplication_nl.properties (added)
+++ wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/properties/MyTesterApplication_nl.properties Sun Aug 26 15:35:31 2007
@@ -0,0 +1,4 @@
+
+form1.text7.Required = input for ${label} mist
+form1.text7 = text7-Label
+text8 = text8-Label
Modified: wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/properties/PropertiesTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/properties/PropertiesTest.java?rev=569898&r1=569897&r2=569898&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/properties/PropertiesTest.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/properties/PropertiesTest.java Sun Aug 26 15:35:31 2007
@@ -43,14 +43,13 @@
{
tester = new WicketTester(new MyApplication());
}
+
protected void tearDown() throws Exception
{
tester.destroy();
}
/**
- *
- *
*/
public void test_1()
{
@@ -60,15 +59,18 @@
cycle.getSession().setLocale(Locale.GERMANY);
cycle.getSession().setStyle("mystyle");
- String str = page.getString("test1");
- str = page.getString("test2");
- str = page.getString("test3");
- str = page.getString("test4");
+ assertEquals("MyApplication", page.getString("test1"));
+ assertEquals("MyApplication_de", page.getString("test2"));
+ assertEquals("MyApplication_mystyle", page.getString("test3"));
+ assertEquals("MyApplication_mystyle_de", page.getString("test4"));
+
+ cycle.getSession().setLocale(Locale.ENGLISH);
+
+ assertEquals("MyApplication_en", page.getString("test2"));
+ assertEquals("MyApplication_mystyle_en", page.getString("test4"));
}
/**
- *
- *
*/
public void test_2()
{
@@ -85,9 +87,14 @@
}
};
- String str = page.getString("test1");
- str = page.getString("test2");
- str = page.getString("test3");
- str = page.getString("test4");
+ assertEquals("MyApplication", page.getString("test1"));
+ assertEquals("MyApplication_de", page.getString("test2"));
+ assertEquals("MyApplication_mystyle", page.getString("test3"));
+ assertEquals("MyApplication_mystyle_de", page.getString("test4"));
+
+ cycle.getSession().setLocale(Locale.ENGLISH);
+
+ assertEquals("MyApplication_en", page.getString("test2"));
+ assertEquals("MyApplication_mystyle_en", page.getString("test4"));
}
}
Added: wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/properties/TestForm_nl.properties
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/properties/TestForm_nl.properties?rev=569898&view=auto
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/properties/TestForm_nl.properties (added)
+++ wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/properties/TestForm_nl.properties Sun Aug 26 15:35:31 2007
@@ -0,0 +1,6 @@
+
+text5.Required = ok: text mist
+
+panel1.text4.Required = ok testForm: ${label} mist
+text10.Required = gevonden in form
+panel2.text11.Required = gevonden in page
Added: wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/properties/TestPage_nl.properties
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/properties/TestPage_nl.properties?rev=569898&view=auto
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/properties/TestPage_nl.properties (added)
+++ wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/properties/TestPage_nl.properties Sun Aug 26 15:35:31 2007
@@ -0,0 +1,30 @@
+# Default message
+Required = Default message: ${label} verplicht
+
+# A Textfield with label
+form1.text1 = text1label
+form1.text1.Required = ${label} is verplicht
+
+# A TextField without label. label should default to the formComponent's id
+form1.text2.Required = ${label} is verplicht
+
+# This one is wrong. Because the panel id is missing
+form2.text3.Required = wrong: text3333 mist
+
+# Must be like
+form2.panel1.text3.Required = ok: text3333 mist
+
+form2.panel1.text4 = Text4Label
+form2.panel1.text4.Required = ok: ${label} mist
+
+#form2.panel2.text5.Required = ok: text555 mist
+#form2.panel2.text6.Required = ok: text555 mist
+
+form2.text5.Required = wrong: text555 mist
+form2.text6.Required = wrong: text555 mist
+
+form2.panel1.text5.Required = wrong: text555 mist
+form2.panel1.text6.Required = wrong: text555 mist
+
+form2.panel2.text11.Required = gevonden in page
+text12.Required = gevonden in page
Added: wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/properties/TestPanel_nl.properties
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/properties/TestPanel_nl.properties?rev=569898&view=auto
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/properties/TestPanel_nl.properties (added)
+++ wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/properties/TestPanel_nl.properties Sun Aug 26 15:35:31 2007
@@ -0,0 +1,3 @@
+
+text5.Required = ok: 555text555 mist
+text9.Required = gevonden in panel