test: 测试代码改用JDK8兼容写法(List.of/String.repeat),可在JDK8下编译运行

fix/exam-question-access-material-excel-delete-draft
chenyuan 5 days ago
parent 78bb701e53
commit 8d7a4fdaab

@ -34,7 +34,7 @@ class SchoolDefaultTaskControllerTest {
ready.setStatus("READY");
when(service.getInitialization("school-1")).thenReturn(ready);
controller.replace(List.of(task("学校默认任务")), requestFor("teacher-1", "school-1"));
controller.replace(java.util.Arrays.asList(task("学校默认任务")), requestFor("teacher-1", "school-1"));
verify(service).replaceSchoolDefault(eq("school-1"), anyList());
}
@ -47,7 +47,7 @@ class SchoolDefaultTaskControllerTest {
when(userinfoMapper.selectByPrimaryKey("teacher-2")).thenReturn(teacher("teacher-2", "school-1", false));
assertThrows(UnAuthorizedException.class,
() -> controller.replace(List.of(task("学校默认任务")), requestFor("teacher-2", "school-1")));
() -> controller.replace(java.util.Arrays.asList(task("学校默认任务")), requestFor("teacher-2", "school-1")));
}
private Userinfo teacher(String userId, String schoolId, boolean teacherAdmin) {

@ -91,11 +91,11 @@ class TaskAllocationControllerTest {
ReflectionTestUtils.setField(controller, "schoolDefaultTaskService", defaultTaskService);
TaskAllocation allocation = new TaskAllocation();
allocation.setModule("学校默认任务");
when(defaultTaskService.resolveForTeachingClass("teaching-1")).thenReturn(List.of(allocation));
when(defaultTaskService.resolveForTeachingClass("teaching-1")).thenReturn(java.util.Arrays.asList(allocation));
ResultEntity<List<TaskAllocation>> result = controller.selectTaskAllocationByClassId("teaching-1");
assertEquals(List.of(allocation), result.getBody().getData());
assertEquals(java.util.Arrays.asList(allocation), result.getBody().getData());
}
private TaskAllocationController controllerWithMocks() {

@ -310,7 +310,7 @@ class AiTrainingEvaluationServiceImplTest {
void assessmentLimitsAllStepRationalesToTwoHundredCharacters() throws Exception {
AiTrainingEvaluationServiceImpl service = serviceWithContext(answer("answer-1", "step one", null, null, null));
AiTrainingEvaluation evaluation = evaluation("NOT_STARTED", "NOT_STARTED");
String longRationale = "评分依据".repeat(80);
String longRationale = String.join("", java.util.Collections.nCopies(80, "评分依据"));
String response = assessmentJson()
.replace("evidence", longRationale)
.replace("logic", longRationale)
@ -340,7 +340,7 @@ class AiTrainingEvaluationServiceImplTest {
void assessmentTruncationUsesASentenceBoundaryWhenAvailable() throws Exception {
AiTrainingEvaluationServiceImpl service = serviceWithContext(answer("answer-1", "step one", null, null, null));
AiTrainingEvaluation evaluation = evaluation("NOT_STARTED", "NOT_STARTED");
String response = assessmentJson().replace("evidence", "第一句说明问题。第二句非常长" + "内容".repeat(80));
String response = assessmentJson().replace("evidence", "第一句说明问题。第二句非常长" + String.join("", java.util.Collections.nCopies(80, "内容")));
when(service.aiTrainingEvaluationMapper.findByStudentClassAndTask("stu-1", "class-1", "task-1"))
.thenReturn(null, evaluation);
when(service.aiTrainingEvaluationMapper.claimAssessment(eq("evaluation-1"), any(Date.class))).thenReturn(1);

@ -32,11 +32,11 @@ class SchoolDefaultTaskServiceImplTest {
schoolClass.setClassType("TEACHING");
when(classMapper.selectByPrimaryKey("class-1")).thenReturn(schoolClass);
when(taskMapper.selectByExample(any())).thenReturn(
Collections.emptyList(), List.of(task("学校默认任务")), List.of(task("平台默认任务")));
Collections.emptyList(), java.util.Arrays.asList(task("学校默认任务")), java.util.Arrays.asList(task("平台默认任务")));
List<TaskAllocation> result = service.resolveForTeachingClass("class-1");
assertEquals(List.of("学校默认任务"), result.stream().map(TaskAllocation::getModule).collect(java.util.stream.Collectors.toList()));
assertEquals(java.util.Arrays.asList("学校默认任务"), result.stream().map(TaskAllocation::getModule).collect(java.util.stream.Collectors.toList()));
verify(taskMapper, never()).insert(any());
}

@ -67,8 +67,8 @@ class TrainingTaskServiceImplTest {
TrainingTaskClassConfig teacherConfig = overrideTask("config-1", "class-1", "new-product-survey");
teacherConfig.setMaterialName("教师案例.docx");
teacherConfig.setMaterialUrl("/file/teacher-case.docx");
when(service.trainingTaskMapper.selectList(null, null, null)).thenReturn(List.of(task));
when(service.trainingTaskClassConfigMapper.selectAll()).thenReturn(List.of(teacherConfig));
when(service.trainingTaskMapper.selectList(null, null, null)).thenReturn(java.util.Arrays.asList(task));
when(service.trainingTaskClassConfigMapper.selectAll()).thenReturn(java.util.Arrays.asList(teacherConfig));
int indexed = service.reindexCaseMaterials();
@ -205,7 +205,7 @@ class TrainingTaskServiceImplTest {
SchoolClass defaultClass = teachingClass("class-default", "teacher-1");
SchoolClass customizedClass = teachingClass("class-customized", "teacher-2");
when(service.schoolClassMapper.selectByExample(any())).thenReturn(List.of(defaultClass, customizedClass));
when(service.schoolClassMapper.selectByExample(any())).thenReturn(java.util.Arrays.asList(defaultClass, customizedClass));
TrainingTaskClassConfig defaultConfig = overrideTask("config-default", "class-default", "new-product-survey");
defaultConfig.setTaskName("Original Name");
@ -750,15 +750,15 @@ class TrainingTaskServiceImplTest {
TrainingTaskServiceImpl service = studentTaskService("class-1");
TrainingTask legacy = storedTask("task-1", "new-product-survey");
TrainingTask comprehensive = comprehensiveTrainingTask();
when(service.trainingTaskMapper.selectList(null, null, null)).thenReturn(List.of(legacy, comprehensive));
when(service.trainingTaskMapper.selectList(null, null, null)).thenReturn(java.util.Arrays.asList(legacy, comprehensive));
when(service.trainingTaskClassConfigMapper.selectListByTeachingClass("class-1", null))
.thenReturn(List.of(overrideTask("config-1", "class-1", "new-product-survey"),
.thenReturn(java.util.Arrays.asList(overrideTask("config-1", "class-1", "new-product-survey"),
overrideTask("config-2", "class-1", "comprehensive-case-training")));
when(service.taskAllocationMapper.selectByExample(any())).thenReturn(Collections.emptyList());
List<TrainingTask> result = service.listForStudent("stu-1", true);
assertEquals(List.of("new-product-survey"), result.stream()
assertEquals(java.util.Arrays.asList("new-product-survey"), result.stream()
.map(TrainingTask::getTaskKey)
.collect(java.util.stream.Collectors.toList()));
}
@ -782,7 +782,7 @@ class TrainingTaskServiceImplTest {
when(service.trainingTaskMapper.selectByTaskKey("comprehensive-case-training")).thenReturn(comprehensive);
when(service.trainingTaskClassConfigMapper.selectByTeachingClassAndTaskKey("class-1", "comprehensive-case-training"))
.thenReturn(overrideTask("config-1", "class-1", "comprehensive-case-training"));
when(service.taskAllocationMapper.selectByExample(any())).thenReturn(List.of(
when(service.taskAllocationMapper.selectByExample(any())).thenReturn(java.util.Arrays.asList(
taskAllocation(TaskAllocation.PUBLICATION_MARKER, (byte) 1),
taskAllocation("comprehensive-case-training", (byte) 0)));
@ -800,7 +800,7 @@ class TrainingTaskServiceImplTest {
disabled.setEnabled(Boolean.FALSE);
when(service.trainingTaskClassConfigMapper.selectByTeachingClassAndTaskKey("class-1", "comprehensive-case-training"))
.thenReturn(disabled);
when(service.taskAllocationMapper.selectByExample(any())).thenReturn(List.of(
when(service.taskAllocationMapper.selectByExample(any())).thenReturn(java.util.Arrays.asList(
taskAllocation(TaskAllocation.PUBLICATION_MARKER, (byte) 1),
taskAllocation("comprehensive-case-training", (byte) 0)));
@ -814,18 +814,18 @@ class TrainingTaskServiceImplTest {
TrainingTaskServiceImpl service = studentTaskService("class-1");
TrainingTask legacy = storedTask("task-1", "new-product-survey");
TrainingTask comprehensive = comprehensiveTrainingTask();
when(service.trainingTaskMapper.selectList(null, null, null)).thenReturn(List.of(legacy, comprehensive));
when(service.trainingTaskMapper.selectList(null, null, null)).thenReturn(java.util.Arrays.asList(legacy, comprehensive));
when(service.trainingTaskClassConfigMapper.selectListByTeachingClass("class-1", null))
.thenReturn(List.of(overrideTask("config-1", "class-1", "new-product-survey"),
.thenReturn(java.util.Arrays.asList(overrideTask("config-1", "class-1", "new-product-survey"),
overrideTask("config-2", "class-1", "comprehensive-case-training")));
when(service.taskAllocationMapper.selectByExample(any())).thenReturn(List.of(
when(service.taskAllocationMapper.selectByExample(any())).thenReturn(java.util.Arrays.asList(
taskAllocation(TaskAllocation.PUBLICATION_MARKER, (byte) 1),
taskAllocation("new-product-survey", (byte) 0),
taskAllocation("comprehensive-case-training", (byte) 0)));
List<TrainingTask> result = service.listForStudent("stu-1", true);
assertEquals(List.of("new-product-survey", "comprehensive-case-training"), result.stream()
assertEquals(java.util.Arrays.asList("new-product-survey", "comprehensive-case-training"), result.stream()
.map(TrainingTask::getTaskKey)
.collect(java.util.stream.Collectors.toList()));
}
@ -835,17 +835,17 @@ class TrainingTaskServiceImplTest {
TrainingTaskServiceImpl service = studentTaskService("class-1");
TrainingTask legacy = storedTask("task-1", "new-product-survey");
TrainingTask comprehensive = comprehensiveTrainingTask();
when(service.trainingTaskMapper.selectList(null, null, null)).thenReturn(List.of(legacy, comprehensive));
when(service.trainingTaskMapper.selectList(null, null, null)).thenReturn(java.util.Arrays.asList(legacy, comprehensive));
when(service.trainingTaskClassConfigMapper.selectListByTeachingClass("class-1", null))
.thenReturn(List.of(overrideTask("config-1", "class-1", "new-product-survey"),
.thenReturn(java.util.Arrays.asList(overrideTask("config-1", "class-1", "new-product-survey"),
overrideTask("config-2", "class-1", "comprehensive-case-training")));
when(service.taskAllocationMapper.selectByExample(any())).thenReturn(List.of(
when(service.taskAllocationMapper.selectByExample(any())).thenReturn(java.util.Arrays.asList(
taskAllocation(TaskAllocation.PUBLICATION_MARKER, (byte) 1),
taskAllocation("new-product-survey", (byte) 0)));
List<TrainingTask> result = service.listForStudent("stu-1", true);
assertEquals(List.of("new-product-survey"), result.stream()
assertEquals(java.util.Arrays.asList("new-product-survey"), result.stream()
.map(TrainingTask::getTaskKey)
.collect(java.util.stream.Collectors.toList()));
}
@ -855,18 +855,18 @@ class TrainingTaskServiceImplTest {
TrainingTaskServiceImpl service = studentTaskService("class-1");
TrainingTask legacy = storedTask("task-1", "new-product-survey");
TrainingTask comprehensive = comprehensiveTrainingTask();
when(service.trainingTaskMapper.selectList(null, null, null)).thenReturn(List.of(legacy, comprehensive));
when(service.trainingTaskMapper.selectList(null, null, null)).thenReturn(java.util.Arrays.asList(legacy, comprehensive));
when(service.trainingTaskClassConfigMapper.selectListByTeachingClass("class-1", null))
.thenReturn(List.of(overrideTask("config-1", "class-1", "new-product-survey"),
.thenReturn(java.util.Arrays.asList(overrideTask("config-1", "class-1", "new-product-survey"),
overrideTask("config-2", "class-1", "comprehensive-case-training")));
when(service.taskAllocationMapper.selectByExample(any())).thenReturn(List.of(
when(service.taskAllocationMapper.selectByExample(any())).thenReturn(java.util.Arrays.asList(
taskAllocation(TaskAllocation.PUBLICATION_MARKER, (byte) 1),
taskAllocation("new-product-survey", (byte) 0),
taskAllocation("comprehensive-case-training", (byte) 1)));
List<TrainingTask> result = service.listForStudent("stu-1", true);
assertEquals(List.of("new-product-survey"), result.stream()
assertEquals(java.util.Arrays.asList("new-product-survey"), result.stream()
.map(TrainingTask::getTaskKey)
.collect(java.util.stream.Collectors.toList()));
}
@ -876,19 +876,19 @@ class TrainingTaskServiceImplTest {
TrainingTaskServiceImpl service = studentTaskService("class-1");
TrainingTask legacy = storedTask("task-1", "new-product-survey");
TrainingTask comprehensive = comprehensiveTrainingTask();
when(service.trainingTaskMapper.selectList(null, null, null)).thenReturn(List.of(legacy, comprehensive));
when(service.trainingTaskMapper.selectList(null, null, null)).thenReturn(java.util.Arrays.asList(legacy, comprehensive));
TrainingTaskClassConfig disabled = overrideTask("config-2", "class-1", "comprehensive-case-training");
disabled.setEnabled(Boolean.FALSE);
when(service.trainingTaskClassConfigMapper.selectListByTeachingClass("class-1", null))
.thenReturn(List.of(overrideTask("config-1", "class-1", "new-product-survey"), disabled));
when(service.taskAllocationMapper.selectByExample(any())).thenReturn(List.of(
.thenReturn(java.util.Arrays.asList(overrideTask("config-1", "class-1", "new-product-survey"), disabled));
when(service.taskAllocationMapper.selectByExample(any())).thenReturn(java.util.Arrays.asList(
taskAllocation(TaskAllocation.PUBLICATION_MARKER, (byte) 1),
taskAllocation("new-product-survey", (byte) 0),
taskAllocation("comprehensive-case-training", (byte) 0)));
List<TrainingTask> result = service.listForStudent("stu-1", false);
assertEquals(List.of("new-product-survey"), result.stream()
assertEquals(java.util.Arrays.asList("new-product-survey"), result.stream()
.map(TrainingTask::getTaskKey)
.collect(java.util.stream.Collectors.toList()));
}
@ -900,7 +900,7 @@ class TrainingTaskServiceImplTest {
service.trainingTaskClassConfigMapper = mock(TrainingTaskClassConfigMapper.class);
service.schoolClassMapper = mock(SchoolClassMapper.class);
TrainingTask comprehensive = comprehensiveTrainingTask();
when(service.trainingTaskMapper.selectList(null, null, null)).thenReturn(List.of(comprehensive));
when(service.trainingTaskMapper.selectList(null, null, null)).thenReturn(java.util.Arrays.asList(comprehensive));
when(service.trainingTaskClassConfigMapper.selectListByTeachingClass("class-1", null)).thenReturn(Collections.emptyList());
SchoolClass schoolClass = teachingClass("class-1", "teacher-1");
schoolClass.setSchoolId("school-1");
@ -911,7 +911,7 @@ class TrainingTaskServiceImplTest {
List<TrainingTask> result = service.listForTeachingClass("class-1", true, teacher);
assertEquals(List.of("comprehensive-case-training"), result.stream()
assertEquals(java.util.Arrays.asList("comprehensive-case-training"), result.stream()
.map(TrainingTask::getTaskKey)
.collect(java.util.stream.Collectors.toList()));
}

Loading…
Cancel
Save