AuroraMiddleware/scuffed-code
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ICU-4971 Add java.math.MathContext methods and test

Browse Source 
X-SVN-Rev: 25378
This commit is contained in:
Jason Spieth 2009-02-05 18:47:49 +00:00
parent bb25d466b5
commit 55698ede36
2 changed files with 95 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
icu4j/src/com/ibm/icu/dev/test/format/IntlTestDecimalFormatAPI.java
View File

@ -292,31 +292,48 @@ public class IntlTestDecimalFormatAPI extends com.ibm.icu.dev.test.TestFmwk
public void testJB4971()
{
DecimalFormat decfmt = new DecimalFormat();
MathContext result;
MathContext resultICU;
MathContext comp1 = new MathContext(0, MathContext.PLAIN);
result = decfmt.getMathContext();
if ((comp1.getDigits() != result.getDigits()) ||
(comp1.getForm() != result.getForm()) ||
(comp1.getLostDigits() != result.getLostDigits()) ||
(comp1.getRoundingMode() != result.getRoundingMode()))
resultICU = decfmt.getMathContextICU();
if ((comp1.getDigits() != resultICU.getDigits()) ||
(comp1.getForm() != resultICU.getForm()) ||
(comp1.getLostDigits() != resultICU.getLostDigits()) ||
(comp1.getRoundingMode() != resultICU.getRoundingMode()))
{
errln("ERROR: Math context 1 not equal - result: " + result.toString() +
errln("ERROR: Math context 1 not equal - result: " + resultICU.toString() +
" / expected: " + comp1.toString());
}
MathContext comp2 = new MathContext(5, MathContext.ENGINEERING);
decfmt.setMathContext(comp2);
result = decfmt.getMathContext();
if ((comp2.getDigits() != result.getDigits()) ||
(comp2.getForm() != result.getForm()) ||
(comp2.getLostDigits() != result.getLostDigits()) ||
(comp2.getRoundingMode() != result.getRoundingMode()))
decfmt.setMathContextICU(comp2);
resultICU = decfmt.getMathContextICU();
if ((comp2.getDigits() != resultICU.getDigits()) ||
(comp2.getForm() != resultICU.getForm()) ||
(comp2.getLostDigits() != resultICU.getLostDigits()) ||
(comp2.getRoundingMode() != resultICU.getRoundingMode()))
{
errln("ERROR: Math context 2 not equal - result: " + result.toString() +
errln("ERROR: Math context 2 not equal - result: " + resultICU.toString() +
" / expected: " + comp2.toString());
}
//#if defined(FOUNDATION10)
//#else
java.math.MathContext result;
java.math.MathContext comp3 = new java.math.MathContext(3, java.math.RoundingMode.DOWN);
decfmt.setMathContext(comp3);
result = decfmt.getMathContext();
if ((comp3.getPrecision() != result.getPrecision()) ||
(comp3.getRoundingMode() != result.getRoundingMode()))
{
errln("ERROR: Math context 3 not equal - result: " + result.toString() +
" / expected: " + comp3.toString());
}
//#endif
}
public void testJB6354()
@ -324,20 +341,20 @@ public class IntlTestDecimalFormatAPI extends com.ibm.icu.dev.test.TestFmwk
DecimalFormat pat = new DecimalFormat("#,##0.00");
// get default rounding increment
//#if defined(FOUNDATION10)
//## com.ibm.icu.math.BigDecimal r1 = pat.getRoundingIncrement();
//#else
//#if defined(FOUNDATION10)
//## com.ibm.icu.math.BigDecimal r1 = pat.getRoundingIncrement();
//#else
java.math.BigDecimal r1 = pat.getRoundingIncrement();
//#endif
//#endif
// set rounding mode with zero increment. Rounding
// increment should be set by this operation
pat.setRoundingMode(BigDecimal.ROUND_UP);
//#if defined(FOUNDATION10)
//## com.ibm.icu.math.BigDecimal r2 = pat.getRoundingIncrement();
//#else
//#if defined(FOUNDATION10)
//## com.ibm.icu.math.BigDecimal r2 = pat.getRoundingIncrement();
//#else
java.math.BigDecimal r2 = pat.getRoundingIncrement();
//#endif
//#endif
// check for different values
if ((r1 != null) && (r2 != null))

59
icu4j/src/com/ibm/icu/text/DecimalFormat.java
View File

@ -3516,17 +3516,49 @@ public class DecimalFormat extends NumberFormat {
* @draft ICU 4.2
* @provisional This API might change or be removed in a future release.
*/
public MathContext getMathContext() {
public MathContext getMathContextICU() {
try {
// don't allow multiple references
return mathContext == null ?
null :
mathContext;
new MathContext(mathContext.getDigits(),
mathContext.getForm(),
mathContext.getLostDigits(),
mathContext.getRoundingMode());
} catch (Exception foo) {
return null; // should never happen
}
}
//#if defined(FOUNDATION10)
//#else
// [NEW]
/**
* Returns the MathContext
* used by this format.
* @return desired MathContext
* @see #mathContext
* @see #getMathContext
* @draft ICU 4.2
* @provisional This API might change or be removed in a future release.
*/
public java.math.MathContext getMathContext()
{
try
{
// don't allow multiple references
return mathContext == null ?
null :
new java.math.MathContext(mathContext.getDigits(),
java.math.RoundingMode.valueOf(mathContext.getRoundingMode()));
}
catch (Exception foo)
{
return null; // should never happen
}
}
//#endif
// [NEW]
/**
* Sets the MathContext used by this format.
@ -3536,10 +3568,31 @@ public class DecimalFormat extends NumberFormat {
* @draft ICU 4.2
* @provisional This API might change or be removed in a future release.
*/
public void setMathContext(MathContext newValue) {
public void setMathContextICU(MathContext newValue) {
mathContext = newValue;
}
//#if defined(FOUNDATION10)
//#else
// [NEW]
/**
* Sets the MathContext used by this format.
* @param newValue desired MathContext
* @see #mathContext
* @see #getMathContext
* @draft ICU 4.2
* @provisional This API might change or be removed in a future release.
*/
public void setMathContext(java.math.MathContext newValue)
{
mathContext = new MathContext(newValue.getPrecision(),
MathContext.SCIENTIFIC,
false,
(newValue.getRoundingMode()).ordinal()
);
}
//#endif
/**
* Allows you to get the behavior of the decimal separator with integers.
* (The decimal separator will always appear with decimals.)