Author: tchemit Date: 2014-02-28 18:42:35 +0100 (Fri, 28 Feb 2014) New Revision: 312 Url: http://nuiton.org/projects/nuiton-web/repository/revisions/312 Log: refs #3010: Number converter with local parameters (do not test it if not in France) Modified: trunk/nuiton-struts2/src/test/java/org/nuiton/web/struts2/converters/LocalNumberConverterTest.java Modified: trunk/nuiton-struts2/src/test/java/org/nuiton/web/struts2/converters/LocalNumberConverterTest.java =================================================================== --- trunk/nuiton-struts2/src/test/java/org/nuiton/web/struts2/converters/LocalNumberConverterTest.java 2014-02-28 17:41:30 UTC (rev 311) +++ trunk/nuiton-struts2/src/test/java/org/nuiton/web/struts2/converters/LocalNumberConverterTest.java 2014-02-28 17:42:35 UTC (rev 312) @@ -25,6 +25,8 @@ */ import org.junit.Assert; +import org.junit.Assume; +import org.junit.Ignore; import org.junit.Test; import java.text.DecimalFormatSymbols; @@ -43,9 +45,10 @@ @Test public void testConvertValue() { + Assume.assumeTrue(Locale.FRANCE.equals(Locale.getDefault())); converter = new LocalNumberConverter(); - DecimalFormatSymbols symbols = new DecimalFormatSymbols(Locale.getDefault(Locale.Category.FORMAT)); + DecimalFormatSymbols symbols = new DecimalFormatSymbols(Locale.getDefault()); symbols.getCurrency(); char minusSign = symbols.getMinusSign(); @@ -58,103 +61,103 @@ convert(0, String.class)); Assert.assertEquals("0", - convert(new Integer(0), String.class)); + convert(0, String.class)); Assert.assertEquals("18", convert(18, String.class)); Assert.assertEquals("18", - convert(new Integer(18), String.class), "18"); + convert(18, String.class), "18"); Assert.assertEquals(minusSign + "18", convert(-18, String.class)); Assert.assertEquals(minusSign + "18", - convert(new Integer(-18), String.class)); + convert(-18, String.class)); Assert.assertEquals("1" + groupingSeparator + "000" + groupingSeparator + "008", convert(1000008, String.class)); Assert.assertEquals("1" + groupingSeparator + "000" + groupingSeparator + "008", - convert(new Integer(1000008), String.class)); + convert(1000008, String.class)); Assert.assertEquals(minusSign + "1" + groupingSeparator + "000" + groupingSeparator + "008", convert(-1000008, String.class)); Assert.assertEquals(minusSign + "1" + groupingSeparator + "000" + groupingSeparator + "008", - convert(new Integer(-1000008), String.class)); + convert(-1000008, String.class)); // Double to String Assert.assertEquals("0", convert(0, String.class)); Assert.assertEquals("0", - convert(new Double(0), String.class)); + convert((double) 0, String.class)); Assert.assertEquals("18", convert(18, String.class)); - Assert.assertEquals("18", convert(new Double(18), String.class)); + Assert.assertEquals("18", convert((double) 18, String.class)); Assert.assertEquals(minusSign + "18", convert(-18, String.class)); Assert.assertEquals(minusSign + "18", - convert(new Double(-18), String.class)); + convert((double) -18, String.class)); Assert.assertEquals("1" + groupingSeparator + "000" + groupingSeparator + "008", convert(1000008, String.class)); Assert.assertEquals("1" + groupingSeparator + "000" + groupingSeparator + "008", - convert(new Double(1000008), String.class)); + convert((double) 1000008, String.class)); Assert.assertEquals(minusSign + "1" + groupingSeparator + "000" + groupingSeparator + "008", convert(-1000008, String.class)); Assert.assertEquals(minusSign + "1" + groupingSeparator + "000" + groupingSeparator + "008", - convert(new Double(-1000008), String.class)); + convert((double) -1000008, String.class)); Assert.assertEquals("0" + decimalSeparator + "58", convert(0.58, String.class)); Assert.assertEquals("0" + decimalSeparator + "58", - convert(new Double(0.58), String.class)); + convert(0.58, String.class)); Assert.assertEquals("18" + decimalSeparator + "58", convert(18.58, String.class)); Assert.assertEquals("18" + decimalSeparator + "58", - convert(new Double(18.58), String.class)); + convert(18.58, String.class)); Assert.assertEquals(minusSign + "18" + decimalSeparator + "58", convert(-18.58, String.class)); Assert.assertEquals(minusSign + "18" + decimalSeparator + "58", - convert(new Double(-18.58), String.class)); + convert(-18.58, String.class)); Assert.assertEquals("1" + groupingSeparator + "000" + groupingSeparator + "008" + decimalSeparator + "58", convert(1000008.58, String.class)); Assert.assertEquals("1" + groupingSeparator + "000" + groupingSeparator + "008" + decimalSeparator + "58", - convert(new Double(1000008.58), String.class)); + convert(1000008.58, String.class)); Assert.assertEquals(minusSign + "1" + groupingSeparator + "000" + groupingSeparator + "008" + decimalSeparator + "58", convert(-1000008.58, String.class)); Assert.assertEquals(minusSign + "1" + groupingSeparator + "000" + groupingSeparator + "008" + decimalSeparator + "58", - convert(new Double(-1000008.58), String.class)); + convert(-1000008.58, String.class)); Assert.assertEquals("0" + decimalSeparator + "586", convert(0.5864, String.class)); Assert.assertEquals("0" + decimalSeparator + "586", - convert(new Double(0.5864), String.class)); + convert(0.5864, String.class)); Assert.assertEquals("0" + decimalSeparator + "587", convert(0.5867, String.class)); Assert.assertEquals("0" + decimalSeparator + "587", - convert(new Double(0.5867), String.class)); + convert(0.5867, String.class)); // String to Integer Assert.assertEquals(0, @@ -172,19 +175,19 @@ Assert.assertEquals(0, convert("0", int.class)); - Assert.assertEquals(new Integer(0), + Assert.assertEquals(0, convert("0", Integer.class)); Assert.assertEquals(12, convert("12", int.class)); - Assert.assertEquals(new Integer(12), + Assert.assertEquals(12, convert("12", Integer.class)); Assert.assertEquals(-12, convert(minusSign + "12", int.class)); - Assert.assertEquals(new Integer(-12), + Assert.assertEquals(-12, convert(minusSign + "12", Integer.class)); if (Character.isSpaceChar(groupingSeparator)) { @@ -192,26 +195,26 @@ Assert.assertEquals(1002, convert("1 002", int.class)); - Assert.assertEquals(new Integer(1002), + Assert.assertEquals(1002, convert("1 002", Integer.class)); Assert.assertEquals(-1002, convert(minusSign + "1 002", int.class)); - Assert.assertEquals(new Integer(-1002), + Assert.assertEquals(-1002, convert(minusSign + "1 002", Integer.class)); } Assert.assertEquals(1002, convert("1" + groupingSeparator + "002", int.class)); - Assert.assertEquals(new Integer(1002), + Assert.assertEquals(1002, convert("1" + groupingSeparator + "002", Integer.class)); Assert.assertEquals(-1002, convert(minusSign + "1" + groupingSeparator + "002", int.class)); - Assert.assertEquals(new Integer(-1002), + Assert.assertEquals(-1002, convert(minusSign + "1" + groupingSeparator + "002", Integer.class)); // String to Double @@ -230,19 +233,19 @@ Assert.assertEquals(0d, convert("0", double.class)); - Assert.assertEquals(new Double(0), + Assert.assertEquals((double) 0, convert("0", Double.class)); Assert.assertEquals(12d, convert("12", double.class)); - Assert.assertEquals(new Double(12), + Assert.assertEquals((double) 12, convert("12", Double.class)); Assert.assertEquals(-12d, convert(minusSign + "12", double.class)); - Assert.assertEquals(new Double(-12), + Assert.assertEquals((double) -12, convert(minusSign + "12", Double.class)); @@ -251,13 +254,13 @@ Assert.assertEquals(1002d, convert("1 002", double.class)); - Assert.assertEquals(new Double(1002), + Assert.assertEquals((double) 1002, convert("1 002", Double.class)); Assert.assertEquals(-1002d, convert(minusSign + "1 002", double.class)); - Assert.assertEquals(new Double(-1002), + Assert.assertEquals((double) -1002, convert(minusSign + "1 002", Double.class)); } @@ -265,31 +268,31 @@ Assert.assertEquals(1002d, convert("1" + groupingSeparator + "002", double.class)); - Assert.assertEquals(new Double(1002), + Assert.assertEquals((double) 1002, convert("1" + groupingSeparator + "002", Double.class)); Assert.assertEquals(-1002d, convert(minusSign + "1" + groupingSeparator + "002", double.class)); - Assert.assertEquals(new Double(-1002), + Assert.assertEquals((double) -1002, convert(minusSign + "1" + groupingSeparator + "002", Double.class)); Assert.assertEquals(0.36, convert("0" + decimalSeparator + "36", double.class)); - Assert.assertEquals(new Double(0.36), + Assert.assertEquals(0.36, convert("0" + decimalSeparator + "36", Double.class)); Assert.assertEquals(12.36, convert("12" + decimalSeparator + "36", double.class)); - Assert.assertEquals(new Double(12.36), + Assert.assertEquals(12.36, convert("12" + decimalSeparator + "36", Double.class)); Assert.assertEquals(-12.36, convert(minusSign + "12" + decimalSeparator + "36", double.class)); - Assert.assertEquals(new Double(-12.36), + Assert.assertEquals(-12.36, convert(minusSign + "12" + decimalSeparator + "36", Double.class)); @@ -298,13 +301,13 @@ Assert.assertEquals(1002.36, convert("1 002" + decimalSeparator + "36", double.class)); - Assert.assertEquals(new Double(1002.36), + Assert.assertEquals(1002.36, convert("1 002" + decimalSeparator + "36", Double.class)); Assert.assertEquals(-1002.36, convert(minusSign + "1 002" + decimalSeparator + "36", double.class)); - Assert.assertEquals(new Double(-1002.36), + Assert.assertEquals(-1002.36, convert(minusSign + "1 002" + decimalSeparator + "36", Double.class)); } @@ -312,37 +315,37 @@ Assert.assertEquals(1002.36, convert("1" + groupingSeparator + "002" + decimalSeparator + "36", double.class)); - Assert.assertEquals(new Double(1002.36), + Assert.assertEquals(1002.36, convert("1" + groupingSeparator + "002" + decimalSeparator + "36", Double.class)); Assert.assertEquals(-1002.36, convert(minusSign + "1" + groupingSeparator + "002" + decimalSeparator + "36", double.class)); - Assert.assertEquals(new Double(-1002.36), + Assert.assertEquals(-1002.36, convert(minusSign + "1" + groupingSeparator + "002" + decimalSeparator + "36", Double.class)); Assert.assertEquals(12.3669, convert("12" + decimalSeparator + "3669", double.class)); - Assert.assertEquals(new Double(12.3669), + Assert.assertEquals(12.3669, convert("12" + decimalSeparator + "3669", Double.class)); Assert.assertEquals(12.36, convert("12.36", double.class)); - Assert.assertEquals(new Double(12.36), + Assert.assertEquals(12.36, convert("12.36", Double.class)); Assert.assertEquals(1002.36, convert("1 002.36", double.class)); - Assert.assertEquals(new Double(1002.36), + Assert.assertEquals(1002.36, convert("1 002.36", Double.class)); Assert.assertEquals(1002.36, convert("1002.36", double.class)); - Assert.assertEquals(new Double(1002.36), + Assert.assertEquals(1002.36, convert("1002.36", Double.class)); }