Fix warnings and inconsistent indents

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1646163 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Nick Burch 2014-12-17 07:01:38 +00:00
parent 6168a7999c
commit e27afd1332

View File

@ -30,27 +30,21 @@ import org.apache.poi.ss.formula.eval.StringEval;
/** /**
* Test case for TEXT() * Test case for TEXT()
*
* @author Stephen Wolke (smwolke at geistig.com)
*/ */
public final class TestText extends TestCase { public final class TestText extends TestCase {
private static final TextFunction T = null;
public void testTextWithStringFirstArg() { public void testTextWithStringFirstArg() {
ValueEval strArg = new StringEval("abc"); ValueEval strArg = new StringEval("abc");
ValueEval formatArg = new StringEval("abc"); ValueEval formatArg = new StringEval("abc");
ValueEval[] args = { strArg, formatArg }; ValueEval[] args = { strArg, formatArg };
ValueEval result = T.TEXT.evaluate(args, -1, (short)-1); ValueEval result = TextFunction.TEXT.evaluate(args, -1, (short)-1);
assertEquals(ErrorEval.VALUE_INVALID, result); assertEquals(ErrorEval.VALUE_INVALID, result);
} }
public void testTextWithDeciamlFormatSecondArg() { public void testTextWithDeciamlFormatSecondArg() {
ValueEval numArg = new NumberEval(321321.321); ValueEval numArg = new NumberEval(321321.321);
ValueEval formatArg = new StringEval("#,###.00000"); ValueEval formatArg = new StringEval("#,###.00000");
ValueEval[] args = { numArg, formatArg }; ValueEval[] args = { numArg, formatArg };
ValueEval result = T.TEXT.evaluate(args, -1, (short)-1); ValueEval result = TextFunction.TEXT.evaluate(args, -1, (short)-1);
char groupSeparator = new DecimalFormatSymbols(Locale.getDefault()).getGroupingSeparator(); char groupSeparator = new DecimalFormatSymbols(Locale.getDefault()).getGroupingSeparator();
char decimalSeparator = new DecimalFormatSymbols(Locale.getDefault()).getDecimalSeparator(); char decimalSeparator = new DecimalFormatSymbols(Locale.getDefault()).getDecimalSeparator();
ValueEval testResult = new StringEval("321" + groupSeparator + "321" + decimalSeparator + "32100"); ValueEval testResult = new StringEval("321" + groupSeparator + "321" + decimalSeparator + "32100");
@ -59,35 +53,34 @@ public final class TestText extends TestCase {
formatArg = new StringEval("00000.00000"); formatArg = new StringEval("00000.00000");
args[0] = numArg; args[0] = numArg;
args[1] = formatArg; args[1] = formatArg;
result = T.TEXT.evaluate(args, -1, (short)-1); result = TextFunction.TEXT.evaluate(args, -1, (short)-1);
testResult = new StringEval("00321" + decimalSeparator + "32100"); testResult = new StringEval("00321" + decimalSeparator + "32100");
assertEquals(testResult.toString(), result.toString()); assertEquals(testResult.toString(), result.toString());
formatArg = new StringEval("$#.#"); formatArg = new StringEval("$#.#");
args[1] = formatArg; args[1] = formatArg;
result = T.TEXT.evaluate(args, -1, (short)-1); result = TextFunction.TEXT.evaluate(args, -1, (short)-1);
testResult = new StringEval("$321" + decimalSeparator + "3"); testResult = new StringEval("$321" + decimalSeparator + "3");
assertEquals(testResult.toString(), result.toString()); assertEquals(testResult.toString(), result.toString());
} }
public void testTextWithFractionFormatSecondArg() { public void testTextWithFractionFormatSecondArg() {
ValueEval numArg = new NumberEval(321.321); ValueEval numArg = new NumberEval(321.321);
ValueEval formatArg = new StringEval("# #/#"); ValueEval formatArg = new StringEval("# #/#");
ValueEval[] args = { numArg, formatArg }; ValueEval[] args = { numArg, formatArg };
ValueEval result = T.TEXT.evaluate(args, -1, (short)-1); ValueEval result = TextFunction.TEXT.evaluate(args, -1, (short)-1);
ValueEval testResult = new StringEval("321 1/3"); ValueEval testResult = new StringEval("321 1/3");
assertEquals(testResult.toString(), result.toString()); assertEquals(testResult.toString(), result.toString());
formatArg = new StringEval("# #/##"); formatArg = new StringEval("# #/##");
args[1] = formatArg; args[1] = formatArg;
result = T.TEXT.evaluate(args, -1, (short)-1); result = TextFunction.TEXT.evaluate(args, -1, (short)-1);
testResult = new StringEval("321 26/81"); testResult = new StringEval("321 26/81");
assertEquals(testResult.toString(), result.toString()); assertEquals(testResult.toString(), result.toString());
formatArg = new StringEval("#/##"); formatArg = new StringEval("#/##");
args[1] = formatArg; args[1] = formatArg;
result = T.TEXT.evaluate(args, -1, (short)-1); result = TextFunction.TEXT.evaluate(args, -1, (short)-1);
testResult = new StringEval("26027/81"); testResult = new StringEval("26027/81");
assertEquals(testResult.toString(), result.toString()); assertEquals(testResult.toString(), result.toString());
} }
@ -97,14 +90,14 @@ public final class TestText extends TestCase {
ValueEval numArg = new NumberEval(321.321); ValueEval numArg = new NumberEval(321.321);
ValueEval formatArg = new StringEval("dd:MM:yyyy hh:mm:ss"); ValueEval formatArg = new StringEval("dd:MM:yyyy hh:mm:ss");
ValueEval[] args = { numArg, formatArg }; ValueEval[] args = { numArg, formatArg };
ValueEval result = T.TEXT.evaluate(args, -1, (short)-1); ValueEval result = TextFunction.TEXT.evaluate(args, -1, (short)-1);
ValueEval testResult = new StringEval("16:11:1900 07:42:14"); ValueEval testResult = new StringEval("16:11:1900 07:42:14");
assertEquals(testResult.toString(), result.toString()); assertEquals(testResult.toString(), result.toString());
// Excel also supports "m before h is month" // Excel also supports "m before h is month"
formatArg = new StringEval("dd:mm:yyyy hh:mm:ss"); formatArg = new StringEval("dd:mm:yyyy hh:mm:ss");
args[1] = formatArg; args[1] = formatArg;
result = T.TEXT.evaluate(args, -1, (short)-1); result = TextFunction.TEXT.evaluate(args, -1, (short)-1);
testResult = new StringEval("16:11:1900 07:42:14"); testResult = new StringEval("16:11:1900 07:42:14");
assertEquals(testResult.toString(), result.toString()); assertEquals(testResult.toString(), result.toString());
@ -114,14 +107,14 @@ public final class TestText extends TestCase {
// Again with Java style // Again with Java style
formatArg = new StringEval("MMMM dd, yyyy"); formatArg = new StringEval("MMMM dd, yyyy");
args[1] = formatArg; args[1] = formatArg;
result = T.TEXT.evaluate(args, -1, (short)-1); result = TextFunction.TEXT.evaluate(args, -1, (short)-1);
testResult = new StringEval(november + " 16, 1900"); testResult = new StringEval(november + " 16, 1900");
assertEquals(testResult.toString(), result.toString()); assertEquals(testResult.toString(), result.toString());
// And Excel style // And Excel style
formatArg = new StringEval("mmmm dd, yyyy"); formatArg = new StringEval("mmmm dd, yyyy");
args[1] = formatArg; args[1] = formatArg;
result = T.TEXT.evaluate(args, -1, (short)-1); result = TextFunction.TEXT.evaluate(args, -1, (short)-1);
testResult = new StringEval(november + " 16, 1900"); testResult = new StringEval(november + " 16, 1900");
assertEquals(testResult.toString(), result.toString()); assertEquals(testResult.toString(), result.toString());
} }