You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by fr...@apache.org on 2007/02/04 15:06:49 UTC
svn commit: r503409 [3/3] - in
/tapestry/tapestry5/tapestry-core/branches/kt-20070204-IDE-support: ./
src/main/java/org/apache/tapestry/
src/main/java/org/apache/tapestry/corelib/base/
src/main/java/org/apache/tapestry/corelib/components/ src/main/java...
Modified: tapestry/tapestry5/tapestry-core/branches/kt-20070204-IDE-support/src/test/java/org/apache/tapestry/validator/MaxLengthTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/branches/kt-20070204-IDE-support/src/test/java/org/apache/tapestry/validator/MaxLengthTest.java?view=diff&rev=503409&r1=503165&r2=503409
==============================================================================
--- tapestry/tapestry5/tapestry-core/branches/kt-20070204-IDE-support/src/test/java/org/apache/tapestry/validator/MaxLengthTest.java (original)
+++ tapestry/tapestry5/tapestry-core/branches/kt-20070204-IDE-support/src/test/java/org/apache/tapestry/validator/MaxLengthTest.java Sun Feb 4 06:06:46 2007
@@ -16,6 +16,7 @@
import org.apache.tapestry.Field;
import org.apache.tapestry.ValidationException;
+import org.apache.tapestry.internal.services.NoOpField;
import org.apache.tapestry.internal.test.InternalBaseTestCase;
import org.apache.tapestry.ioc.MessageFormatter;
import org.testng.annotations.Test;
@@ -31,9 +32,9 @@
replay();
- MaxLength validator = new MaxLength();
+ MaxLength validator = new MaxLength(value.length());
- validator.validate(field, value.length(), formatter, value);
+ validator.validate(field, formatter, value);
verify();
}
@@ -41,29 +42,35 @@
@Test
public void long_value() throws Exception
{
- String label = "My Field";
- Field field = newFieldWithLabel(label);
- MessageFormatter formatter = newMessageFormatter();
- String value = "Now the student has become the master.";
- String message = "{message}";
- Integer constraint = value.length() - 1;
-
- train_format(formatter, message, constraint, label);
-
- replay();
-
- MaxLength validator = new MaxLength();
+ Field field = new NoOpField()
+ {
+
+ @Override
+ public String getLabel()
+ {
+ return "foo";
+ }
+
+ };
+ MessageFormatter formatter = new MessageFormatter()
+ {
+
+ public String format(Object... args)
+ {
+ return String.format("aaa %1$s %2$s bbb", args);
+ }
+
+ };
+ MaxLength validator = new MaxLength(5);
try
{
- validator.validate(field, constraint, formatter, value);
+ validator.validate(field, formatter, "abcdef");
unreachable();
}
catch (ValidationException ex)
{
- assertEquals(ex.getMessage(), message);
+ assertEquals(ex.getMessage(), "aaa 5 foo bbb");
}
-
- verify();
}
}
Copied: tapestry/tapestry5/tapestry-core/branches/kt-20070204-IDE-support/src/test/java/org/apache/tapestry/validator/MaxTest.java (from r503165, tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/validator/MaxTest.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/branches/kt-20070204-IDE-support/src/test/java/org/apache/tapestry/validator/MaxTest.java?view=diff&rev=503409&p1=tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/validator/MaxTest.java&r1=503165&p2=tapestry/tapestry5/tapestry-core/branches/kt-20070204-IDE-support/src/test/java/org/apache/tapestry/validator/MaxTest.java&r2=503409
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/validator/MaxTest.java (original)
+++ tapestry/tapestry5/tapestry-core/branches/kt-20070204-IDE-support/src/test/java/org/apache/tapestry/validator/MaxTest.java Sun Feb 4 06:06:46 2007
@@ -16,6 +16,7 @@
import org.apache.tapestry.Field;
import org.apache.tapestry.ValidationException;
+import org.apache.tapestry.internal.services.NoOpField;
import org.apache.tapestry.internal.test.InternalBaseTestCase;
import org.apache.tapestry.ioc.MessageFormatter;
import org.testng.annotations.Test;
@@ -27,14 +28,13 @@
{
Field field = newField();
MessageFormatter formatter = newMessageFormatter();
- Long constraint = 50l;
replay();
- Max validator = new Max();
+ Max validator = new Max(501L);
for (int value = 48; value <= 50; value++)
- validator.validate(field, constraint, formatter, value);
+ validator.validate(field, formatter, value);
verify();
}
@@ -42,29 +42,35 @@
@Test
public void value_too_large() throws Exception
{
- String label = "My Field";
- Field field = newFieldWithLabel(label);
- MessageFormatter formatter = newMessageFormatter();
- String message = "{message}";
- Long constraint = 100l;
- Number value = 101;
-
- train_format(formatter, message, constraint, label);
-
- replay();
-
- Max validator = new Max();
+ Field field = new NoOpField()
+ {
+
+ @Override
+ public String getLabel()
+ {
+ return "foo";
+ }
+
+ };
+ MessageFormatter formatter = new MessageFormatter()
+ {
+
+ public String format(Object... args)
+ {
+ return String.format("aaa %1$s %2$s bbb", args);
+ }
+
+ };
+ Max validator = new Max(100L);
try
{
- validator.validate(field, constraint, formatter, value);
+ validator.validate(field, formatter, 101);
unreachable();
}
catch (ValidationException ex)
{
- assertEquals(ex.getMessage(), message);
+ assertEquals(ex.getMessage(), "aaa 100 foo bbb");
}
-
- verify();
}
}
Modified: tapestry/tapestry5/tapestry-core/branches/kt-20070204-IDE-support/src/test/java/org/apache/tapestry/validator/MinLengthTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/branches/kt-20070204-IDE-support/src/test/java/org/apache/tapestry/validator/MinLengthTest.java?view=diff&rev=503409&r1=503165&r2=503409
==============================================================================
--- tapestry/tapestry5/tapestry-core/branches/kt-20070204-IDE-support/src/test/java/org/apache/tapestry/validator/MinLengthTest.java (original)
+++ tapestry/tapestry5/tapestry-core/branches/kt-20070204-IDE-support/src/test/java/org/apache/tapestry/validator/MinLengthTest.java Sun Feb 4 06:06:46 2007
@@ -16,6 +16,7 @@
import org.apache.tapestry.Field;
import org.apache.tapestry.ValidationException;
+import org.apache.tapestry.internal.services.NoOpField;
import org.apache.tapestry.internal.test.InternalBaseTestCase;
import org.apache.tapestry.ioc.MessageFormatter;
import org.testng.annotations.Test;
@@ -32,9 +33,9 @@
replay();
- MinLength validator = new MinLength();
+ MinLength validator = new MinLength(value.length());
- validator.validate(field, value.length(), formatter, value);
+ validator.validate(field, formatter, value);
verify();
}
@@ -42,29 +43,35 @@
@Test
public void short_value() throws Exception
{
- String label = "My Field";
- Field field = newFieldWithLabel(label);
- MessageFormatter formatter = newMessageFormatter();
- String value = "Now the student has become the master.";
- String message = "{message}";
- Integer constraint = value.length() + 1;
-
- train_format(formatter, message, constraint, label);
-
- replay();
-
- MinLength validator = new MinLength();
+ Field field = new NoOpField()
+ {
+
+ @Override
+ public String getLabel()
+ {
+ return "foo";
+ }
+
+ };
+ MessageFormatter formatter = new MessageFormatter()
+ {
+
+ public String format(Object... args)
+ {
+ return String.format("aaa %1$s %2$s bbb", args);
+ }
+
+ };
+ MinLength validator = new MinLength(5);
try
{
- validator.validate(field, constraint, formatter, value);
+ validator.validate(field, formatter, "abcd");
unreachable();
}
catch (ValidationException ex)
{
- assertEquals(ex.getMessage(), message);
+ assertEquals(ex.getMessage(), "aaa 5 foo bbb");
}
-
- verify();
}
}
Modified: tapestry/tapestry5/tapestry-core/branches/kt-20070204-IDE-support/src/test/java/org/apache/tapestry/validator/MinTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/branches/kt-20070204-IDE-support/src/test/java/org/apache/tapestry/validator/MinTest.java?view=diff&rev=503409&r1=503165&r2=503409
==============================================================================
--- tapestry/tapestry5/tapestry-core/branches/kt-20070204-IDE-support/src/test/java/org/apache/tapestry/validator/MinTest.java (original)
+++ tapestry/tapestry5/tapestry-core/branches/kt-20070204-IDE-support/src/test/java/org/apache/tapestry/validator/MinTest.java Sun Feb 4 06:06:46 2007
@@ -16,6 +16,7 @@
import org.apache.tapestry.Field;
import org.apache.tapestry.ValidationException;
+import org.apache.tapestry.internal.services.NoOpField;
import org.apache.tapestry.internal.test.InternalBaseTestCase;
import org.apache.tapestry.ioc.MessageFormatter;
import org.testng.annotations.Test;
@@ -27,14 +28,13 @@
{
Field field = newField();
MessageFormatter formatter = newMessageFormatter();
- Long constraint = 50l;
replay();
- Min validator = new Min();
+ Min validator = new Min(50l);
for (int value = 50; value < 52; value++)
- validator.validate(field, constraint, formatter, value);
+ validator.validate(field, formatter, value);
verify();
}
@@ -42,29 +42,35 @@
@Test
public void value_too_small() throws Exception
{
- String label = "My Field";
- Field field = newFieldWithLabel(label);
- MessageFormatter formatter = newMessageFormatter();
- String message = "{message}";
- Long constraint = 100l;
- Number value = 99;
-
- train_format(formatter, message, constraint, label);
-
- replay();
-
- Min validator = new Min();
+ Field field = new NoOpField()
+ {
+
+ @Override
+ public String getLabel()
+ {
+ return "foo";
+ }
+
+ };
+ MessageFormatter formatter = new MessageFormatter()
+ {
+
+ public String format(Object... args)
+ {
+ return String.format("aaa %1$s %2$s bbb", args);
+ }
+
+ };
+ Min validator = new Min(100L);
try
{
- validator.validate(field, constraint, formatter, value);
+ validator.validate(field, formatter, 99);
unreachable();
}
catch (ValidationException ex)
{
- assertEquals(ex.getMessage(), message);
+ assertEquals(ex.getMessage(), "aaa 100 foo bbb");
}
-
- verify();
}
}
Modified: tapestry/tapestry5/tapestry-core/branches/kt-20070204-IDE-support/src/test/java/org/apache/tapestry/validator/RequiredTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/branches/kt-20070204-IDE-support/src/test/java/org/apache/tapestry/validator/RequiredTest.java?view=diff&rev=503409&r1=503165&r2=503409
==============================================================================
--- tapestry/tapestry5/tapestry-core/branches/kt-20070204-IDE-support/src/test/java/org/apache/tapestry/validator/RequiredTest.java (original)
+++ tapestry/tapestry5/tapestry-core/branches/kt-20070204-IDE-support/src/test/java/org/apache/tapestry/validator/RequiredTest.java Sun Feb 4 06:06:46 2007
@@ -34,7 +34,7 @@
try
{
- new Required().validate(field, null, formatter, null);
+ new Required().validate(field, formatter, null);
unreachable();
}
catch (ValidationException ex)
@@ -57,7 +57,7 @@
try
{
- new Required().validate(field, null, formatter, "");
+ new Required().validate(field, formatter, "");
unreachable();
}
catch (ValidationException ex)
@@ -76,7 +76,7 @@
replay();
- new Required().validate(field, null, formatter, "not null");
+ new Required().validate(field, formatter, "not null");
verify();
}
Modified: tapestry/tapestry5/tapestry-core/branches/kt-20070204-IDE-support/src/test/resources/org/apache/tapestry/integration/app1/pages/ValidForm.html
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/branches/kt-20070204-IDE-support/src/test/resources/org/apache/tapestry/integration/app1/pages/ValidForm.html?view=diff&rev=503409&r1=503165&r2=503409
==============================================================================
--- tapestry/tapestry5/tapestry-core/branches/kt-20070204-IDE-support/src/test/resources/org/apache/tapestry/integration/app1/pages/ValidForm.html (original)
+++ tapestry/tapestry5/tapestry-core/branches/kt-20070204-IDE-support/src/test/resources/org/apache/tapestry/integration/app1/pages/ValidForm.html Sun Feb 4 06:06:46 2007
@@ -8,17 +8,17 @@
<t:comp type="Errors"/>
<label t:type="Label" for="email">This isn't used</label>: <input
- t:type="TextField" t:id="email" value="incident.email" size="50" t:validate="required"/>
+ t:id="email" size="50"/>
<br/>
- <label t:type="Label" for="message"/>: <textarea t:type="TextArea" t:id="message" t:label="Incident Message"
- value="incident.message" cols="50" rows="10"> You can put text here, but it isn't used. </textarea>
+ <label t:type="Label" for="message"/>: <textarea t:id="message"
+ cols="50" rows="10"> You can put text here, but it isn't used. </textarea>
<br/>
- <input t:type="Checkbox" t:id="urgent" value="incident.urgent"/>
+ <input t:id="urgent" />
<label t:type="Label" for="urgent"/>
<br/>
<label t:type="Label" for="hours"/>:
- <input t:type="TextField" t:id="hours" value="incident.hours" size="10" t:validate="required"/>
+ <input t:id="hours" size="10"/>
<br/>
Modified: tapestry/tapestry5/tapestry-core/branches/kt-20070204-IDE-support/src/test/resources/org/apache/tapestry/integration/app2/pages/TestPageForForm.html
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/branches/kt-20070204-IDE-support/src/test/resources/org/apache/tapestry/integration/app2/pages/TestPageForForm.html?view=diff&rev=503409&r1=503165&r2=503409
==============================================================================
--- tapestry/tapestry5/tapestry-core/branches/kt-20070204-IDE-support/src/test/resources/org/apache/tapestry/integration/app2/pages/TestPageForForm.html (original)
+++ tapestry/tapestry5/tapestry-core/branches/kt-20070204-IDE-support/src/test/resources/org/apache/tapestry/integration/app2/pages/TestPageForForm.html Sun Feb 4 06:06:46 2007
@@ -1,6 +1,6 @@
<html xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd">
<p><t:comp id="form1" type="Form">
- <t:comp type="TextField" id="t1" value="value" size="50"/>
+ <t:comp id="t1" size="50"/>
</t:comp></p>
<p>
You entered: ${value}.
Modified: tapestry/tapestry5/tapestry-core/branches/kt-20070204-IDE-support/src/test/resources/org/apache/tapestry/integration/app2/pages/TestPageForSubmit.html
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/branches/kt-20070204-IDE-support/src/test/resources/org/apache/tapestry/integration/app2/pages/TestPageForSubmit.html?view=diff&rev=503409&r1=503165&r2=503409
==============================================================================
--- tapestry/tapestry5/tapestry-core/branches/kt-20070204-IDE-support/src/test/resources/org/apache/tapestry/integration/app2/pages/TestPageForSubmit.html (original)
+++ tapestry/tapestry5/tapestry-core/branches/kt-20070204-IDE-support/src/test/resources/org/apache/tapestry/integration/app2/pages/TestPageForSubmit.html Sun Feb 4 06:06:46 2007
@@ -1,12 +1,12 @@
<html xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd">
<p>
<form t:id="form1">
- <t:comp id="t1" type="TextField"/>
+ <t:comp id="t1"/>
<t:comp id="capitalize1"/>
</form>
<form t:id="form2">
<t:comp id="capitalize2"/>
- <t:comp id="t2" type="TextField"/>
+ <t:comp id="t2"/>
</form></p>
<input type="submit" id="orphanedSubmit"/>
<p>