reformat code and optimize imports

This commit is contained in:
Jan-Peter Klein
2023-06-15 13:12:10 +02:00
parent f054a1af03
commit f92c436339
3 changed files with 80 additions and 85 deletions
@@ -11,10 +11,10 @@ import org.mockito.Mockito;
import javafx.application.Application;
import javafx.scene.Scene;
import javafx.stage.Stage;
import java.util.concurrent.ExecutorService;
class ErrorControllerTest {
Application application;
String stackTrace;
ErrorCode errorCode;
@@ -33,19 +33,12 @@ class ErrorControllerTest {
window = Mockito.mock(Stage.class);
environment = Mockito.mock(Environment.class);
executorService = Mockito.mock(ExecutorService.class);
errorController = new ErrorController(
application,
stackTrace,
errorCode,
previousScene,
window,
environment,
executorService);
errorController = new ErrorController(application, stackTrace, errorCode, previousScene, window, environment, executorService);
}
private ErrorDiscussion createErrorDiscussion(String title, int upvoteCount, ErrorDiscussion.Answer answer){
private ErrorDiscussion createErrorDiscussion(String title, int upvoteCount, ErrorDiscussion.Answer answer) {
ErrorDiscussion ed = new ErrorDiscussion();
ed.title =title;
ed.title = title;
ed.upvoteCount = upvoteCount;
ed.answer = answer;
return ed;
@@ -53,24 +46,24 @@ class ErrorControllerTest {
@ParameterizedTest
@CsvSource(textBlock = """
10, 5, -1
8, 15, 1
10, 10, 0
""")
10, 5, -1
8, 15, 1
10, 10, 0
""")
public void testCompareUpvoteCount(int leftUpvoteCount, int rightUpvoteCount, int expectedResult) {
var left = createErrorDiscussion("", leftUpvoteCount, null);
var right = createErrorDiscussion("", rightUpvoteCount, null);
int result = errorController.compareUpvoteCount(left, right);
Assertions.assertEquals(expectedResult,Integer.signum(result));
Assertions.assertEquals(expectedResult, Integer.signum(result));
}
@ParameterizedTest
@CsvSource(textBlock = """
false, false, 0
true, true, 0
true, false, -1
false, true, 1
""")
false, false, 0
true, true, 0
true, false, -1
false, true, 1
""")
public void testCompareIsAnswered(boolean leftIsAnswered, boolean rightIsAnswered, int expectedResult) {
var answer = new ErrorDiscussion.Answer();
var left = createErrorDiscussion("", 0, leftIsAnswered ? answer : null);
@@ -81,54 +74,54 @@ class ErrorControllerTest {
@ParameterizedTest
@CsvSource(textBlock = """
Error 0000:0000:0000, Error 0000:0000:0000, 0
Error 6HU1:12H1:HU7J, Error 0000:0000:0000, -1
Error 0000:0000:0000, Error 6HU1:12H1:HU7J, 1
""")
Error 0000:0000:0000, Error 0000:0000:0000, 0
Error 6HU1:12H1:HU7J, Error 0000:0000:0000, -1
Error 0000:0000:0000, Error 6HU1:12H1:HU7J, 1
""")
public void testCompareExactMatch(String leftTitle, String rightTitle, int expectedResult) {
Mockito.when(errorCode.toString()).thenReturn("6HU1:12H1:HU7J");
var left = createErrorDiscussion(leftTitle, 0, null);
var right = createErrorDiscussion(rightTitle, 0,null);
int result = errorController.compareExactMatch(left,right);
var right = createErrorDiscussion(rightTitle, 0, null);
int result = errorController.compareExactMatch(left, right);
Assertions.assertEquals(expectedResult, result);
}
@ParameterizedTest
@CsvSource(textBlock = """
Error 6HU1:12H1:0000, Error 6HU1:12H1:0000, 0
Error 0000:0000:0000, Error 0000:0000:0000, 0
Error 6HU1:12H1:0000, Error 0000:0000:0000, -1
Error 0000:0000:0000, Error 6HU1:12H1:0000, 1
""")
Error 6HU1:12H1:0000, Error 6HU1:12H1:0000, 0
Error 0000:0000:0000, Error 0000:0000:0000, 0
Error 6HU1:12H1:0000, Error 0000:0000:0000, -1
Error 0000:0000:0000, Error 6HU1:12H1:0000, 1
""")
public void testCompareSecondLevelMatch(String leftTitle, String rightTitle, int expectedResult) {
Mockito.when(errorCode.methodCode()).thenReturn("6HU1");
Mockito.when(errorCode.rootCauseCode()).thenReturn("12H1");
var left = createErrorDiscussion(leftTitle, 0, null);
var right = createErrorDiscussion(rightTitle, 0,null);
int result = errorController.compareSecondLevelMatch(left,right);
var right = createErrorDiscussion(rightTitle, 0, null);
int result = errorController.compareSecondLevelMatch(left, right);
Assertions.assertEquals(expectedResult, result);
}
@ParameterizedTest
@CsvSource(textBlock = """
Error 6HU1:0000:0000, Error 6HU1:0000:0000, 0
Error 0000:0000:0000, Error 0000:0000:0000, 0
Error 6HU1:0000:0000, Error 0000:0000:0000, -1
Error 0000:0000:0000, Error 6HU1:0000:0000, 1
""")
Error 6HU1:0000:0000, Error 6HU1:0000:0000, 0
Error 0000:0000:0000, Error 0000:0000:0000, 0
Error 6HU1:0000:0000, Error 0000:0000:0000, -1
Error 0000:0000:0000, Error 6HU1:0000:0000, 1
""")
public void testCompareThirdLevelMatch(String leftTitle, String rightTitle, int expectedResult) {
Mockito.when(errorCode.methodCode()).thenReturn("6HU1");
var left = createErrorDiscussion(leftTitle, 0, null);
var right = createErrorDiscussion(rightTitle, 0,null);
int result = errorController.compareThirdLevelMatch(left,right);
var right = createErrorDiscussion(rightTitle, 0, null);
int result = errorController.compareThirdLevelMatch(left, right);
Assertions.assertEquals(expectedResult, result);
}
@ParameterizedTest
@CsvSource(textBlock = """
Error 6HU1:0000:0000, true
Error 0000:0000:0000, false
""")
Error 6HU1:0000:0000, true
Error 0000:0000:0000, false
""")
public void testIsPartialMatchFilter(String title, boolean expectedResult) {
Mockito.when(errorCode.methodCode()).thenReturn("6HU1");
var ed = createErrorDiscussion(title, 0, null);