diff --git a/src/test/java/walkingkooka/spreadsheet/format/parser/SpreadsheetFormatParsersTest.java b/src/test/java/walkingkooka/spreadsheet/format/parser/SpreadsheetFormatParsersTest.java index 04d8f25a9..42d45ba6f 100644 --- a/src/test/java/walkingkooka/spreadsheet/format/parser/SpreadsheetFormatParsersTest.java +++ b/src/test/java/walkingkooka/spreadsheet/format/parser/SpreadsheetFormatParsersTest.java @@ -5259,7 +5259,7 @@ public void testNumberFormatDigitExponentLessThanEqualsDigitFails() { this.numberFormatParseThrows( digit(), exponent1(lessThanEquals()), - "Invalid character '<' at (4,1) expected NUMBER_NUMBER_NUMBER_TEXT | NUMBER_NUMBER_TEXT | NUMBER_TEXT | CONDITION_GENERAL_OR_NUMBER_COLO" + "Invalid character '<' at (4,1) expected NUMBER_NUMBER_NUMBER_TEXT | NUMBER_NUMBER_TEXT | NUMBER_TEXT | CONDITION_GENERAL_OR_NUMBER_COLOR" ); } diff --git a/src/test/java/walkingkooka/spreadsheet/parser/SpreadsheetParsersTest.java b/src/test/java/walkingkooka/spreadsheet/parser/SpreadsheetParsersTest.java index 16bccde55..d1477e96a 100644 --- a/src/test/java/walkingkooka/spreadsheet/parser/SpreadsheetParsersTest.java +++ b/src/test/java/walkingkooka/spreadsheet/parser/SpreadsheetParsersTest.java @@ -1045,7 +1045,7 @@ private void errorParserParseAndCheck(final String from, public void testValueOrExpressionParserParseStarFails() { this.valueOrExpressionParserParseFails( "1+*", - "Invalid character '*' at (3,1)" + "Invalid character '*' at (3,1) expected BINARY_SUB_EXPRESSION" ); } @@ -3063,7 +3063,7 @@ private void valueOrExpressionParserParseNestedGroupAddition() { public void testValueOrExpressionParserParseInvalidTokenFails() { this.valueOrExpressionParserParseFails( "!", - this.reporterMessage('!', 1, 1) + "Invalid character '!' at (1,1) expected EXPRESSION_OPT" ); } @@ -3071,7 +3071,7 @@ public void testValueOrExpressionParserParseInvalidTokenFails() { public void testValueOrExpressionParserParseInvalidTokenFails2() { this.valueOrExpressionParserParseFails( " !", - this.reporterMessage('!', 3, 1) + "Invalid character '!' at (3,1) expected EXPRESSION_OPT" ); } @@ -3088,7 +3088,7 @@ public void testValueOrExpressionParserParseInvalidBinaryTokenRightFailsDouble() private void valueOrExpressionParserParseFails() { this.valueOrExpressionParserParseFails( "1+!", - this.reporterMessage('!', 3, 1) + "Invalid character '!' at (3,1) expected BINARY_SUB_EXPRESSION" ); } @@ -3096,16 +3096,10 @@ private void valueOrExpressionParserParseFails() { public void testParseInvalidGroupTokenFails() { this.valueOrExpressionParserParseFails( "( !", - this.reporterMessage('!', 3, 1) + "Invalid character '!' at (3,1) expected EXPRESSION_OPT" ); } - private String reporterMessage(final char c, - final int column, - final int row) { - return "Invalid character " + CharSequences.quoteIfChars(c) + " at (" + column + "," + row + ")"; - } - @Test public void testParseAdditionBigDecimal() { this.testParseAddition();