1. 新增数据源oracle,已在application.yml中配置
2. 新增任务状态类,未来将在切换任务状态中使用 3. 新增ProtectLevel实体类,用来存储Template对应的三种防护等级数据 4. Task实体类中删除protectObjectIds,因为MySQL表结构发生修改 5. TaskController新增audit和delete路由,用以审核和删除Task 6. TemplateMapper新增newProtectLevel方法 7.
This commit is contained in:
@@ -1,5 +1,6 @@
|
||||
package com.realtime.protection.server.defense.template;
|
||||
|
||||
import com.realtime.protection.configuration.entity.defense.template.ProtectLevel;
|
||||
import com.realtime.protection.configuration.entity.defense.template.Template;
|
||||
import org.junit.jupiter.api.BeforeEach;
|
||||
import org.junit.jupiter.api.Test;
|
||||
@@ -23,26 +24,36 @@ class TemplateServiceTest {
|
||||
|
||||
@BeforeEach
|
||||
void mockTemplate() {
|
||||
|
||||
template = new Template();
|
||||
|
||||
template.setTemplateName("反射型DDOS攻击");
|
||||
template.setTemplateElements(List.of("对端IP", "协议", "URL"));
|
||||
template.setDefaultOp("阻断");
|
||||
template.setSourceSystem("xxxx系统");
|
||||
|
||||
ProtectLevel protectLevelLow = new ProtectLevel();
|
||||
protectLevelLow.setHasPeerPort(true);
|
||||
|
||||
ProtectLevel protectLevelMedium = new ProtectLevel();
|
||||
protectLevelMedium.setHasProtectObjectIP(true);
|
||||
|
||||
ProtectLevel protectLevelHigh = new ProtectLevel();
|
||||
protectLevelHigh.setHasDNS(true);
|
||||
|
||||
template.setProtectLevelLow(protectLevelLow);
|
||||
template.setProtectLevelMedium(protectLevelMedium);
|
||||
template.setProtectLevelHigh(protectLevelHigh);
|
||||
}
|
||||
|
||||
@Test
|
||||
void testNewTemplateSuccess() {
|
||||
void testNewTemplate() {
|
||||
Integer templateId = templateService.newTemplate(template);
|
||||
assertTrue(templateId > 0);
|
||||
}
|
||||
|
||||
@Test
|
||||
void testNewTemplateIllegalArgument() {
|
||||
template.setTemplateElements(List.of("DDNS"));
|
||||
assertThrows(IllegalArgumentException.class, () -> {
|
||||
Integer templateId = templateService.newTemplate(template);
|
||||
assertTrue(templateId > 0);
|
||||
});
|
||||
void testQueryTemplate() {
|
||||
List<Template> templates = templateService.queryTemplates("DDOS", 1, 5);
|
||||
System.out.println(templates);
|
||||
}
|
||||
|
||||
@Test
|
||||
|
||||
@@ -38,13 +38,13 @@ class TaskServiceTest {
|
||||
task.setDynamicRuleIds(List.of());
|
||||
task.setTaskCreateUserId(1);
|
||||
task.setTaskCreateUsername("xxx");
|
||||
task.setTaskCreateDepart("xxx");
|
||||
task.setProtectObjectIds(List.of(1));
|
||||
task.setTaskCreateDepart("xxx");;
|
||||
}
|
||||
|
||||
@Test
|
||||
void testNewTaskSuccess() {
|
||||
assertDoesNotThrow(() -> {Integer taskId = taskService.newTask(task); assertTrue(taskId > 0);});
|
||||
assertTrue(task.getTaskId() > 0);
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -58,8 +58,36 @@ class TaskServiceTest {
|
||||
|
||||
@Test
|
||||
void testQueryTasks() {
|
||||
List<Task> tasks = taskService.queryTasks(null, null, null, null, 1, 5);
|
||||
assertEquals(5, tasks.size());
|
||||
List<Task> tasks = taskService.queryTasks(null, null, null, null, 1, 10);
|
||||
assertTrue(tasks.get(0).getTaskId() > 0);
|
||||
}
|
||||
|
||||
@Test
|
||||
void testUpdateTasks() {
|
||||
task.setStaticRuleIds(List.of(6, 7, 8));
|
||||
task.setTaskId(26);
|
||||
task.setTaskName("修改测试");
|
||||
|
||||
assertTrue(taskService.updateTask(task));
|
||||
assertEquals("修改测试", taskService.queryTask(26).getTaskName());
|
||||
}
|
||||
|
||||
@Test
|
||||
void testDeleteTask() {
|
||||
int testNum = taskService.queryTasks(null, null, null, null, 1, 10)
|
||||
.get(0).getTaskId();
|
||||
|
||||
assertTrue(taskService.deleteTask(testNum));
|
||||
assertFalse(taskService.deleteTask(235235));
|
||||
}
|
||||
|
||||
@Test
|
||||
void testChangeAuditStatus() {
|
||||
int testNum = taskService.queryTasks(null, null, null, null, 1, 1)
|
||||
.get(0).getTaskId();
|
||||
|
||||
assertTrue(taskService.changeTaskAuditStatus(testNum, 2));
|
||||
assertFalse(taskService.changeTaskAuditStatus(testNum, 0));
|
||||
assertFalse(taskService.changeTaskAuditStatus(testNum, 1));
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user