diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/SkipSampleFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/SkipSampleFunctionalTests.java index 137c21743..855978704 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/SkipSampleFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/SkipSampleFunctionalTests.java @@ -22,6 +22,7 @@ import org.springframework.jdbc.core.simple.SimpleJdbcTemplate; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.test.jdbc.SimpleJdbcTestUtils; +import org.springframework.transaction.annotation.Transactional; /** * Error is encountered during writing - transaction is rolled back and the @@ -120,7 +121,7 @@ public class SkipSampleFunctionalTests { *
  • This step does not occur. No error records are logged. * */ - @Test + @Transactional @Test public void testJobIncrementing() { // // Launch 1 diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/DelimitedFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/DelimitedFunctionalTests.java index 402e87984..cb48259ae 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/DelimitedFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/DelimitedFunctionalTests.java @@ -34,7 +34,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; public class DelimitedFunctionalTests extends AbstractJobTests { private static final String OUTPUT_FILE = "target/test-outputs/delimitedOutput.csv"; - private static final String INPUT_FILE = "src/main/resources/data/ioSample/input/delimited.csv"; + private static final String INPUT_FILE = "src/main/resources/data/iosample/input/delimited.csv"; /** * Output should be the same as input diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/FixedLengthFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/FixedLengthFunctionalTests.java index a01240d5e..e010a01b3 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/FixedLengthFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/FixedLengthFunctionalTests.java @@ -30,7 +30,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; public class FixedLengthFunctionalTests extends AbstractJobTests { private static final String OUTPUT_FILE = "target/test-outputs/fixedLengthOutput.txt"; - private static final String INPUT_FILE = "src/main/resources/data/ioSample/input/fixedLength.txt"; + private static final String INPUT_FILE = "src/main/resources/data/iosample/input/fixedLength.txt"; /** * Output should be the same as input diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/MultiLineFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/MultiLineFunctionalTests.java index 590250056..fe583814d 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/MultiLineFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/MultiLineFunctionalTests.java @@ -34,7 +34,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; public class MultiLineFunctionalTests extends AbstractJobTests { private static final String OUTPUT_FILE = "target/test-outputs/multiLineOutput.txt"; - private static final String INPUT_FILE = "src/main/resources/data/ioSample/input/multiLine.txt"; + private static final String INPUT_FILE = "src/main/resources/data/iosample/input/multiLine.txt"; /** * Output should be the same as input diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/MultiRecordTypeFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/MultiRecordTypeFunctionalTests.java index 8b64783bc..84dcd7c97 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/MultiRecordTypeFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/MultiRecordTypeFunctionalTests.java @@ -34,7 +34,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; public class MultiRecordTypeFunctionalTests extends AbstractJobTests { private static final String OUTPUT_FILE = "target/test-outputs/multiRecordTypeOutput.txt"; - private static final String INPUT_FILE = "src/main/resources/data/ioSample/input/multiRecordType.txt"; + private static final String INPUT_FILE = "src/main/resources/data/iosample/input/multiRecordType.txt"; /** * Output should be the same as input diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/MultiResourceFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/MultiResourceFunctionalTests.java index 8e1607fe4..0cc3d62ed 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/MultiResourceFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/MultiResourceFunctionalTests.java @@ -41,8 +41,8 @@ public class MultiResourceFunctionalTests extends AbstractJobTests { this.launchJob(); AssertFile.assertFileEquals(new FileSystemResource("target/test-outputs/multiResourceOutput.csv.1"), - new FileSystemResource("src/main/resources/data/ioSample/input/delimited.csv")); + new FileSystemResource("src/main/resources/data/iosample/input/delimited.csv")); AssertFile.assertFileEquals(new FileSystemResource("target/test-outputs/multiResourceOutput.csv.2"), - new FileSystemResource("src/main/resources/data/ioSample/input/delimited2.csv")); + new FileSystemResource("src/main/resources/data/iosample/input/delimited2.csv")); } } diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/XmlFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/XmlFunctionalTests.java index 71e977ea4..448d1617b 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/XmlFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/XmlFunctionalTests.java @@ -36,7 +36,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; public class XmlFunctionalTests extends AbstractJobTests { private static final String OUTPUT_FILE = "target/test-outputs/output.xml"; - private static final String INPUT_FILE = "src/main/resources/data/ioSample/input/input.xml"; + private static final String INPUT_FILE = "src/main/resources/data/iosample/input/input.xml"; /** * Output should be the same as input