Modified: velocity/engine/trunk/velocity-engine-core/src/test/resources/conversion/compare/test_conv_without_handler.cmp URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/resources/conversion/compare/test_conv_without_handler.cmp?rev=1870761&r1=1870760&r2=1870761&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/resources/conversion/compare/test_conv_without_handler.cmp (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/resources/conversion/compare/test_conv_without_handler.cmp Tue Dec 3 16:57:12 2019 @@ -12,8 +12,10 @@ A. bool-true Value java.lang.Boolean tru $target.objectShort($value) $target.objectInt($value) $target.objectLong($value) + $target.objectBigInteger($value) $target.objectFloat($value) $target.objectDouble($value) + $target.objectBigDecimal($value) $target.objectCharacter($value) $target.objectNumber($value) Object ok: true @@ -42,8 +44,10 @@ B. bool-false Value java.lang.Boolean fa $target.objectShort($value) $target.objectInt($value) $target.objectLong($value) + $target.objectBigInteger($value) $target.objectFloat($value) $target.objectDouble($value) + $target.objectBigDecimal($value) $target.objectCharacter($value) $target.objectNumber($value) Object ok: false @@ -72,8 +76,10 @@ C. byte-0 Value java.lang.Byte 0 $target.objectShort($value) $target.objectInt($value) $target.objectLong($value) + $target.objectBigInteger($value) $target.objectFloat($value) $target.objectDouble($value) + $target.objectBigDecimal($value) $target.objectCharacter($value) Number ok: 0 Object ok: 0 @@ -102,8 +108,10 @@ D. byte-1 Value java.lang.Byte 1 $target.objectShort($value) $target.objectInt($value) $target.objectLong($value) + $target.objectBigInteger($value) $target.objectFloat($value) $target.objectDouble($value) + $target.objectBigDecimal($value) $target.objectCharacter($value) Number ok: 1 Object ok: 1 @@ -132,8 +140,10 @@ E. short Value java.lang.Short 125 Short ok: 125 $target.objectInt($value) $target.objectLong($value) + $target.objectBigInteger($value) $target.objectFloat($value) $target.objectDouble($value) + $target.objectBigDecimal($value) $target.objectCharacter($value) Number ok: 125 Object ok: 125 @@ -162,8 +172,10 @@ F. int Value java.lang.Integer 24323 $target.objectShort($value) Integer ok: 24323 $target.objectLong($value) + $target.objectBigInteger($value) $target.objectFloat($value) $target.objectDouble($value) + $target.objectBigDecimal($value) $target.objectCharacter($value) Number ok: 24323 Object ok: 24323 @@ -192,8 +204,10 @@ G. long Value java.lang.Long 5235235 $target.objectShort($value) $target.objectInt($value) Long ok: 5235235 + $target.objectBigInteger($value) $target.objectFloat($value) $target.objectDouble($value) + $target.objectBigDecimal($value) $target.objectCharacter($value) Number ok: 5235235 Object ok: 5235235 @@ -222,8 +236,10 @@ H. float Value java.lang.Float 34523.344 $target.objectShort($value) $target.objectInt($value) $target.objectLong($value) + $target.objectBigInteger($value) Float ok: 34523.344 $target.objectDouble($value) + $target.objectBigDecimal($value) $target.objectCharacter($value) Number ok: 34523.344 Object ok: 34523.344 @@ -252,8 +268,10 @@ I. double Value java.lang.Double 54235.3 $target.objectShort($value) $target.objectInt($value) $target.objectLong($value) + $target.objectBigInteger($value) $target.objectFloat($value) Double ok: 54235.3253 + $target.objectBigDecimal($value) $target.objectCharacter($value) Number ok: 54235.3253 Object ok: 54235.3253 @@ -282,8 +300,10 @@ J. char Value java.lang.Character @ $target.objectShort($value) $target.objectInt($value) $target.objectLong($value) + $target.objectBigInteger($value) $target.objectFloat($value) $target.objectDouble($value) + $target.objectBigDecimal($value) Character ok: @ $target.objectNumber($value) Object ok: @ @@ -312,8 +332,10 @@ K. object Value org.apache.velocity.test $target.objectShort($value) $target.objectInt($value) $target.objectLong($value) + $target.objectBigInteger($value) $target.objectFloat($value) $target.objectDouble($value) + $target.objectBigDecimal($value) $target.objectCharacter($value) $target.objectNumber($value) Object ok: instance of Obj @@ -342,8 +364,10 @@ L. enum Value org.apache.velocity.test.u $target.objectShort($value) $target.objectInt($value) $target.objectLong($value) + $target.objectBigInteger($value) $target.objectFloat($value) $target.objectDouble($value) + $target.objectBigDecimal($value) $target.objectCharacter($value) $target.objectNumber($value) Object ok: GREEN @@ -372,8 +396,10 @@ M. string Value java.lang.String foo $target.objectShort($value) $target.objectInt($value) $target.objectLong($value) + $target.objectBigInteger($value) $target.objectFloat($value) $target.objectDouble($value) + $target.objectBigDecimal($value) $target.objectCharacter($value) $target.objectNumber($value) Object ok: foo @@ -402,8 +428,10 @@ M. string-green Value java.lang.String g $target.objectShort($value) $target.objectInt($value) $target.objectLong($value) + $target.objectBigInteger($value) $target.objectFloat($value) $target.objectDouble($value) + $target.objectBigDecimal($value) $target.objectCharacter($value) $target.objectNumber($value) Object ok: green @@ -432,8 +460,10 @@ N. string-empty Value java.lang.String $target.objectShort($value) $target.objectInt($value) $target.objectLong($value) + $target.objectBigInteger($value) $target.objectFloat($value) $target.objectDouble($value) + $target.objectBigDecimal($value) $target.objectCharacter($value) $target.objectNumber($value) Object ok: @@ -462,8 +492,10 @@ O. string-false Value java.lang.String f $target.objectShort($value) $target.objectInt($value) $target.objectLong($value) + $target.objectBigInteger($value) $target.objectFloat($value) $target.objectDouble($value) + $target.objectBigDecimal($value) $target.objectCharacter($value) $target.objectNumber($value) Object ok: false @@ -492,8 +524,10 @@ P. string-true Value java.lang.String tr $target.objectShort($value) $target.objectInt($value) $target.objectLong($value) + $target.objectBigInteger($value) $target.objectFloat($value) $target.objectDouble($value) + $target.objectBigDecimal($value) $target.objectCharacter($value) $target.objectNumber($value) Object ok: true @@ -522,8 +556,10 @@ Q. string-zero Value java.lang.String 0 $target.objectShort($value) $target.objectInt($value) $target.objectLong($value) + $target.objectBigInteger($value) $target.objectFloat($value) $target.objectDouble($value) + $target.objectBigDecimal($value) $target.objectCharacter($value) $target.objectNumber($value) Object ok: 0 @@ -552,8 +588,10 @@ R. string-integral Value java.lang.Strin $target.objectShort($value) $target.objectInt($value) $target.objectLong($value) + $target.objectBigInteger($value) $target.objectFloat($value) $target.objectDouble($value) + $target.objectBigDecimal($value) $target.objectCharacter($value) $target.objectNumber($value) Object ok: 123 @@ -582,8 +620,10 @@ S. string-big-integral Value java.lang.S $target.objectShort($value) $target.objectInt($value) $target.objectLong($value) + $target.objectBigInteger($value) $target.objectFloat($value) $target.objectDouble($value) + $target.objectBigDecimal($value) $target.objectCharacter($value) $target.objectNumber($value) Object ok: 12345678 @@ -612,8 +652,10 @@ T. string-floating Value java.lang.Strin $target.objectShort($value) $target.objectInt($value) $target.objectLong($value) + $target.objectBigInteger($value) $target.objectFloat($value) $target.objectDouble($value) + $target.objectBigDecimal($value) $target.objectCharacter($value) $target.objectNumber($value) Object ok: 123.345 @@ -642,8 +684,10 @@ U. null Value $value.class.name $value Short ok: null Integer ok: null Long ok: null + BigInteger ok: null Float ok: null Double ok: null + BigDecimal ok: null Character ok: null Number ok: null Object ok: null @@ -672,8 +716,10 @@ V. locale Value java.lang.String fr_FR $target.objectShort($value) $target.objectInt($value) $target.objectLong($value) + $target.objectBigInteger($value) $target.objectFloat($value) $target.objectDouble($value) + $target.objectBigDecimal($value) $target.objectCharacter($value) $target.objectNumber($value) Object ok: fr_FR @@ -682,6 +728,262 @@ V. locale Value java.lang.String 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) +W. BigInteger zero Value java.math.BigInteger 0 + $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) + BigInteger ok: 0 + $target.objectFloat($value) + $target.objectDouble($value) + $target.objectBigDecimal($value) + $target.objectCharacter($value) + Number ok: 0 + Object ok: 0 + $target.objectEnum($value) + $target.objectString($value) + $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) +X. BigInteger one Value java.math.BigInteger 1 + $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) + BigInteger ok: 1 + $target.objectFloat($value) + $target.objectDouble($value) + $target.objectBigDecimal($value) + $target.objectCharacter($value) + Number ok: 1 + Object ok: 1 + $target.objectEnum($value) + $target.objectString($value) + $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) +Y. BigInteger bigint Value java.math.BigInteger 12345678901234567890 + $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) + BigInteger ok: 12345678901234567890 + $target.objectFloat($value) + $target.objectDouble($value) + $target.objectBigDecimal($value) + $target.objectCharacter($value) + Number ok: 12345678901234567890 + Object ok: 12345678901234567890 + $target.objectEnum($value) + $target.objectString($value) + $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) +Y. BigInteger ten Value java.math.BigInteger 10 + $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) + BigInteger ok: 10 + $target.objectFloat($value) + $target.objectDouble($value) + $target.objectBigDecimal($value) + $target.objectCharacter($value) + Number ok: 10 + Object ok: 10 + $target.objectEnum($value) + $target.objectString($value) + $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) +Z. BigDecimal zero Value java.math.BigDecimal 0 + $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.objectBigInteger($value) + $target.objectFloat($value) + $target.objectDouble($value) + BigDecimal ok: 0 + $target.objectCharacter($value) + Number ok: 0 + Object ok: 0 + $target.objectEnum($value) + $target.objectString($value) + $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) +ZA. BigDecimal one Value java.math.BigDecimal 1 + $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.objectBigInteger($value) + $target.objectFloat($value) + $target.objectDouble($value) + BigDecimal ok: 1 + $target.objectCharacter($value) + Number ok: 1 + Object ok: 1 + $target.objectEnum($value) + $target.objectString($value) + $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) +ZB. BigDecimal ten Value java.math.BigDecimal 10 + $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.objectBigInteger($value) + $target.objectFloat($value) + $target.objectDouble($value) + BigDecimal ok: 10 + $target.objectCharacter($value) + Number ok: 10 + Object ok: 10 + $target.objectEnum($value) + $target.objectString($value) + $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) +ZC. BigDecimal bigdec Value java.math.BigDecimal 12345678901234567890.01234567890123456789 + $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.objectBigInteger($value) + $target.objectFloat($value) + $target.objectDouble($value) + BigDecimal ok: 12345678901234567890.01234567890123456789 + $target.objectCharacter($value) + Number ok: 12345678901234567890.01234567890123456789 + Object ok: 12345678901234567890.01234567890123456789 + $target.objectEnum($value) + $target.objectString($value) + $target.valueOfBoolean($value) + $target.valueOfShort($value) + $target.valueOfByte($value) $target.valueOfInt($value) $target.valueOfLong($value) $target.valueOfFloat($value)
Modified: velocity/engine/trunk/velocity-engine-core/src/test/resources/conversion/matrix.vhtml URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/resources/conversion/matrix.vhtml?rev=1870761&r1=1870760&r2=1870761&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/resources/conversion/matrix.vhtml (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/resources/conversion/matrix.vhtml Tue Dec 3 16:57:12 2019 @@ -1,6 +1,8 @@ +<!doctype html> + #macro(print,$type) #set($string = "$type") - #if($string.startsWith("class java.lang.")) + #if($string.startsWith("class java.lang.") || $string.startsWith("class java.math.")) #set($string = $string.substring(16)) #end $string## Modified: velocity/engine/trunk/velocity-engine-core/src/test/resources/conversion/test_conv.vtl URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/resources/conversion/test_conv.vtl?rev=1870761&r1=1870760&r2=1870761&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/resources/conversion/test_conv.vtl (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/resources/conversion/test_conv.vtl Tue Dec 3 16:57:12 2019 @@ -14,8 +14,10 @@ $key Value $value.class.name $value $target.objectShort($value) $target.objectInt($value) $target.objectLong($value) + $target.objectBigInteger($value) $target.objectFloat($value) $target.objectDouble($value) + $target.objectBigDecimal($value) $target.objectCharacter($value) $target.objectNumber($value) $target.objectObject($value)