Author: tv
Date: Wed Sep 9 08:46:27 2009
New Revision: 812827
URL: http://svn.apache.org/viewvc?rev=812827&view=rev
Log:
The number validators did not set an invalid number message when initialized
with the default constructor. Added a test to check the behaviour. Fixes TRB-74
Modified:
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/BigDecimalValidator.java
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/DoubleValidator.java
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/FloatValidator.java
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/IntegerRangeValidator.java
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/IntegerValidator.java
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/LongValidator.java
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/ShortValidator.java
turbine/fulcrum/trunk/intake/src/test/intake1.xml
turbine/fulcrum/trunk/intake/src/test/org/apache/fulcrum/intake/IntakeTest.java
turbine/fulcrum/trunk/intake/xdocs/changes.xml
Modified:
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/BigDecimalValidator.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/BigDecimalValidator.java?rev=812827&r1=812826&r2=812827&view=diff
==============================================================================
---
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/BigDecimalValidator.java
(original)
+++
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/BigDecimalValidator.java
Wed Sep 9 08:46:27 2009
@@ -63,7 +63,7 @@
public BigDecimalValidator(Map paramMap)
throws InvalidMaskException
{
- invalidNumberMessage = "Entry was not a valid BigDecimal";
+ this();
init(paramMap);
}
@@ -72,6 +72,7 @@
*/
public BigDecimalValidator()
{
+ invalidNumberMessage = "Entry was not a valid BigDecimal";
}
/**
Modified:
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/DoubleValidator.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/DoubleValidator.java?rev=812827&r1=812826&r2=812827&view=diff
==============================================================================
---
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/DoubleValidator.java
(original)
+++
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/DoubleValidator.java
Wed Sep 9 08:46:27 2009
@@ -65,7 +65,7 @@
public DoubleValidator(Map paramMap)
throws InvalidMaskException
{
- invalidNumberMessage = "Entry was not a valid Double";
+ this();
init(paramMap);
}
@@ -74,6 +74,7 @@
*/
public DoubleValidator()
{
+ invalidNumberMessage = "Entry was not a valid Double";
}
/**
Modified:
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/FloatValidator.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/FloatValidator.java?rev=812827&r1=812826&r2=812827&view=diff
==============================================================================
---
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/FloatValidator.java
(original)
+++
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/FloatValidator.java
Wed Sep 9 08:46:27 2009
@@ -65,7 +65,7 @@
public FloatValidator(Map paramMap)
throws InvalidMaskException
{
- invalidNumberMessage = "Entry was not a valid Float";
+ this();
init(paramMap);
}
@@ -74,6 +74,7 @@
*/
public FloatValidator()
{
+ invalidNumberMessage = "Entry was not a valid Float";
}
/**
Modified:
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/IntegerRangeValidator.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/IntegerRangeValidator.java?rev=812827&r1=812826&r2=812827&view=diff
==============================================================================
---
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/IntegerRangeValidator.java
(original)
+++
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/IntegerRangeValidator.java
Wed Sep 9 08:46:27 2009
@@ -73,6 +73,7 @@
public IntegerRangeValidator(final Map paramMap)
throws IntakeException
{
+ this();
init(paramMap);
}
Modified:
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/IntegerValidator.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/IntegerValidator.java?rev=812827&r1=812826&r2=812827&view=diff
==============================================================================
---
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/IntegerValidator.java
(original)
+++
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/IntegerValidator.java
Wed Sep 9 08:46:27 2009
@@ -60,7 +60,7 @@
public IntegerValidator(Map paramMap)
throws InvalidMaskException
{
- invalidNumberMessage = "Entry was not a valid Integer";
+ this();
init(paramMap);
}
@@ -69,6 +69,7 @@
*/
public IntegerValidator()
{
+ invalidNumberMessage = "Entry was not a valid Integer";
}
/**
Modified:
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/LongValidator.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/LongValidator.java?rev=812827&r1=812826&r2=812827&view=diff
==============================================================================
---
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/LongValidator.java
(original)
+++
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/LongValidator.java
Wed Sep 9 08:46:27 2009
@@ -60,7 +60,7 @@
public LongValidator(Map paramMap)
throws InvalidMaskException
{
- invalidNumberMessage = "Entry was not a valid Long";
+ this();
init(paramMap);
}
@@ -69,6 +69,7 @@
*/
public LongValidator()
{
+ invalidNumberMessage = "Entry was not a valid Long";
}
/**
Modified:
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/ShortValidator.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/ShortValidator.java?rev=812827&r1=812826&r2=812827&view=diff
==============================================================================
---
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/ShortValidator.java
(original)
+++
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/ShortValidator.java
Wed Sep 9 08:46:27 2009
@@ -60,7 +60,7 @@
public ShortValidator(Map paramMap)
throws InvalidMaskException
{
- invalidNumberMessage = "Entry was not a valid Short";
+ this();
init(paramMap);
}
@@ -69,6 +69,7 @@
*/
public ShortValidator()
{
+ invalidNumberMessage = "Entry was not a valid Short";
}
/**
Modified: turbine/fulcrum/trunk/intake/src/test/intake1.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/intake/src/test/intake1.xml?rev=812827&r1=812826&r2=812827&view=diff
==============================================================================
--- turbine/fulcrum/trunk/intake/src/test/intake1.xml (original)
+++ turbine/fulcrum/trunk/intake/src/test/intake1.xml Wed Sep 9 08:46:27 2009
@@ -39,4 +39,15 @@
fieldClass="org.apache.fulcrum.intake.test.MyField" />
</group>
+ <group name="NumberTest" key="nt">
+ <field name="EmptyIntegerTestField" key="eitf" type="int"/>
+ <field name="EmptyLongTestField" key="eltf" type="long"/>
+ <field name="EmptyShortTestField" key="estf" type="short"/>
+ <field name="EmptyFloatTestField" key="eftf" type="float"/>
+ <field name="EmptyDoubleTestField" key="edtf" type="double"/>
+ <field name="EmptyBigDecimalTestField" key="ebdtf" type="BigDecimal"/>
+ <field name="NumberTestField" key="ntf" type="int">
+ <rule name="invalidNumber">Not a number</rule>
+ </field>
+ </group>
</input-data>
Modified:
turbine/fulcrum/trunk/intake/src/test/org/apache/fulcrum/intake/IntakeTest.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/intake/src/test/org/apache/fulcrum/intake/IntakeTest.java?rev=812827&r1=812826&r2=812827&view=diff
==============================================================================
---
turbine/fulcrum/trunk/intake/src/test/org/apache/fulcrum/intake/IntakeTest.java
(original)
+++
turbine/fulcrum/trunk/intake/src/test/org/apache/fulcrum/intake/IntakeTest.java
Wed Sep 9 08:46:27 2009
@@ -23,6 +23,7 @@
import org.apache.fulcrum.intake.model.Field;
import org.apache.fulcrum.intake.model.Group;
import org.apache.fulcrum.intake.validator.BooleanValidator;
+import org.apache.fulcrum.intake.validator.ValidationException;
/**
* Test the facade class for the service
*
@@ -106,4 +107,81 @@
assertTrue("The Default Validator of an intake Field type boolean
should be BooleanValidator", (booleanField.getValidator() instanceof
BooleanValidator));
assertTrue("An intake Field type boolean, which is required, should be
required", booleanField.isRequired());
}
+
+ public void testInvalidNumberMessage() throws Exception // TRB-74
+ {
+ IntakeService is = (IntakeService) this.resolve(
IntakeService.class.getName() );
+ Group group = is.getGroup("NumberTest");
+ assertNotNull(group);
+
+ Field intField = group.get("EmptyIntegerTestField");
+ try
+ {
+ intField.getValidator().assertValidity("aa");
+ }
+ catch (ValidationException ve)
+ {
+ assertEquals("Invalid number message is wrong.", "Entry was not a
valid Integer", ve.getMessage());
+ }
+
+ Field longField = group.get("EmptyLongTestField");
+ try
+ {
+ longField.getValidator().assertValidity("aa");
+ }
+ catch (ValidationException ve)
+ {
+ assertEquals("Invalid number message is wrong.", "Entry was not a
valid Long", ve.getMessage());
+ }
+
+ Field shortField = group.get("EmptyShortTestField");
+ try
+ {
+ shortField.getValidator().assertValidity("aa");
+ }
+ catch (ValidationException ve)
+ {
+ assertEquals("Invalid number message is wrong.", "Entry was not a
valid Short", ve.getMessage());
+ }
+
+ Field floatField = group.get("EmptyFloatTestField");
+ try
+ {
+ floatField.getValidator().assertValidity("aa");
+ }
+ catch (ValidationException ve)
+ {
+ assertEquals("Invalid number message is wrong.", "Entry was not a
valid Float", ve.getMessage());
+ }
+
+ Field doubleField = group.get("EmptyDoubleTestField");
+ try
+ {
+ doubleField.getValidator().assertValidity("aa");
+ }
+ catch (ValidationException ve)
+ {
+ assertEquals("Invalid number message is wrong.", "Entry was not a
valid Double", ve.getMessage());
+ }
+
+ Field bigDecimalField = group.get("EmptyBigDecimalTestField");
+ try
+ {
+ bigDecimalField.getValidator().assertValidity("aa");
+ }
+ catch (ValidationException ve)
+ {
+ assertEquals("Invalid number message is wrong.", "Entry was not a
valid BigDecimal", ve.getMessage());
+ }
+
+ Field numberField = group.get("NumberTestField");
+ try
+ {
+ numberField.getValidator().assertValidity("aa");
+ }
+ catch (ValidationException ve)
+ {
+ assertEquals("Invalid number message is wrong.", "Not a number",
ve.getMessage());
+ }
+ }
}
Modified: turbine/fulcrum/trunk/intake/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/intake/xdocs/changes.xml?rev=812827&r1=812826&r2=812827&view=diff
==============================================================================
--- turbine/fulcrum/trunk/intake/xdocs/changes.xml (original)
+++ turbine/fulcrum/trunk/intake/xdocs/changes.xml Wed Sep 9 08:46:27 2009
@@ -26,6 +26,10 @@
<body>
<release version="1.0.4-dev" date="in Subversion">
+ <action type="fix" dev="tv" issue="TRB-74" due-to="Susi Berrington">
+ The number validators did not set an invalid number message when
initialized with
+ the default constructor
+ </action>
<action type="remove" dev="tv">
Removed the Intake class. It was duplicating the IntakeServiceFacade.
</action>
