Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/main/interpreter/Visitor.java
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,6 @@ public MSType visitBool(MineScriptParser.BoolContext ctx) {
return new MSBool(Boolean.parseBoolean(ctx.getText()));
}


@Override
public MSType visitNotExpr(MineScriptParser.NotExprContext ctx) {
MSType value = visit(ctx.expression());
Expand Down
67 changes: 66 additions & 1 deletion src/test/interpreter/VisitorUnitTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ class VisitorUnitTest {
@Mock private MineScriptParser.AddSubContext mockAddSubContext;
@Mock private MineScriptParser.OrContext mockOrContext;
@Mock private MineScriptParser.MultDivModContext mockMultDivModContext;
@Mock private MineScriptParser.IsIsNotContext mockIsIsNotContext;

@ParameterizedTest
@ValueSource(ints = {-1000, -10, 0, 10, 1000})
Expand Down Expand Up @@ -310,7 +311,71 @@ void visitOrValidInputReturnsOrValue(boolean value1, boolean value2) {
MSType result = spyVisitor.visitOr(mockOrContext);
Assertions.assertEquals(value1 || value2, ((MSBool) result).getValue());
}


@ParameterizedTest
@CsvSource({"0,0,is", "0,1,is not", "1,0,is not", "1,1,is"})
void visitIsIsNotNumberReturnsCorrectBool(int left, int right, String operator) {
mockIsIsNotContext.op = new MockToken(operator);
Mockito.when(mockIsIsNotContext.expression(0)).thenReturn(mockExpressionContext1);
Mockito.when(mockIsIsNotContext.expression(1)).thenReturn(mockExpressionContext2);
Mockito.when(spyVisitor.visit(mockExpressionContext1)).thenReturn(new MSNumber(left));
Mockito.when(spyVisitor.visit(mockExpressionContext2)).thenReturn(new MSNumber(right));

MSType result = spyVisitor.visitIsIsNot(mockIsIsNotContext);
switch (operator) {
case "is" -> Assertions.assertEquals(left == right, ((MSBool) result).getValue());
case "is not" -> Assertions.assertEquals(left != right, ((MSBool) result).getValue());
}
}

@ParameterizedTest
@CsvSource({"false,false,is", "false,true,is not", "true,false,is not", "true,true,is"})
void visitIsIsNotBoolReturnsCorrectBool(boolean left, boolean right, String operator) {
mockIsIsNotContext.op = new MockToken(operator);
Mockito.when(mockIsIsNotContext.expression(0)).thenReturn(mockExpressionContext1);
Mockito.when(mockIsIsNotContext.expression(1)).thenReturn(mockExpressionContext2);
Mockito.when(spyVisitor.visit(mockExpressionContext1)).thenReturn(new MSBool(left));
Mockito.when(spyVisitor.visit(mockExpressionContext2)).thenReturn(new MSBool(right));

MSType result = spyVisitor.visitIsIsNot(mockIsIsNotContext);
switch (operator) {
case "is" -> Assertions.assertEquals(left == right, ((MSBool) result).getValue());
case "is not" -> Assertions.assertEquals(left != right, ((MSBool) result).getValue());
}
}

@ParameterizedTest
@CsvSource({"north,south,is", "east,west,is not", "top,bottom,is not", "north,north,is"})
void visitIsIsNotAbsDirReturnsCorrectBool(String left, String right, String operator) {
mockIsIsNotContext.op = new MockToken(operator);
Mockito.when(mockIsIsNotContext.expression(0)).thenReturn(mockExpressionContext1);
Mockito.when(mockIsIsNotContext.expression(1)).thenReturn(mockExpressionContext2);
Mockito.when(spyVisitor.visit(mockExpressionContext1)).thenReturn(new MSAbsDir(left));
Mockito.when(spyVisitor.visit(mockExpressionContext2)).thenReturn(new MSAbsDir(right));

MSType result = spyVisitor.visitIsIsNot(mockIsIsNotContext);
switch (operator) {
case "is" -> Assertions.assertEquals(left.equals(right), ((MSBool) result).getValue());
case "is not" -> Assertions.assertEquals(!left.equals(right), ((MSBool) result).getValue());
}
}

@ParameterizedTest
@CsvSource({"left,right,is", "up,down,is not", "left,left,is not", "right,right,is"})
void visitIsIsNotRelDirReturnCorrectBool(String left, String right, String operator) {
mockIsIsNotContext.op = new MockToken(operator);
Mockito.when(mockIsIsNotContext.expression(0)).thenReturn(mockExpressionContext1);
Mockito.when(mockIsIsNotContext.expression(1)).thenReturn(mockExpressionContext2);
Mockito.when(spyVisitor.visit(mockExpressionContext1)).thenReturn(new MSRelDir(left));
Mockito.when(spyVisitor.visit(mockExpressionContext2)).thenReturn(new MSRelDir(right));

MSType result = spyVisitor.visitIsIsNot(mockIsIsNotContext);
switch (operator) {
case "is" -> Assertions.assertEquals(left.equals(right), ((MSBool) result).getValue());
case "is not" -> Assertions.assertEquals(!left.equals(right), ((MSBool) result).getValue());
}
}

@ParameterizedTest
@CsvSource ({"2,2,*", "2,2,/", "2,2,%"})
void visitMultDivModValidInputReturnsNumber(int left, int right, String operator) {
Expand Down