Author: greddin
Date: Thu Mar 20 14:35:36 2008
New Revision: 639470
URL: http://svn.apache.org/viewvc?rev=639470&view=rev
Log:
SHALE-486
Applying fixes from 1.0.5 branch. Fixed validator tests.
Modified:
shale/framework/trunk/shale-validator/src/test/java/org/apache/shale/validator/converter/AbstractConverterTestCase.java
shale/framework/trunk/shale-validator/src/test/java/org/apache/shale/validator/validator/AbstractValidatorTestCase.java
shale/framework/trunk/shale-validator/src/test/resources/org/apache/shale/validator/TestBundle.properties
Modified:
shale/framework/trunk/shale-validator/src/test/java/org/apache/shale/validator/converter/AbstractConverterTestCase.java
URL:
http://svn.apache.org/viewvc/shale/framework/trunk/shale-validator/src/test/java/org/apache/shale/validator/converter/AbstractConverterTestCase.java?rev=639470&r1=639469&r2=639470&view=diff
==============================================================================
---
shale/framework/trunk/shale-validator/src/test/java/org/apache/shale/validator/converter/AbstractConverterTestCase.java
(original)
+++
shale/framework/trunk/shale-validator/src/test/java/org/apache/shale/validator/converter/AbstractConverterTestCase.java
Thu Mar 20 14:35:36 2008
@@ -105,18 +105,18 @@
String message = null;
// Check a message that should be overridden by the application
- message = converter.message(facesContext, "errors.long");
+ message = converter.message(facesContext, "Long.unconverted");
assertNotNull(message);
assertEquals("Custom Long Error Message", message);
// Check a message that should be grabbed from the default resources
- message = converter.message(facesContext, "errors.integer");
+ message = converter.message(facesContext, "Integer.unconverted");
assertNotNull(message);
- assertEquals(defaultBundle.getString("errors.integer"), message);
+ assertEquals(defaultBundle.getString("Integer.unconverted"), message);
// Check a message that should be undefined
message = converter.message(facesContext, "???undefined???");
- assertNull(message);
+ assertNotNull(message);
}
Modified:
shale/framework/trunk/shale-validator/src/test/java/org/apache/shale/validator/validator/AbstractValidatorTestCase.java
URL:
http://svn.apache.org/viewvc/shale/framework/trunk/shale-validator/src/test/java/org/apache/shale/validator/validator/AbstractValidatorTestCase.java?rev=639470&r1=639469&r2=639470&view=diff
==============================================================================
---
shale/framework/trunk/shale-validator/src/test/java/org/apache/shale/validator/validator/AbstractValidatorTestCase.java
(original)
+++
shale/framework/trunk/shale-validator/src/test/java/org/apache/shale/validator/validator/AbstractValidatorTestCase.java
Thu Mar 20 14:35:36 2008
@@ -145,18 +145,18 @@
String message = null;
// Check a message that should be overridden by the application
- message = validator.message(facesContext, "errors.long");
+ message = validator.message(facesContext, "Long.unconverted");
assertNotNull(message);
assertEquals("Custom Long Error Message", message);
// Check a message that should be grabbed from the default resources
- message = validator.message(facesContext, "errors.integer");
+ message = validator.message(facesContext, "Integer.unconverted");
assertNotNull(message);
- assertEquals(defaultBundle.getString("errors.integer"), message);
+ assertEquals(defaultBundle.getString("Integer.unconverted"), message);
// Check a message that should be undefined
message = validator.message(facesContext, "???undefined???");
- assertNull(message);
+ assertNotNull(message);
}
Modified:
shale/framework/trunk/shale-validator/src/test/resources/org/apache/shale/validator/TestBundle.properties
URL:
http://svn.apache.org/viewvc/shale/framework/trunk/shale-validator/src/test/resources/org/apache/shale/validator/TestBundle.properties?rev=639470&r1=639469&r2=639470&view=diff
==============================================================================
---
shale/framework/trunk/shale-validator/src/test/resources/org/apache/shale/validator/TestBundle.properties
(original)
+++
shale/framework/trunk/shale-validator/src/test/resources/org/apache/shale/validator/TestBundle.properties
Thu Mar 20 14:35:36 2008
@@ -16,5 +16,5 @@
# limitations under the License.
# -----------------------------------------------------------------------------
-errors.Long=Custom Long Error Message
+Long.unconverted=Custom Long Error Message
