1
1
package stack ;
2
2
3
3
import static org .assertj .core .api .Assertions .assertThat ;
4
+ import static stack .OperatorPriority .getOperatorPriority ;
4
5
5
6
import org .junit .jupiter .api .BeforeEach ;
6
7
import org .junit .jupiter .api .DisplayName ;
@@ -55,14 +56,12 @@ void setUp() {
55
56
char openingParenthesis = '(' ;
56
57
char noSign = ')' ;
57
58
58
- assertThat (infixToPostfix .getOperatorPriority (multiplicationSign ))
59
- .isEqualTo (OperatorPriority .TOP );
60
- assertThat (infixToPostfix .getOperatorPriority (divisionSign )).isEqualTo (OperatorPriority .TOP );
61
- assertThat (infixToPostfix .getOperatorPriority (plusSign )).isEqualTo (OperatorPriority .MID );
62
- assertThat (infixToPostfix .getOperatorPriority (minusSign )).isEqualTo (OperatorPriority .MID );
63
- assertThat (infixToPostfix .getOperatorPriority (openingParenthesis ))
64
- .isEqualTo (OperatorPriority .BOT );
65
- assertThat (infixToPostfix .getOperatorPriority (noSign )).isEqualTo (OperatorPriority .NONE );
59
+ assertThat (getOperatorPriority (multiplicationSign )).isEqualTo (OperatorPriority .TOP );
60
+ assertThat (getOperatorPriority (divisionSign )).isEqualTo (OperatorPriority .TOP );
61
+ assertThat (getOperatorPriority (plusSign )).isEqualTo (OperatorPriority .MID );
62
+ assertThat (getOperatorPriority (minusSign )).isEqualTo (OperatorPriority .MID );
63
+ assertThat (getOperatorPriority (openingParenthesis )).isEqualTo (OperatorPriority .BOT );
64
+ assertThat (getOperatorPriority (noSign )).isEqualTo (OperatorPriority .NONE );
66
65
}
67
66
68
67
@ Test
@@ -71,7 +70,7 @@ void setUp() {
71
70
char op1 = '*' ;
72
71
char op2 = '+' ;
73
72
74
- assertThat (infixToPostfix .compareOperator (op1 , op2 )).isEqualTo ( 1 );
73
+ assertThat (infixToPostfix .compareOperator (op1 , op2 )).isGreaterThan ( 0 );
75
74
}
76
75
77
76
@ Test
@@ -89,6 +88,6 @@ void setUp() {
89
88
char op1 = '(' ;
90
89
char op2 = '+' ;
91
90
92
- assertThat (infixToPostfix .compareOperator (op1 , op2 )).isEqualTo (- 1 );
91
+ assertThat (infixToPostfix .compareOperator (op1 , op2 )).isLessThan ( 0 );
93
92
}
94
93
}
0 commit comments