mirror of
https://github.com/apache/commons-math.git
synced 2025-02-07 18:49:40 +00:00
Added locale support to complex format. Added test cases for specific locales.
PR: 31325 git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/math/trunk@141452 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Brent Worden
parent
7ae35df8c0
commit
c528c90ae9
@ -22,7 +22,7 @@ import java.util.Locale;
|
||||
|
||||
import junit.framework.TestCase;
|
||||
|
||||
public abstract class AbstractComplexFormatTest extends TestCase {
|
||||
public abstract class ComplexFormatAbstractTest extends TestCase {
|
||||
|
||||
ComplexFormat complexFormat = null;
|
||||
ComplexFormat complexFormatJ = null;
|
||||
@ -16,328 +16,15 @@
|
||||
|
||||
package org.apache.commons.math.complex;
|
||||
|
||||
import java.text.NumberFormat;
|
||||
import java.text.ParseException;
|
||||
import java.util.Locale;
|
||||
|
||||
import junit.framework.TestCase;
|
||||
|
||||
public class ComplexFormatTest extends TestCase {
|
||||
|
||||
ComplexFormat complexFormat = null;
|
||||
ComplexFormat complexFormatJ = null;
|
||||
|
||||
public ComplexFormatTest(String name) {
|
||||
super( name );
|
||||
}
|
||||
|
||||
protected void setUp() throws Exception {
|
||||
complexFormat = new ComplexFormat();
|
||||
complexFormatJ = new ComplexFormat("j");
|
||||
}
|
||||
|
||||
public void testSimpleNoDecimals() {
|
||||
Complex c = new Complex(1, 1);
|
||||
String expected = "1 + 1i";
|
||||
String actual = complexFormat.format(c);
|
||||
assertEquals(expected, actual);
|
||||
}
|
||||
|
||||
public void testSimpleWithDecimals() {
|
||||
Complex c = new Complex(1.23, 1.43);
|
||||
String expected = "1.23 + 1.43i";
|
||||
String actual = complexFormat.format(c);
|
||||
assertEquals(expected, actual);
|
||||
}
|
||||
|
||||
public void testSimpleWithDecimalsTrunc() {
|
||||
Complex c = new Complex(1.2323, 1.4343);
|
||||
String expected = "1.23 + 1.43i";
|
||||
String actual = complexFormat.format(c);
|
||||
assertEquals(expected, actual);
|
||||
}
|
||||
|
||||
public void testNegativeReal() {
|
||||
Complex c = new Complex(-1.2323, 1.4343);
|
||||
String expected = "-1.23 + 1.43i";
|
||||
String actual = complexFormat.format(c);
|
||||
assertEquals(expected, actual);
|
||||
}
|
||||
|
||||
public void testNegativeImaginary() {
|
||||
Complex c = new Complex(1.2323, -1.4343);
|
||||
String expected = "1.23 - 1.43i";
|
||||
String actual = complexFormat.format(c);
|
||||
assertEquals(expected, actual);
|
||||
}
|
||||
|
||||
public void testNegativeBoth() {
|
||||
Complex c = new Complex(-1.2323, -1.4343);
|
||||
String expected = "-1.23 - 1.43i";
|
||||
String actual = complexFormat.format(c);
|
||||
assertEquals(expected, actual);
|
||||
}
|
||||
|
||||
public void testZeroReal() {
|
||||
Complex c = new Complex(0.0, -1.4343);
|
||||
String expected = "0 - 1.43i";
|
||||
String actual = complexFormat.format(c);
|
||||
assertEquals(expected, actual);
|
||||
}
|
||||
|
||||
public void testZeroImaginary() {
|
||||
Complex c = new Complex(30.233, 0);
|
||||
String expected = "30.23";
|
||||
String actual = complexFormat.format(c);
|
||||
assertEquals(expected, actual);
|
||||
}
|
||||
|
||||
public void testDifferentImaginaryChar() {
|
||||
Complex c = new Complex(1, 1);
|
||||
String expected = "1 + 1j";
|
||||
String actual = complexFormatJ.format(c);
|
||||
assertEquals(expected, actual);
|
||||
}
|
||||
|
||||
public void testStaticFormatComplex() {
|
||||
Complex c = new Complex(232.222, -342.33);
|
||||
String expected = "232.22 - 342.33i";
|
||||
String actual = ComplexFormat.formatComplex(c);
|
||||
assertEquals(expected, actual);
|
||||
}
|
||||
|
||||
public void testNan() {
|
||||
Complex c = new Complex(Double.NaN, Double.NaN);
|
||||
String expected = "(NaN) + (NaN)i";
|
||||
String actual = complexFormat.format(c);
|
||||
assertEquals(expected, actual);
|
||||
}
|
||||
|
||||
public void testPositiveInfinity() {
|
||||
Complex c = new Complex(Double.POSITIVE_INFINITY, Double.POSITIVE_INFINITY);
|
||||
String expected = "(Infinity) + (Infinity)i";
|
||||
String actual = complexFormat.format(c);
|
||||
assertEquals(expected, actual);
|
||||
}
|
||||
|
||||
public void testNegativeInfinity() {
|
||||
Complex c = new Complex(Double.NEGATIVE_INFINITY, Double.NEGATIVE_INFINITY);
|
||||
String expected = "(-Infinity) - (Infinity)i";
|
||||
String actual = complexFormat.format(c);
|
||||
assertEquals(expected, actual);
|
||||
}
|
||||
|
||||
public void testParseSimpleNoDecimals() {
|
||||
String source = "1 + 1i";
|
||||
Complex expected = new Complex(1, 1);
|
||||
try {
|
||||
Complex actual = (Complex)complexFormat.parseObject(source);
|
||||
assertEquals(expected, actual);
|
||||
} catch (ParseException ex) {
|
||||
fail(ex.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
public void testParseSimpleWithDecimals() {
|
||||
String source = "1.23 + 1.43i";
|
||||
Complex expected = new Complex(1.23, 1.43);
|
||||
try {
|
||||
Complex actual = (Complex)complexFormat.parseObject(source);
|
||||
assertEquals(expected, actual);
|
||||
} catch (ParseException ex) {
|
||||
fail(ex.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
public void testParseSimpleWithDecimalsTrunc() {
|
||||
String source = "1.2323 + 1.4343i";
|
||||
Complex expected = new Complex(1.2323, 1.4343);
|
||||
try {
|
||||
Complex actual = (Complex)complexFormat.parseObject(source);
|
||||
assertEquals(expected, actual);
|
||||
} catch (ParseException ex) {
|
||||
fail(ex.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
public void testParseNegativeReal() {
|
||||
String source = "-1.2323 + 1.4343i";
|
||||
Complex expected = new Complex(-1.2323, 1.4343);
|
||||
try {
|
||||
Complex actual = (Complex)complexFormat.parseObject(source);
|
||||
assertEquals(expected, actual);
|
||||
} catch (ParseException ex) {
|
||||
fail(ex.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
public void testParseNegativeImaginary() {
|
||||
String source = "1.2323 - 1.4343i";
|
||||
Complex expected = new Complex(1.2323, -1.4343);
|
||||
try {
|
||||
Complex actual = (Complex)complexFormat.parseObject(source);
|
||||
assertEquals(expected, actual);
|
||||
} catch (ParseException ex) {
|
||||
fail(ex.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
public void testParseNegativeBoth() {
|
||||
String source = "-1.2323 - 1.4343i";
|
||||
Complex expected = new Complex(-1.2323, -1.4343);
|
||||
try {
|
||||
Complex actual = (Complex)complexFormat.parseObject(source);
|
||||
assertEquals(expected, actual);
|
||||
} catch (ParseException ex) {
|
||||
fail(ex.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
public void testParseZeroReal() {
|
||||
String source = "0.0 - 1.4343i";
|
||||
Complex expected = new Complex(0.0, -1.4343);
|
||||
try {
|
||||
Complex actual = (Complex)complexFormat.parseObject(source);
|
||||
assertEquals(expected, actual);
|
||||
} catch (ParseException ex) {
|
||||
fail(ex.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
public void testParseZeroImaginary() {
|
||||
String source = "-1.2323";
|
||||
Complex expected = new Complex(-1.2323, 0);
|
||||
try {
|
||||
Complex actual = (Complex)complexFormat.parseObject(source);
|
||||
assertEquals(expected, actual);
|
||||
} catch (ParseException ex) {
|
||||
fail(ex.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
public void testParseDifferentImaginaryChar() {
|
||||
String source = "-1.2323 - 1.4343j";
|
||||
Complex expected = new Complex(-1.2323, -1.4343);
|
||||
try {
|
||||
Complex actual = (Complex)complexFormatJ.parseObject(source);
|
||||
assertEquals(expected, actual);
|
||||
} catch (ParseException ex) {
|
||||
fail(ex.getMessage());
|
||||
}
|
||||
public class ComplexFormatTest extends ComplexFormatAbstractTest {
|
||||
protected char getDecimalCharacter() {
|
||||
return '.';
|
||||
}
|
||||
|
||||
public void testParseNan() {
|
||||
String source = "(NaN) + (NaN)i";
|
||||
Complex expected = new Complex(Double.NaN, Double.NaN);
|
||||
try {
|
||||
Complex actual = (Complex)complexFormat.parseObject(source);
|
||||
assertEquals(expected, actual);
|
||||
} catch (ParseException ex) {
|
||||
fail(ex.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
public void testParsePositiveInfinity() {
|
||||
String source = "(Infinity) + (Infinity)i";
|
||||
Complex expected = new Complex(Double.POSITIVE_INFINITY, Double.POSITIVE_INFINITY);
|
||||
try {
|
||||
Complex actual = (Complex)complexFormat.parseObject(source);
|
||||
assertEquals(expected, actual);
|
||||
} catch (ParseException ex) {
|
||||
fail(ex.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
public void testPaseNegativeInfinity() {
|
||||
String source = "(-Infinity) - (Infinity)i";
|
||||
Complex expected = new Complex(Double.NEGATIVE_INFINITY, Double.NEGATIVE_INFINITY);
|
||||
try {
|
||||
Complex actual = (Complex)complexFormat.parseObject(source);
|
||||
assertEquals(expected, actual);
|
||||
} catch (ParseException ex) {
|
||||
fail(ex.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
public void testConstructorSingleFormat() {
|
||||
NumberFormat nf = NumberFormat.getInstance();
|
||||
ComplexFormat cf = new ComplexFormat(nf);
|
||||
assertNotNull(cf);
|
||||
assertEquals(nf, cf.getRealFormat());
|
||||
}
|
||||
|
||||
public void testGetImaginaryFormat() {
|
||||
NumberFormat nf = NumberFormat.getInstance();
|
||||
ComplexFormat cf = new ComplexFormat();
|
||||
|
||||
assertNotSame(nf, cf.getImaginaryFormat());
|
||||
cf.setImaginaryFormat(nf);
|
||||
assertSame(nf, cf.getImaginaryFormat());
|
||||
}
|
||||
|
||||
public void testSetImaginaryFormatNull() {
|
||||
try {
|
||||
ComplexFormat cf = new ComplexFormat();
|
||||
cf.setImaginaryFormat(null);
|
||||
fail();
|
||||
} catch (IllegalArgumentException ex) {
|
||||
// success
|
||||
}
|
||||
}
|
||||
|
||||
public void testSetRealFormatNull() {
|
||||
try {
|
||||
ComplexFormat cf = new ComplexFormat();
|
||||
cf.setRealFormat(null);
|
||||
fail();
|
||||
} catch (IllegalArgumentException ex) {
|
||||
// success
|
||||
}
|
||||
}
|
||||
|
||||
public void testGetRealFormat() {
|
||||
NumberFormat nf = NumberFormat.getInstance();
|
||||
ComplexFormat cf = new ComplexFormat();
|
||||
|
||||
assertNotSame(nf, cf.getRealFormat());
|
||||
cf.setRealFormat(nf);
|
||||
assertSame(nf, cf.getRealFormat());
|
||||
}
|
||||
|
||||
public void testSetImaginaryCharacterNull() {
|
||||
try {
|
||||
ComplexFormat cf = new ComplexFormat();
|
||||
cf.setImaginaryCharacter(null);
|
||||
fail();
|
||||
} catch (IllegalArgumentException ex) {
|
||||
// success
|
||||
}
|
||||
}
|
||||
|
||||
public void testSetImaginaryCharacterEmpty() {
|
||||
try {
|
||||
ComplexFormat cf = new ComplexFormat();
|
||||
cf.setImaginaryCharacter("");
|
||||
fail();
|
||||
} catch (IllegalArgumentException ex) {
|
||||
// success
|
||||
}
|
||||
}
|
||||
|
||||
public void testFormatNumber() {
|
||||
ComplexFormat cf = new ComplexFormat();
|
||||
Double pi = new Double(Math.PI);
|
||||
String text = cf.format(pi);
|
||||
assertEquals("3.14", text);
|
||||
}
|
||||
|
||||
public void testFormatObject() {
|
||||
try {
|
||||
ComplexFormat cf = new ComplexFormat();
|
||||
Object object = new Object();
|
||||
cf.format(object);
|
||||
fail();
|
||||
} catch (IllegalArgumentException ex) {
|
||||
// success
|
||||
}
|
||||
protected Locale getLocale() {
|
||||
return Locale.US;
|
||||
}
|
||||
}
|
||||
|
||||
@ -19,7 +19,7 @@ package org.apache.commons.math.complex;
|
||||
import java.util.Locale;
|
||||
|
||||
|
||||
public class FrenchComplexFormatTest extends AbstractComplexFormatTest {
|
||||
public class FrenchComplexFormatTest extends ComplexFormatAbstractTest {
|
||||
|
||||
protected char getDecimalCharacter() {
|
||||
return ',';
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user