diff --git a/pom.xml b/pom.xml
index 12f1ff59..bb84f677 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,7 +34,7 @@
8.0.22
1.7.30
- 4.13.1
+ 5.7.0
1.3.2
3.0.7
diff --git a/xxl-job-admin/src/test/java/com/xxl/job/admin/controller/AbstractSpringMvcTest.java b/xxl-job-admin/src/test/java/com/xxl/job/admin/controller/AbstractSpringMvcTest.java
index b8cb6898..0d7b98f2 100644
--- a/xxl-job-admin/src/test/java/com/xxl/job/admin/controller/AbstractSpringMvcTest.java
+++ b/xxl-job-admin/src/test/java/com/xxl/job/admin/controller/AbstractSpringMvcTest.java
@@ -1,18 +1,12 @@
package com.xxl.job.admin.controller;
-import org.junit.Before;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.test.context.junit4.SpringRunner;
-import org.springframework.test.context.web.WebAppConfiguration;
import org.springframework.test.web.servlet.MockMvc;
import org.springframework.test.web.servlet.setup.MockMvcBuilders;
import org.springframework.web.context.WebApplicationContext;
-@RunWith(SpringRunner.class)
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
public class AbstractSpringMvcTest {
@@ -20,7 +14,7 @@ public class AbstractSpringMvcTest {
private WebApplicationContext applicationContext;
protected MockMvc mockMvc;
- @Before
+ @BeforeEach
public void setup() {
this.mockMvc = MockMvcBuilders.webAppContextSetup(this.applicationContext).build();
}
diff --git a/xxl-job-admin/src/test/java/com/xxl/job/admin/controller/JobInfoControllerTest.java b/xxl-job-admin/src/test/java/com/xxl/job/admin/controller/JobInfoControllerTest.java
index bec3f11c..a8231cbe 100644
--- a/xxl-job-admin/src/test/java/com/xxl/job/admin/controller/JobInfoControllerTest.java
+++ b/xxl-job-admin/src/test/java/com/xxl/job/admin/controller/JobInfoControllerTest.java
@@ -1,8 +1,8 @@
package com.xxl.job.admin.controller;
import com.xxl.job.admin.service.LoginService;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.springframework.http.MediaType;
import org.springframework.test.web.servlet.MvcResult;
import org.springframework.util.LinkedMultiValueMap;
@@ -16,7 +16,7 @@ public class JobInfoControllerTest extends AbstractSpringMvcTest {
private Cookie cookie;
- @Before
+ @BeforeEach
public void login() throws Exception {
MvcResult ret = mockMvc.perform(
post("/login")
@@ -31,6 +31,7 @@ public class JobInfoControllerTest extends AbstractSpringMvcTest {
public void testAdd() throws Exception {
MultiValueMap parameters = new LinkedMultiValueMap();
parameters.add("jobGroup", "1");
+ parameters.add("triggerStatus", "-1");
MvcResult ret = mockMvc.perform(
post("/jobinfo/pageList")
diff --git a/xxl-job-admin/src/test/java/com/xxl/job/admin/core/util/JacksonUtilTest.java b/xxl-job-admin/src/test/java/com/xxl/job/admin/core/util/JacksonUtilTest.java
index c8005d84..34fb9d44 100644
--- a/xxl-job-admin/src/test/java/com/xxl/job/admin/core/util/JacksonUtilTest.java
+++ b/xxl-job-admin/src/test/java/com/xxl/job/admin/core/util/JacksonUtilTest.java
@@ -1,14 +1,12 @@
package com.xxl.job.admin.core.util;
-import org.hamcrest.core.Is;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import java.util.HashMap;
import java.util.Map;
import static com.xxl.job.admin.core.util.JacksonUtil.writeValueAsString;
-import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class JacksonUtilTest {
@@ -23,7 +21,7 @@ public class JacksonUtilTest {
String json = writeValueAsString(map);
//then
- assertThat(json, is("{\"aaa\":\"111\",\"bbb\":\"222\"}"));
+ assertEquals(json, "{\"aaa\":\"111\",\"bbb\":\"222\"}");
}
@Test
@@ -35,8 +33,8 @@ public class JacksonUtilTest {
Map result = JacksonUtil.readValue(jsonString, Map.class);
//then
- assertThat(result.get("aaa"), Is.