From 8ea3c390986ca4fb335c9c4d52ad916a1883908b Mon Sep 17 00:00:00 2001 From: "xueli.xue" Date: Fri, 4 Dec 2020 17:45:55 +0800 Subject: [PATCH] Junit upgrade --- pom.xml | 2 +- .../controller/AbstractSpringMvcTest.java | 10 ++---- .../controller/JobInfoControllerTest.java | 7 ++-- .../job/admin/core/util/JacksonUtilTest.java | 12 +++---- .../xxl/job/admin/dao/XxlJobGroupDaoTest.java | 5 +-- .../xxl/job/admin/dao/XxlJobInfoDaoTest.java | 5 +-- .../xxl/job/admin/dao/XxlJobLogDaoTest.java | 5 +-- .../job/admin/dao/XxlJobLogGlueDaoTest.java | 5 +-- .../job/admin/dao/XxlJobRegistryDaoTest.java | 5 +-- .../com/xxl/job/admin/util/I18nUtilTest.java | 7 +--- .../com/xxl/job/adminbiz/AdminBizTest.java | 11 ++++--- .../xxl/job/executorbiz/ExecutorBizTest.java | 32 +++++++++---------- xxl-job-core/pom.xml | 4 +-- .../xxl-job-executor-sample-frameless/pom.xml | 7 ++++ .../test/FramelessApplicationTest.java | 12 +++++++ ...obExecutorExampleBootApplicationTests.java | 7 ++-- 16 files changed, 63 insertions(+), 73 deletions(-) create mode 100644 xxl-job-executor-samples/xxl-job-executor-sample-frameless/src/test/java/com/xxl/job/executor/sample/frameless/test/FramelessApplicationTest.java 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.is("111")); - assertThat(result.get("bbb"), Is.is("222")); + assertEquals(result.get("aaa"), "111"); + assertEquals(result.get("bbb"),"222"); } } diff --git a/xxl-job-admin/src/test/java/com/xxl/job/admin/dao/XxlJobGroupDaoTest.java b/xxl-job-admin/src/test/java/com/xxl/job/admin/dao/XxlJobGroupDaoTest.java index 6846030e..90b68a94 100644 --- a/xxl-job-admin/src/test/java/com/xxl/job/admin/dao/XxlJobGroupDaoTest.java +++ b/xxl-job-admin/src/test/java/com/xxl/job/admin/dao/XxlJobGroupDaoTest.java @@ -1,16 +1,13 @@ package com.xxl.job.admin.dao; import com.xxl.job.admin.core.model.XxlJobGroup; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; import javax.annotation.Resource; import java.util.Date; import java.util.List; -@RunWith(SpringRunner.class) @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) public class XxlJobGroupDaoTest { diff --git a/xxl-job-admin/src/test/java/com/xxl/job/admin/dao/XxlJobInfoDaoTest.java b/xxl-job-admin/src/test/java/com/xxl/job/admin/dao/XxlJobInfoDaoTest.java index 61fddd23..4fce17ec 100644 --- a/xxl-job-admin/src/test/java/com/xxl/job/admin/dao/XxlJobInfoDaoTest.java +++ b/xxl-job-admin/src/test/java/com/xxl/job/admin/dao/XxlJobInfoDaoTest.java @@ -3,16 +3,13 @@ package com.xxl.job.admin.dao; import com.xxl.job.admin.core.model.XxlJobInfo; import com.xxl.job.admin.core.scheduler.MisfireStrategyEnum; import com.xxl.job.admin.core.scheduler.ScheduleTypeEnum; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; import javax.annotation.Resource; import java.util.Date; import java.util.List; -@RunWith(SpringRunner.class) @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) public class XxlJobInfoDaoTest { diff --git a/xxl-job-admin/src/test/java/com/xxl/job/admin/dao/XxlJobLogDaoTest.java b/xxl-job-admin/src/test/java/com/xxl/job/admin/dao/XxlJobLogDaoTest.java index 94fe9c90..c5888bb2 100644 --- a/xxl-job-admin/src/test/java/com/xxl/job/admin/dao/XxlJobLogDaoTest.java +++ b/xxl-job-admin/src/test/java/com/xxl/job/admin/dao/XxlJobLogDaoTest.java @@ -1,16 +1,13 @@ package com.xxl.job.admin.dao; import com.xxl.job.admin.core.model.XxlJobLog; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; import javax.annotation.Resource; import java.util.Date; import java.util.List; -@RunWith(SpringRunner.class) @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) public class XxlJobLogDaoTest { diff --git a/xxl-job-admin/src/test/java/com/xxl/job/admin/dao/XxlJobLogGlueDaoTest.java b/xxl-job-admin/src/test/java/com/xxl/job/admin/dao/XxlJobLogGlueDaoTest.java index 5fa71eec..1e9eee33 100644 --- a/xxl-job-admin/src/test/java/com/xxl/job/admin/dao/XxlJobLogGlueDaoTest.java +++ b/xxl-job-admin/src/test/java/com/xxl/job/admin/dao/XxlJobLogGlueDaoTest.java @@ -1,16 +1,13 @@ package com.xxl.job.admin.dao; import com.xxl.job.admin.core.model.XxlJobLogGlue; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; import javax.annotation.Resource; import java.util.Date; import java.util.List; -@RunWith(SpringRunner.class) @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) public class XxlJobLogGlueDaoTest { diff --git a/xxl-job-admin/src/test/java/com/xxl/job/admin/dao/XxlJobRegistryDaoTest.java b/xxl-job-admin/src/test/java/com/xxl/job/admin/dao/XxlJobRegistryDaoTest.java index 8a514a20..5c0a15d8 100644 --- a/xxl-job-admin/src/test/java/com/xxl/job/admin/dao/XxlJobRegistryDaoTest.java +++ b/xxl-job-admin/src/test/java/com/xxl/job/admin/dao/XxlJobRegistryDaoTest.java @@ -1,17 +1,14 @@ package com.xxl.job.admin.dao; import com.xxl.job.admin.core.model.XxlJobRegistry; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; import javax.annotation.Resource; import java.util.Arrays; import java.util.Date; import java.util.List; -@RunWith(SpringRunner.class) @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) public class XxlJobRegistryDaoTest { diff --git a/xxl-job-admin/src/test/java/com/xxl/job/admin/util/I18nUtilTest.java b/xxl-job-admin/src/test/java/com/xxl/job/admin/util/I18nUtilTest.java index 9d36e7f8..a62541f7 100644 --- a/xxl-job-admin/src/test/java/com/xxl/job/admin/util/I18nUtilTest.java +++ b/xxl-job-admin/src/test/java/com/xxl/job/admin/util/I18nUtilTest.java @@ -1,19 +1,14 @@ package com.xxl.job.admin.util; import com.xxl.job.admin.core.util.I18nUtil; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; 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; /** * email util test * * @author xuxueli 2017-12-22 17:16:23 */ -@RunWith(SpringRunner.class) @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) public class I18nUtilTest { diff --git a/xxl-job-admin/src/test/java/com/xxl/job/adminbiz/AdminBizTest.java b/xxl-job-admin/src/test/java/com/xxl/job/adminbiz/AdminBizTest.java index 97e234a0..c33c6364 100644 --- a/xxl-job-admin/src/test/java/com/xxl/job/adminbiz/AdminBizTest.java +++ b/xxl-job-admin/src/test/java/com/xxl/job/adminbiz/AdminBizTest.java @@ -7,12 +7,13 @@ import com.xxl.job.core.biz.model.RegistryParam; import com.xxl.job.core.biz.model.ReturnT; import com.xxl.job.core.context.XxlJobContext; import com.xxl.job.core.enums.RegistryConfig; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Arrays; import java.util.List; +import static org.junit.jupiter.api.Assertions.assertTrue; + /** * admin api test * @@ -37,7 +38,7 @@ public class AdminBizTest { ReturnT returnT = adminBiz.callback(callbackParamList); - Assert.assertTrue(returnT.getCode() == ReturnT.SUCCESS_CODE); + assertTrue(returnT.getCode() == ReturnT.SUCCESS_CODE); } /** @@ -52,7 +53,7 @@ public class AdminBizTest { RegistryParam registryParam = new RegistryParam(RegistryConfig.RegistType.EXECUTOR.name(), "xxl-job-executor-example", "127.0.0.1:9999"); ReturnT returnT = adminBiz.registry(registryParam); - Assert.assertTrue(returnT.getCode() == ReturnT.SUCCESS_CODE); + assertTrue(returnT.getCode() == ReturnT.SUCCESS_CODE); } /** @@ -67,7 +68,7 @@ public class AdminBizTest { RegistryParam registryParam = new RegistryParam(RegistryConfig.RegistType.EXECUTOR.name(), "xxl-job-executor-example", "127.0.0.1:9999"); ReturnT returnT = adminBiz.registryRemove(registryParam); - Assert.assertTrue(returnT.getCode() == ReturnT.SUCCESS_CODE); + assertTrue(returnT.getCode() == ReturnT.SUCCESS_CODE); } diff --git a/xxl-job-admin/src/test/java/com/xxl/job/executorbiz/ExecutorBizTest.java b/xxl-job-admin/src/test/java/com/xxl/job/executorbiz/ExecutorBizTest.java index 746a7080..4facb89f 100644 --- a/xxl-job-admin/src/test/java/com/xxl/job/executorbiz/ExecutorBizTest.java +++ b/xxl-job-admin/src/test/java/com/xxl/job/executorbiz/ExecutorBizTest.java @@ -5,8 +5,8 @@ import com.xxl.job.core.biz.client.ExecutorBizClient; import com.xxl.job.core.biz.model.*; import com.xxl.job.core.enums.ExecutorBlockStrategyEnum; import com.xxl.job.core.glue.GlueTypeEnum; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; /** * executor api test @@ -26,10 +26,10 @@ public class ExecutorBizTest { final ReturnT retval = executorBiz.beat(); // Assert result - Assert.assertNotNull(retval); - Assert.assertNull(((ReturnT) retval).getContent()); - Assert.assertEquals(200, retval.getCode()); - Assert.assertNull(retval.getMsg()); + Assertions.assertNotNull(retval); + Assertions.assertNull(((ReturnT) retval).getContent()); + Assertions.assertEquals(200, retval.getCode()); + Assertions.assertNull(retval.getMsg()); } @Test @@ -42,10 +42,10 @@ public class ExecutorBizTest { final ReturnT retval = executorBiz.idleBeat(new IdleBeatParam(jobId)); // Assert result - Assert.assertNotNull(retval); - Assert.assertNull(((ReturnT) retval).getContent()); - Assert.assertEquals(500, retval.getCode()); - Assert.assertEquals("job thread is running or has trigger queue.", retval.getMsg()); + Assertions.assertNotNull(retval); + Assertions.assertNull(((ReturnT) retval).getContent()); + Assertions.assertEquals(500, retval.getCode()); + Assertions.assertEquals("job thread is running or has trigger queue.", retval.getMsg()); } @Test @@ -68,7 +68,7 @@ public class ExecutorBizTest { final ReturnT retval = executorBiz.run(triggerParam); // Assert result - Assert.assertNotNull(retval); + Assertions.assertNotNull(retval); } @Test @@ -81,10 +81,10 @@ public class ExecutorBizTest { final ReturnT retval = executorBiz.kill(new KillParam(jobId)); // Assert result - Assert.assertNotNull(retval); - Assert.assertNull(((ReturnT) retval).getContent()); - Assert.assertEquals(200, retval.getCode()); - Assert.assertNull(retval.getMsg()); + Assertions.assertNotNull(retval); + Assertions.assertNull(((ReturnT) retval).getContent()); + Assertions.assertEquals(200, retval.getCode()); + Assertions.assertNull(retval.getMsg()); } @Test @@ -99,7 +99,7 @@ public class ExecutorBizTest { final ReturnT retval = executorBiz.log(new LogParam(logDateTim, logId, fromLineNum)); // Assert result - Assert.assertNotNull(retval); + Assertions.assertNotNull(retval); } } diff --git a/xxl-job-core/pom.xml b/xxl-job-core/pom.xml index 9b8fa0cd..2187e17c 100644 --- a/xxl-job-core/pom.xml +++ b/xxl-job-core/pom.xml @@ -58,8 +58,8 @@ - junit - junit + org.junit.jupiter + junit-jupiter-engine ${junit.version} test diff --git a/xxl-job-executor-samples/xxl-job-executor-sample-frameless/pom.xml b/xxl-job-executor-samples/xxl-job-executor-sample-frameless/pom.xml index 98a15a86..353114ea 100644 --- a/xxl-job-executor-samples/xxl-job-executor-sample-frameless/pom.xml +++ b/xxl-job-executor-samples/xxl-job-executor-sample-frameless/pom.xml @@ -24,6 +24,13 @@ slf4j-log4j12 ${slf4j-api.version} + + + org.junit.jupiter + junit-jupiter-engine + ${junit.version} + test + diff --git a/xxl-job-executor-samples/xxl-job-executor-sample-frameless/src/test/java/com/xxl/job/executor/sample/frameless/test/FramelessApplicationTest.java b/xxl-job-executor-samples/xxl-job-executor-sample-frameless/src/test/java/com/xxl/job/executor/sample/frameless/test/FramelessApplicationTest.java new file mode 100644 index 00000000..1f9be9a9 --- /dev/null +++ b/xxl-job-executor-samples/xxl-job-executor-sample-frameless/src/test/java/com/xxl/job/executor/sample/frameless/test/FramelessApplicationTest.java @@ -0,0 +1,12 @@ +package com.xxl.job.executor.sample.frameless.test; + +import org.junit.jupiter.api.Test; + +public class FramelessApplicationTest { + + @Test + public void test(){ + System.out.println("111"); + } + +} diff --git a/xxl-job-executor-samples/xxl-job-executor-sample-springboot/src/test/java/com/xxl/job/executor/test/XxlJobExecutorExampleBootApplicationTests.java b/xxl-job-executor-samples/xxl-job-executor-sample-springboot/src/test/java/com/xxl/job/executor/test/XxlJobExecutorExampleBootApplicationTests.java index fdccb3b7..456a7d5a 100644 --- a/xxl-job-executor-samples/xxl-job-executor-sample-springboot/src/test/java/com/xxl/job/executor/test/XxlJobExecutorExampleBootApplicationTests.java +++ b/xxl-job-executor-samples/xxl-job-executor-sample-springboot/src/test/java/com/xxl/job/executor/test/XxlJobExecutorExampleBootApplicationTests.java @@ -1,17 +1,14 @@ package com.xxl.job.executor.test; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; -@RunWith(SpringRunner.class) @SpringBootTest public class XxlJobExecutorExampleBootApplicationTests { @Test public void test() { - + System.out.println(11); } } \ No newline at end of file