diff options
Diffstat (limited to 'src/test/java/sevenUnits/utils/ExpressionParserTest.java')
| -rw-r--r-- | src/test/java/sevenUnits/utils/ExpressionParserTest.java | 91 |
1 files changed, 79 insertions, 12 deletions
diff --git a/src/test/java/sevenUnits/utils/ExpressionParserTest.java b/src/test/java/sevenUnits/utils/ExpressionParserTest.java index 3a95285..2e0b4b0 100644 --- a/src/test/java/sevenUnits/utils/ExpressionParserTest.java +++ b/src/test/java/sevenUnits/utils/ExpressionParserTest.java @@ -1,5 +1,5 @@ /** - * Copyright (C) 2019 Adrien Hopkins + * Copyright (C) 2019, 2021, 2024, 2025 Adrien Hopkins * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by @@ -17,6 +17,7 @@ package sevenUnits.utils; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; import java.util.List; import java.util.stream.IntStream; @@ -26,11 +27,10 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; -// TODO add tests for expression-to-RPN and RPN-to-result /** * A test for the {@code ExpressionParser} class. This is NOT part of this * program's public API. - * + * * @author Adrien Hopkins * @since 2019-03-22 * @since v0.2.0 @@ -39,13 +39,13 @@ class ExpressionParserTest { private static final ExpressionParser<Integer> numberParser = new ExpressionParser.Builder<>( Integer::parseInt).addBinaryOperator("+", (o1, o2) -> o1 + o2, 0) .addBinaryOperator("-", (o1, o2) -> o1 - o2, 0) - .addBinaryOperator("*", (o1, o2) -> o1 * o2, 1) - .addBinaryOperator("/", (o1, o2) -> o1 / o2, 1) - .addBinaryOperator("^", (o1, o2) -> (int) Math.pow(o1, o2), 2).build(); + .addUnaryOperator("neg", o1 -> -o1, 1) + .addBinaryOperator("*", (o1, o2) -> o1 * o2, 2) + .addBinaryOperator("/", (o1, o2) -> o1 / o2, 2) + .addUnaryOperator("recip", o1 -> 1 / o1, 3) + .addBinaryOperator("^", (o1, o2) -> (int) Math.pow(o1, o2), 4).build(); - /** - * The expressions used in the expression parsing tests - */ + /** The expressions used in the expression parsing tests */ private static final List<String> TEST_EXPRESSIONS = List.of( // test parsing of expressions "1 + 2 ^ 5 * 3", "(1 + 2) ^ 5 * 3", @@ -54,21 +54,81 @@ class ExpressionParserTest { // ensure it normally goes from left to right "1 + 2 + 3 + 4", "12 - 4 - 3", "12 - (4 - 3)", "1 / 2 + 3"); - /** - * The expected results for evaluating these expressions - */ + /** The expected results for evaluating these expressions */ private static final int[] RESULTS = { 97, 729, 133, 10, 5, 11, 3 }; + private static final Stream<Arguments> testConvertExpressionToRPN() { + return Stream.of(Arguments.of("1 + 2 ^ 5 * 3", "1 2 5 ^ 3 * +"), + Arguments.of("(1 + 2) ^ 5 * 3", "1 2 + 5 ^ 3 *"), + Arguments.of("12 * 5 + (3 ^ (2 * 3) - 72) / (3 + 3 * 2)", + "12 5 * 3 2 3 * ^ 72 - 3 3 2 * + / +"), + Arguments.of("1 + 2 + 3 + 4", "1 2 + 3 + 4 +"), + Arguments.of("12 - 4 - 3", "12 4 - 3 -"), + Arguments.of("12 - (4 - 3)", "12 4 3 - -"), + Arguments.of("1 / 2 + 3", "1 2 / 3 +"), Arguments.of("12", "12"), + Arguments.of("2 * 3 + 4", "2 3 * 4 +"), + Arguments.of("(2 * 3) + 4", "2 3 * 4 +"), + Arguments.of("2 * 3 - 4", "2 3 * 4 -"), + Arguments.of("(2 * 3) - 4", "2 3 * 4 -"), + Arguments.of("2 * (3 + 4)", "2 3 4 + *"), + Arguments.of("2 * (3 - 4)", "2 3 4 - *"), + Arguments.of("neg 2", "2 neg"), + Arguments.of("1 + neg 2", "1 2 neg +")); + } + + private static final Stream<String> testInvalidExpression() { + return Stream.of("+", "1 +", "1 + * 2", "1 (+ 1)", "neg"); + } + + private static final Stream<String> testInvalidRPN() { + return Stream.of("+", "1 +", "1 + * 2", "1 * 2", "1 2", "neg"); + } + /** * @return A stream of objects, where each one is an expression and the * expected result * @since 2021-09-27 + * @since v0.3.2 */ private static final Stream<Arguments> testParseExpressionData() { return IntStream.range(0, TEST_EXPRESSIONS.size()) .mapToObj(i -> Arguments.of(TEST_EXPRESSIONS.get(i), RESULTS[i])); } + private static final Stream<Arguments> testParseRPN() { + return Stream.of(Arguments.of("1 2 5 ^ 3 * +", 97), + Arguments.of("1 2 + 5 ^ 3 *", 729), + Arguments.of("12 5 * 3 2 3 * ^ 72 - 3 3 2 * + / +", 133), + Arguments.of("1 2 + 3 + 4 +", 10), Arguments.of("12 4 - 3 -", 5), + Arguments.of("12 4 3 - -", 11), Arguments.of("1 2 / 3 +", 3), + Arguments.of("12", 12), Arguments.of("2 3 * 4 +", 10), + Arguments.of("2 3 * 4 -", 2), Arguments.of("2 3 4 + *", 14), + Arguments.of("2 3 4 - *", -2), Arguments.of("2 neg", -2), + Arguments.of("1 2 neg +", -1)); + } + + @ParameterizedTest + @MethodSource + public void testConvertExpressionToRPN(String expression, + String expectedRPN) { + assertEquals(expectedRPN, + numberParser.convertExpressionToReversePolish(expression)); + } + + @ParameterizedTest + @MethodSource + public void testInvalidExpression(String expression) { + assertThrows(RuntimeException.class, + () -> numberParser.convertExpressionToReversePolish(expression)); + } + + @ParameterizedTest + @MethodSource + public void testInvalidRPN(String expressionRPN) { + assertThrows(RuntimeException.class, + () -> numberParser.parseReversePolishExpression(expressionRPN)); + } + /** * Test method for * {@link sevenUnits.utils.ExpressionParser#parseExpression(java.lang.String)}. @@ -78,4 +138,11 @@ class ExpressionParserTest { public void testParseExpression(String expression, int value) { assertEquals(value, numberParser.parseExpression(expression)); } + + @ParameterizedTest + @MethodSource + public void testParseRPN(String expressionRPN, int value) { + assertEquals(value, + numberParser.parseReversePolishExpression(expressionRPN)); + } } |