diff --git a/examples/showcase/src/main/resources/schedule/applicationContext-quartz-cron-local.xml b/examples/showcase/src/main/resources/schedule/applicationContext-quartz-cron-local.xml index 0c756404d16d9571be85ed7ec8af31f6dff7f86c..66acb63c218fccbc42a8521aa69367902eaf7da3 100644 --- a/examples/showcase/src/main/resources/schedule/applicationContext-quartz-cron-local.xml +++ b/examples/showcase/src/main/resources/schedule/applicationContext-quartz-cron-local.xml @@ -19,8 +19,8 @@ 5 - - + + diff --git a/examples/showcase/src/test/java/org/springside/examples/showcase/demos/schedule/JdkTimerJobTest.java b/examples/showcase/src/test/java/org/springside/examples/showcase/demos/schedule/JdkTimerJobTest.java index 5d672a78fa78f435cf1a52cfe820e72026387e38..ba1fcf84b026ed90d3e2447381a54e03151c37e8 100644 --- a/examples/showcase/src/test/java/org/springside/examples/showcase/demos/schedule/JdkTimerJobTest.java +++ b/examples/showcase/src/test/java/org/springside/examples/showcase/demos/schedule/JdkTimerJobTest.java @@ -2,6 +2,8 @@ package org.springside.examples.showcase.demos.schedule; import static org.junit.Assert.*; +import org.junit.AfterClass; +import org.junit.BeforeClass; import org.junit.Test; import org.junit.experimental.categories.Category; import org.springframework.test.annotation.DirtiesContext; @@ -16,20 +18,27 @@ import org.springside.modules.utils.Threads; @ContextConfiguration(locations = { "/applicationContext.xml", "/schedule/applicationContext-jdk-timer.xml" }) public class JdkTimerJobTest extends SpringTransactionalTestCase { - @Test - public void scheduleJob() throws Exception { + private static Log4jMockAppender appender; - //加载测试用logger appender - Log4jMockAppender appender = new Log4jMockAppender(); + @BeforeClass + public static void initLogger() { + // 加载测试用logger appender + appender = new Log4jMockAppender(); appender.addToLogger(UserCountScanner.class); + } + + @AfterClass + public static void removeLogger() { + appender.removeFromLogger(UserCountScanner.class); + } - //等待任务启动 + @Test + public void scheduleJob() throws Exception { + // 等待任务延时1秒启动并执行完毕 Threads.sleep(3000); - //验证任务已执行 + // 验证任务已执行 assertEquals(1, appender.getLogsCount()); assertEquals("There are 6 user in database, printed by jdk timer job.", appender.getFirstMessage()); - - appender.removeFromLogger(UserCountScanner.class); } } diff --git a/examples/showcase/src/test/java/org/springside/examples/showcase/demos/schedule/QuartzTimerClusterJobTest.java b/examples/showcase/src/test/java/org/springside/examples/showcase/demos/schedule/QuartzTimerClusterJobTest.java index f31df965fa0398035f1eca763c06489517015a44..2edcfbae90a70f046ac8be3e10e88e59af5f6c2c 100644 --- a/examples/showcase/src/test/java/org/springside/examples/showcase/demos/schedule/QuartzTimerClusterJobTest.java +++ b/examples/showcase/src/test/java/org/springside/examples/showcase/demos/schedule/QuartzTimerClusterJobTest.java @@ -2,6 +2,8 @@ package org.springside.examples.showcase.demos.schedule; import static org.junit.Assert.*; +import org.junit.AfterClass; +import org.junit.BeforeClass; import org.junit.Test; import org.junit.experimental.categories.Category; import org.springframework.test.annotation.DirtiesContext; @@ -21,22 +23,29 @@ import org.springside.modules.utils.Threads; @ContextConfiguration(locations = { "/applicationContext.xml", "/schedule/applicationContext-quartz-timer-cluster.xml" }) public class QuartzTimerClusterJobTest extends SpringTransactionalTestCase { - @Test - public void scheduleJob() throws Exception { + private static Log4jMockAppender appender; - //加载测试用logger appender - Log4jMockAppender appender = new Log4jMockAppender(); + @BeforeClass + public static void initLogger() { + // 加载测试用logger appender + appender = new Log4jMockAppender(); appender.addToLogger(QuartzClusterableJob.class); + } + + @AfterClass + public static void removeLogger() { + appender.removeFromLogger(QuartzClusterableJob.class); + } - //等待任务延时启动 + @Test + public void scheduleJob() throws Exception { + // 等待任务延时2秒启动并执行完毕 Threads.sleep(4000); - //验证任务已执行 + // 验证任务已执行 assertEquals(1, appender.getLogsCount()); assertEquals("There are 6 user in database, printed by quartz cluster job on node default.", appender.getFirstMessage()); - - appender.removeFromLogger(QuartzClusterableJob.class); } } diff --git a/examples/showcase/src/test/java/org/springside/examples/showcase/demos/schedule/SpringTimerJobTest.java b/examples/showcase/src/test/java/org/springside/examples/showcase/demos/schedule/SpringTimerJobTest.java index ec3eb3e6d830ebf327fcab1081a5e19f07317771..63e30561080c232a8b9fa72ab094c6bdd95ff4ff 100644 --- a/examples/showcase/src/test/java/org/springside/examples/showcase/demos/schedule/SpringTimerJobTest.java +++ b/examples/showcase/src/test/java/org/springside/examples/showcase/demos/schedule/SpringTimerJobTest.java @@ -2,6 +2,8 @@ package org.springside.examples.showcase.demos.schedule; import static org.junit.Assert.*; +import org.junit.AfterClass; +import org.junit.BeforeClass; import org.junit.Test; import org.junit.experimental.categories.Category; import org.springframework.test.annotation.DirtiesContext; @@ -16,19 +18,27 @@ import org.springside.modules.utils.Threads; @ContextConfiguration(locations = { "/applicationContext.xml", "/schedule/applicationContext-spring-scheduler.xml" }) public class SpringTimerJobTest extends SpringTransactionalTestCase { - @Test - public void scheduleJob() throws Exception { + private static Log4jMockAppender appender; + @BeforeClass + public static void initLogger() { // 加载测试用logger appender - Log4jMockAppender appender = new Log4jMockAppender(); + appender = new Log4jMockAppender(); appender.addToLogger(UserCountScanner.class); + } - // 等待任务启动 - Threads.sleep(3000); + @AfterClass + public static void removeLogger() { + appender.removeFromLogger(UserCountScanner.class); + } + + @Test + public void scheduleJob() throws Exception { + // 等待任务执行完毕 + Threads.sleep(2000); // 验证任务已执行 assertEquals(1, appender.getLogsCount()); assertEquals("There are 6 user in database, printed by spring timer job by xml.", appender.getFirstMessage()); - appender.removeFromLogger(UserCountScanner.class); } }