diff --git a/spring-batch-integration/pom.xml b/spring-batch-integration/pom.xml index d13e807ca..40c974a98 100644 --- a/spring-batch-integration/pom.xml +++ b/spring-batch-integration/pom.xml @@ -42,6 +42,14 @@ org.slf4j jcl-over-slf4j + + org.slf4j + slf4j-api + + + org.slf4j + slf4j-log4j12 + log4j log4j diff --git a/spring-batch-integration/src/test/java/org/springframework/batch/integration/IgnoredTestSuite.java b/spring-batch-integration/src/test/java/org/springframework/batch/integration/IgnoredTestSuite.java index eff20aeae..582275092 100644 --- a/spring-batch-integration/src/test/java/org/springframework/batch/integration/IgnoredTestSuite.java +++ b/spring-batch-integration/src/test/java/org/springframework/batch/integration/IgnoredTestSuite.java @@ -4,8 +4,8 @@ import org.junit.Ignore; import org.junit.runner.RunWith; import org.junit.runners.Suite; import org.junit.runners.Suite.SuiteClasses; -import org.springframework.batch.integration.chunk.RemoteChunkFaultTolerantStepIntegrationTests; import org.springframework.batch.integration.chunk.RemoteChunkFaultTolerantStepJmsIntegrationTests; +import org.springframework.batch.integration.partition.JmsIntegrationTests; /* * Copyright 2009-2010 the original author or authors. @@ -30,7 +30,7 @@ import org.springframework.batch.integration.chunk.RemoteChunkFaultTolerantStepJ * */ @RunWith(Suite.class) -@SuiteClasses(value = { RemoteChunkFaultTolerantStepIntegrationTests.class, +@SuiteClasses(value = { JmsIntegrationTests.class, RemoteChunkFaultTolerantStepJmsIntegrationTests.class }) @Ignore public class IgnoredTestSuite { diff --git a/spring-batch-integration/src/test/java/org/springframework/batch/integration/chunk/RemoteChunkFaultTolerantStepJmsIntegrationTests.java b/spring-batch-integration/src/test/java/org/springframework/batch/integration/chunk/RemoteChunkFaultTolerantStepJmsIntegrationTests.java index 4f2172301..6391c1af8 100644 --- a/spring-batch-integration/src/test/java/org/springframework/batch/integration/chunk/RemoteChunkFaultTolerantStepJmsIntegrationTests.java +++ b/spring-batch-integration/src/test/java/org/springframework/batch/integration/chunk/RemoteChunkFaultTolerantStepJmsIntegrationTests.java @@ -17,12 +17,14 @@ import org.springframework.batch.core.JobParametersBuilder; import org.springframework.batch.core.StepExecution; import org.springframework.batch.core.launch.JobLauncher; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.util.FileSystemUtils; @ContextConfiguration @RunWith(SpringJUnit4ClassRunner.class) +@DirtiesContext public class RemoteChunkFaultTolerantStepJmsIntegrationTests { @BeforeClass diff --git a/spring-batch-integration/src/test/java/org/springframework/batch/integration/partition/JmsIntegrationTests.java b/spring-batch-integration/src/test/java/org/springframework/batch/integration/partition/JmsIntegrationTests.java index d22532868..6dfd40b7f 100755 --- a/spring-batch-integration/src/test/java/org/springframework/batch/integration/partition/JmsIntegrationTests.java +++ b/spring-batch-integration/src/test/java/org/springframework/batch/integration/partition/JmsIntegrationTests.java @@ -30,6 +30,7 @@ import org.springframework.batch.core.StepExecution; import org.springframework.batch.core.explore.JobExplorer; import org.springframework.batch.core.launch.JobLauncher; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -39,6 +40,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; */ @ContextConfiguration @RunWith(SpringJUnit4ClassRunner.class) +@DirtiesContext public class JmsIntegrationTests { private Log logger = LogFactory.getLog(getClass());