Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/com/realtime/protection/server/rule/dynamicrule/DynamicRuleControllerApi.java
#	src/main/java/com/realtime/protection/server/rule/dynamicrule/DynamicRuleService.java
#	src/main/java/com/realtime/protection/server/rule/staticrule/StaticRuleControllerApi.java
#	src/main/resources/mappers/StaticRuleMapper.xml
#	src/test/java/com/realtime/protection/server/rule/dynamic/DynamicRuleServiceTest.java
#	src/test/java/com/realtime/protection/server/rule/staticrule/StaticRuleServiceTest.java
This commit is contained in:
Hao Miao
2024-01-15 18:16:52 +08:00
26 changed files with 144 additions and 123 deletions

View File

@@ -94,7 +94,7 @@ class TemplateServiceTest {
void testUpdateTemplateSuccess() {
List<Template> templates = templateService.queryTemplates("DDOS", 1, 1);
Template testTemplate = templates.get(0);
testTemplate.setTemplateName("洪泛型DDOS攻击-"+LocalDateTime.now());
testTemplate.setTemplateName("洪泛型DDOS攻击-" + LocalDateTime.now());
assertTrue(templateService.updateTemplate(testTemplate.getTemplateId(), testTemplate));
}

View File

@@ -44,12 +44,15 @@ class TaskServiceTest {
@Test
void testNewTaskSuccess() {
for (int i = 0; i < 100; i++){
for (int i = 0; i < 100; i++) {
LocalDateTime taskStartTime = LocalDateTime.now().plusDays(i);
LocalDateTime taskEndTime = LocalDateTime.now().plusDays(i+10);
LocalDateTime taskEndTime = LocalDateTime.now().plusDays(i + 10);
task.setTaskStartTime(taskStartTime);
task.setTaskEndTime(taskEndTime);
assertDoesNotThrow(() -> {Long taskId = taskService.newTask(task); assertTrue(taskId > 0);});
assertDoesNotThrow(() -> {
Long taskId = taskService.newTask(task);
assertTrue(taskId > 0);
});
assertTrue(task.getTaskId() > 0);
}
}
@@ -82,7 +85,7 @@ class TaskServiceTest {
@Test
void testDeleteTask() {
long testNum = taskService.queryTasks(null, null, null, null, 1, 10)
long testNum = taskService.queryTasks(null, null, null, null, 1, 10)
.get(0).getTaskId();
assertTrue(taskService.deleteTask(testNum));

View File

@@ -11,13 +11,14 @@ import org.springframework.boot.test.context.SpringBootTest;
import java.util.ArrayList;
import java.util.List;
import static org.junit.jupiter.api.Assertions.*;
import static org.junit.jupiter.api.Assertions.assertTrue;
@SpringBootTest
class WhiteListServiceTest {
private final WhiteListService whiteListService;
private WhiteListObject whiteListObject;
@Autowired
WhiteListServiceTest(WhiteListService whiteListService) {
this.whiteListService = whiteListService;
@@ -59,12 +60,12 @@ class WhiteListServiceTest {
//object.setWhiteListId(7);
object.setWhiteListName("test_update");
whiteListService.updateWhiteListObject(7,object);
whiteListService.updateWhiteListObject(7, object);
}
@Test
void testExistWhiteList() {
List<Integer> ruleIds = List.of(6,7,8);
List<Integer> ruleIds = List.of(6, 7, 8);
// List<String> ip_list = whiteListService.existWhiteListObject(ruleIds);
// System.out.println(ip_list);
}