diff options
author | Claude Brisson <cbrisson@apache.org> | 2018-11-26 10:31:53 +0000 |
---|---|---|
committer | Claude Brisson <cbrisson@apache.org> | 2018-11-26 10:31:53 +0000 |
commit | 2fd4ceeca52a7b187700d4f46d10019e0400c670 (patch) | |
tree | e2811af0d51cc8d9469e76cd7946ba63fc8599e8 /velocity-engine-core/src/test | |
parent | b3418f7745a21e4a18278cf13ba66880be9e2858 (diff) | |
download | apache-velocity-engine-2fd4ceeca52a7b187700d4f46d10019e0400c670.tar.gz |
[engine] Add String -> Locale in provided default explicit conversions
git-svn-id: https://svn.apache.org/repos/asf/velocity/engine/trunk@1847458 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'velocity-engine-core/src/test')
4 files changed, 108 insertions, 0 deletions
diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/util/introspection/ConversionHandlerTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/util/introspection/ConversionHandlerTestCase.java index 359ad056..6856e83e 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/util/introspection/ConversionHandlerTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/util/introspection/ConversionHandlerTestCase.java @@ -41,6 +41,7 @@ import java.io.FileOutputStream; import java.io.OutputStreamWriter; import java.io.StringWriter; import java.io.Writer; +import java.util.Locale; import java.util.Map; import java.util.TreeMap; @@ -236,6 +237,7 @@ public class ConversionHandlerTestCase extends BaseTestCase map.put("S. string-big-integral", new String("12345678")); map.put("T. string-floating", new String("123.345")); map.put("U. null", null); + map.put("V. locale", "fr_FR"); context.put("map", map); context.put("target", new Obj()); Class[] types = @@ -289,6 +291,7 @@ public class ConversionHandlerTestCase extends BaseTestCase public String objectObject(Object o) { return "Object ok: " + o; } public String objectString(String s) { return "String ok: " + s; } public String objectEnum(Color c) { return "Enum ok: " + c; } + public String locale(Locale loc) { return "Locale ok: " + loc; } public String toString() { return "instance of Obj"; } } diff --git a/velocity-engine-core/src/test/resources/conversion/compare/test_conv_with_handler.cmp b/velocity-engine-core/src/test/resources/conversion/compare/test_conv_with_handler.cmp index 0685864a..359f69f2 100644 --- a/velocity-engine-core/src/test/resources/conversion/compare/test_conv_with_handler.cmp +++ b/velocity-engine-core/src/test/resources/conversion/compare/test_conv_with_handler.cmp @@ -27,6 +27,7 @@ A. bool-true Value java.lang.Boolean true $target.valueOfFloat($value) $target.valueOfDouble($value) $target.valueOfString($value) + $target.locale($value) B. bool-false Value java.lang.Boolean false boolean ok: false byte ok: 0 @@ -56,6 +57,7 @@ B. bool-false Value java.lang.Boolean false $target.valueOfFloat($value) $target.valueOfDouble($value) $target.valueOfString($value) + $target.locale($value) C. byte-0 Value java.lang.Byte 0 boolean ok: false byte ok: 0 @@ -85,6 +87,7 @@ C. byte-0 Value java.lang.Byte 0 $target.valueOfFloat($value) $target.valueOfDouble($value) $target.valueOfString($value) + $target.locale($value) D. byte-1 Value java.lang.Byte 1 boolean ok: true byte ok: 1 @@ -114,6 +117,7 @@ D. byte-1 Value java.lang.Byte 1 $target.valueOfFloat($value) $target.valueOfDouble($value) $target.valueOfString($value) + $target.locale($value) E. short Value java.lang.Short 125 boolean ok: true byte ok: 125 @@ -143,6 +147,7 @@ E. short Value java.lang.Short 125 $target.valueOfFloat($value) $target.valueOfDouble($value) $target.valueOfString($value) + $target.locale($value) F. int Value java.lang.Integer 24323 boolean ok: true integralByte -> NumberFormatException: value out of range for byte type: 24323 @@ -172,6 +177,7 @@ F. int Value java.lang.Integer 24323 $target.valueOfFloat($value) $target.valueOfDouble($value) $target.valueOfString($value) + $target.locale($value) G. long Value java.lang.Long 5235235 boolean ok: true integralByte -> NumberFormatException: value out of range for byte type: 5235235 @@ -201,6 +207,7 @@ G. long Value java.lang.Long 5235235 $target.valueOfFloat($value) $target.valueOfDouble($value) $target.valueOfString($value) + $target.locale($value) H. float Value java.lang.Float 34523.344 boolean ok: true integralByte -> NumberFormatException: value out of range for byte type: 34523 @@ -230,6 +237,7 @@ H. float Value java.lang.Float 34523.344 $target.valueOfFloat($value) $target.valueOfDouble($value) $target.valueOfString($value) + $target.locale($value) I. double Value java.lang.Double 54235.3253 boolean ok: true integralByte -> NumberFormatException: value out of range for byte type: 54235 @@ -259,6 +267,7 @@ I. double Value java.lang.Double 54235.3253 $target.valueOfFloat($value) $target.valueOfDouble($value) $target.valueOfString($value) + $target.locale($value) J. char Value java.lang.Character @ boolean ok: true $target.integralByte($value) @@ -288,6 +297,7 @@ J. char Value java.lang.Character @ $target.valueOfFloat($value) $target.valueOfDouble($value) $target.valueOfString($value) + $target.locale($value) K. object Value org.apache.velocity.test.util.introspection.ConversionHandlerTestCase$Obj instance of Obj $target.integralBoolean($value) $target.integralByte($value) @@ -317,6 +327,7 @@ K. object Value org.apache.velocity.test.util.introspection.ConversionHandlerTes $target.valueOfFloat($value) $target.valueOfDouble($value) $target.valueOfString($value) + $target.locale($value) L. enum Value org.apache.velocity.test.util.introspection.ConversionHandlerTestCase$Obj$Color GREEN $target.integralBoolean($value) $target.integralByte($value) @@ -346,6 +357,7 @@ L. enum Value org.apache.velocity.test.util.introspection.ConversionHandlerTestC $target.valueOfFloat($value) $target.valueOfDouble($value) $target.valueOfString($value) + $target.locale($value) M. string Value java.lang.String foo boolean ok: false integralByte -> NumberFormatException: For input string: "foo" @@ -375,6 +387,7 @@ M. string Value java.lang.String foo $target.valueOfFloat($value) $target.valueOfDouble($value) $target.valueOfString($value) + Locale ok: foo M. string-green Value java.lang.String green boolean ok: false integralByte -> NumberFormatException: For input string: "green" @@ -404,6 +417,7 @@ M. string-green Value java.lang.String green $target.valueOfFloat($value) $target.valueOfDouble($value) $target.valueOfString($value) + locale -> IllegalArgumentException: Invalid locale format: green N. string-empty Value java.lang.String boolean ok: false integralByte -> NumberFormatException: For input string: "" @@ -433,6 +447,7 @@ N. string-empty Value java.lang.String $target.valueOfFloat($value) $target.valueOfDouble($value) $target.valueOfString($value) + Locale ok: O. string-false Value java.lang.String false boolean ok: false integralByte -> NumberFormatException: For input string: "false" @@ -462,6 +477,7 @@ O. string-false Value java.lang.String false $target.valueOfFloat($value) $target.valueOfDouble($value) $target.valueOfString($value) + locale -> IllegalArgumentException: Invalid locale format: false P. string-true Value java.lang.String true boolean ok: true integralByte -> NumberFormatException: For input string: "true" @@ -491,6 +507,7 @@ P. string-true Value java.lang.String true $target.valueOfFloat($value) $target.valueOfDouble($value) $target.valueOfString($value) + locale -> IllegalArgumentException: Invalid locale format: true Q. string-zero Value java.lang.String 0 boolean ok: false byte ok: 0 @@ -520,6 +537,7 @@ Q. string-zero Value java.lang.String 0 $target.valueOfFloat($value) $target.valueOfDouble($value) $target.valueOfString($value) + locale -> IllegalArgumentException: Invalid locale format: 0 R. string-integral Value java.lang.String 123 boolean ok: false byte ok: 123 @@ -549,6 +567,7 @@ R. string-integral Value java.lang.String 123 $target.valueOfFloat($value) $target.valueOfDouble($value) $target.valueOfString($value) + locale -> IllegalArgumentException: Invalid locale format: 123 S. string-big-integral Value java.lang.String 12345678 boolean ok: false integralByte -> NumberFormatException: Value out of range. Value:"12345678" Radix:10 @@ -578,6 +597,7 @@ S. string-big-integral Value java.lang.String 12345678 $target.valueOfFloat($value) $target.valueOfDouble($value) $target.valueOfString($value) + locale -> IllegalArgumentException: Invalid locale format: 12345678 T. string-floating Value java.lang.String 123.345 boolean ok: false integralByte -> NumberFormatException: For input string: "123.345" @@ -607,6 +627,7 @@ T. string-floating Value java.lang.String 123.345 $target.valueOfFloat($value) $target.valueOfDouble($value) $target.valueOfString($value) + locale -> IllegalArgumentException: Invalid locale format: 123.345 U. null Value $value.class.name $value $target.integralBoolean($value) $target.integralByte($value) @@ -636,3 +657,34 @@ U. null Value $value.class.name $value $target.valueOfFloat($value) $target.valueOfDouble($value) $target.valueOfString($value) + Locale ok: null +V. locale Value java.lang.String fr_FR + boolean ok: false + integralByte -> NumberFormatException: For input string: "fr_FR" + integralShort -> NumberFormatException: For input string: "fr_FR" + integralInt -> NumberFormatException: For input string: "fr_FR" + integralLong -> NumberFormatException: For input string: "fr_FR" + integralFloat -> NumberFormatException: For input string: "fr_FR" + integralDouble -> NumberFormatException: For input string: "fr_FR" + $target.integralChar($value) + Boolean ok: false + objectByte -> NumberFormatException: For input string: "fr_FR" + objectShort -> NumberFormatException: For input string: "fr_FR" + objectInt -> NumberFormatException: For input string: "fr_FR" + objectLong -> NumberFormatException: For input string: "fr_FR" + objectFloat -> NumberFormatException: For input string: "fr_FR" + objectDouble -> NumberFormatException: For input string: "fr_FR" + $target.objectCharacter($value) + $target.objectNumber($value) + Object ok: fr_FR + objectEnum -> IllegalArgumentException: No enum constant org.apache.velocity.test.util.introspection.ConversionHandlerTestCase.Obj.Color.fr_FR + String ok: fr_FR + $target.valueOfBoolean($value) + $target.valueOfShort($value) + $target.valueOfByte($value) + $target.valueOfInt($value) + $target.valueOfLong($value) + $target.valueOfFloat($value) + $target.valueOfDouble($value) + $target.valueOfString($value) + Locale ok: fr_FR diff --git a/velocity-engine-core/src/test/resources/conversion/compare/test_conv_without_handler.cmp b/velocity-engine-core/src/test/resources/conversion/compare/test_conv_without_handler.cmp index a34d5b2a..763ab631 100644 --- a/velocity-engine-core/src/test/resources/conversion/compare/test_conv_without_handler.cmp +++ b/velocity-engine-core/src/test/resources/conversion/compare/test_conv_without_handler.cmp @@ -27,6 +27,7 @@ A. bool-true Value java.lang.Boolean true $target.valueOfFloat($value) $target.valueOfDouble($value) $target.valueOfString($value) + $target.locale($value) B. bool-false Value java.lang.Boolean false boolean ok: false $target.integralByte($value) @@ -56,6 +57,7 @@ B. bool-false Value java.lang.Boolean false $target.valueOfFloat($value) $target.valueOfDouble($value) $target.valueOfString($value) + $target.locale($value) C. byte-0 Value java.lang.Byte 0 $target.integralBoolean($value) byte ok: 0 @@ -85,6 +87,7 @@ C. byte-0 Value java.lang.Byte 0 $target.valueOfFloat($value) $target.valueOfDouble($value) $target.valueOfString($value) + $target.locale($value) D. byte-1 Value java.lang.Byte 1 $target.integralBoolean($value) byte ok: 1 @@ -114,6 +117,7 @@ D. byte-1 Value java.lang.Byte 1 $target.valueOfFloat($value) $target.valueOfDouble($value) $target.valueOfString($value) + $target.locale($value) E. short Value java.lang.Short 125 $target.integralBoolean($value) $target.integralByte($value) @@ -143,6 +147,7 @@ E. short Value java.lang.Short 125 $target.valueOfFloat($value) $target.valueOfDouble($value) $target.valueOfString($value) + $target.locale($value) F. int Value java.lang.Integer 24323 $target.integralBoolean($value) $target.integralByte($value) @@ -172,6 +177,7 @@ F. int Value java.lang.Integer 24323 $target.valueOfFloat($value) $target.valueOfDouble($value) $target.valueOfString($value) + $target.locale($value) G. long Value java.lang.Long 5235235 $target.integralBoolean($value) $target.integralByte($value) @@ -201,6 +207,7 @@ G. long Value java.lang.Long 5235235 $target.valueOfFloat($value) $target.valueOfDouble($value) $target.valueOfString($value) + $target.locale($value) H. float Value java.lang.Float 34523.344 $target.integralBoolean($value) $target.integralByte($value) @@ -230,6 +237,7 @@ H. float Value java.lang.Float 34523.344 $target.valueOfFloat($value) $target.valueOfDouble($value) $target.valueOfString($value) + $target.locale($value) I. double Value java.lang.Double 54235.3253 $target.integralBoolean($value) $target.integralByte($value) @@ -259,6 +267,7 @@ I. double Value java.lang.Double 54235.3253 $target.valueOfFloat($value) $target.valueOfDouble($value) $target.valueOfString($value) + $target.locale($value) J. char Value java.lang.Character @ $target.integralBoolean($value) $target.integralByte($value) @@ -288,6 +297,7 @@ J. char Value java.lang.Character @ $target.valueOfFloat($value) $target.valueOfDouble($value) $target.valueOfString($value) + $target.locale($value) K. object Value org.apache.velocity.test.util.introspection.ConversionHandlerTestCase$Obj instance of Obj $target.integralBoolean($value) $target.integralByte($value) @@ -317,6 +327,7 @@ K. object Value org.apache.velocity.test.util.introspection.ConversionHandlerTes $target.valueOfFloat($value) $target.valueOfDouble($value) $target.valueOfString($value) + $target.locale($value) L. enum Value org.apache.velocity.test.util.introspection.ConversionHandlerTestCase$Obj$Color GREEN $target.integralBoolean($value) $target.integralByte($value) @@ -346,6 +357,7 @@ L. enum Value org.apache.velocity.test.util.introspection.ConversionHandlerTestC $target.valueOfFloat($value) $target.valueOfDouble($value) $target.valueOfString($value) + $target.locale($value) M. string Value java.lang.String foo $target.integralBoolean($value) $target.integralByte($value) @@ -375,6 +387,7 @@ M. string Value java.lang.String foo $target.valueOfFloat($value) $target.valueOfDouble($value) $target.valueOfString($value) + $target.locale($value) M. string-green Value java.lang.String green $target.integralBoolean($value) $target.integralByte($value) @@ -404,6 +417,7 @@ M. string-green Value java.lang.String green $target.valueOfFloat($value) $target.valueOfDouble($value) $target.valueOfString($value) + $target.locale($value) N. string-empty Value java.lang.String $target.integralBoolean($value) $target.integralByte($value) @@ -433,6 +447,7 @@ N. string-empty Value java.lang.String $target.valueOfFloat($value) $target.valueOfDouble($value) $target.valueOfString($value) + $target.locale($value) O. string-false Value java.lang.String false $target.integralBoolean($value) $target.integralByte($value) @@ -462,6 +477,7 @@ O. string-false Value java.lang.String false $target.valueOfFloat($value) $target.valueOfDouble($value) $target.valueOfString($value) + $target.locale($value) P. string-true Value java.lang.String true $target.integralBoolean($value) $target.integralByte($value) @@ -491,6 +507,7 @@ P. string-true Value java.lang.String true $target.valueOfFloat($value) $target.valueOfDouble($value) $target.valueOfString($value) + $target.locale($value) Q. string-zero Value java.lang.String 0 $target.integralBoolean($value) $target.integralByte($value) @@ -520,6 +537,7 @@ Q. string-zero Value java.lang.String 0 $target.valueOfFloat($value) $target.valueOfDouble($value) $target.valueOfString($value) + $target.locale($value) R. string-integral Value java.lang.String 123 $target.integralBoolean($value) $target.integralByte($value) @@ -549,6 +567,7 @@ R. string-integral Value java.lang.String 123 $target.valueOfFloat($value) $target.valueOfDouble($value) $target.valueOfString($value) + $target.locale($value) S. string-big-integral Value java.lang.String 12345678 $target.integralBoolean($value) $target.integralByte($value) @@ -578,6 +597,7 @@ S. string-big-integral Value java.lang.String 12345678 $target.valueOfFloat($value) $target.valueOfDouble($value) $target.valueOfString($value) + $target.locale($value) T. string-floating Value java.lang.String 123.345 $target.integralBoolean($value) $target.integralByte($value) @@ -607,6 +627,7 @@ T. string-floating Value java.lang.String 123.345 $target.valueOfFloat($value) $target.valueOfDouble($value) $target.valueOfString($value) + $target.locale($value) U. null Value $value.class.name $value $target.integralBoolean($value) $target.integralByte($value) @@ -636,3 +657,34 @@ U. null Value $value.class.name $value $target.valueOfFloat($value) $target.valueOfDouble($value) $target.valueOfString($value) + Locale ok: null +V. locale Value java.lang.String fr_FR + $target.integralBoolean($value) + $target.integralByte($value) + $target.integralShort($value) + $target.integralInt($value) + $target.integralLong($value) + $target.integralFloat($value) + $target.integralDouble($value) + $target.integralChar($value) + $target.objectBoolean($value) + $target.objectByte($value) + $target.objectShort($value) + $target.objectInt($value) + $target.objectLong($value) + $target.objectFloat($value) + $target.objectDouble($value) + $target.objectCharacter($value) + $target.objectNumber($value) + Object ok: fr_FR + $target.objectEnum($value) + String ok: fr_FR + $target.valueOfBoolean($value) + $target.valueOfShort($value) + $target.valueOfByte($value) + $target.valueOfInt($value) + $target.valueOfLong($value) + $target.valueOfFloat($value) + $target.valueOfDouble($value) + $target.valueOfString($value) + $target.locale($value) diff --git a/velocity-engine-core/src/test/resources/conversion/test_conv.vtl b/velocity-engine-core/src/test/resources/conversion/test_conv.vtl index cd8b3b12..d6f6fd0a 100644 --- a/velocity-engine-core/src/test/resources/conversion/test_conv.vtl +++ b/velocity-engine-core/src/test/resources/conversion/test_conv.vtl @@ -29,4 +29,5 @@ $key Value $value.class.name $value $target.valueOfFloat($value) $target.valueOfDouble($value) $target.valueOfString($value) + $target.locale($value) #end##
\ No newline at end of file |