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 4832170c5..13d525663 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 @@ -29,8 +29,8 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; * @since 2.0 */ @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations = { "/simple-job-launcher-context.xml", "/jobs/ioSampleJob.xml", - "/jobs/ioSample/delimited.xml" }) +@ContextConfiguration(locations = { "/simple-job-launcher-context.xml", "/jobs/iosampleJob.xml", + "/jobs/iosample/delimited.xml" }) public class DelimitedFunctionalTests extends AbstractJobTests { private static final String OUTPUT_FILE = "target/test-outputs/delimitedOutput.csv"; 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 c4802abca..e00d7212d 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 @@ -25,8 +25,8 @@ import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations = { "/simple-job-launcher-context.xml", "/jobs/ioSampleJob.xml", - "/jobs/ioSample/fixedLength.xml" }) +@ContextConfiguration(locations = { "/simple-job-launcher-context.xml", "/jobs/iosampleJob.xml", + "/jobs/iosample/fixedLength.xml" }) public class FixedLengthFunctionalTests extends AbstractJobTests { private static final String OUTPUT_FILE = "target/test-outputs/fixedLengthOutput.txt"; diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/JdbcCursorFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/JdbcCursorFunctionalTests.java index d44922c17..19a01eb16 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/JdbcCursorFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/JdbcCursorFunctionalTests.java @@ -34,8 +34,8 @@ import org.springframework.test.jdbc.SimpleJdbcTestUtils; * @since 2.0 */ @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations = { "/simple-job-launcher-context.xml", "/jobs/ioSampleJob.xml", - "/jobs/ioSample/jdbcCursor.xml" }) +@ContextConfiguration(locations = { "/simple-job-launcher-context.xml", "/jobs/iosampleJob.xml", + "/jobs/iosample/jdbcCursor.xml" }) public class JdbcCursorFunctionalTests extends AbstractJobTests { private SimpleJdbcTemplate simpleJdbcTemplate; 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 d016cf771..6d214705a 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 @@ -29,8 +29,8 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; * @since 2.0 */ @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations = { "/simple-job-launcher-context.xml", "/jobs/ioSampleJob.xml", - "/jobs/ioSample/multiLine.xml" }) +@ContextConfiguration(locations = { "/simple-job-launcher-context.xml", "/jobs/iosampleJob.xml", + "/jobs/iosample/multiLine.xml" }) public class MultiLineFunctionalTests extends AbstractJobTests { private static final String OUTPUT_FILE = "target/test-outputs/multiLineOutput.txt"; 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 372ebd914..6ba0e90e5 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 @@ -29,8 +29,8 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; * @since 2.0 */ @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations = { "/simple-job-launcher-context.xml", "/jobs/ioSampleJob.xml", - "/jobs/ioSample/multiRecordType.xml" }) +@ContextConfiguration(locations = { "/simple-job-launcher-context.xml", "/jobs/iosampleJob.xml", + "/jobs/iosample/multiRecordType.xml" }) public class MultiRecordTypeFunctionalTests extends AbstractJobTests { private static final String OUTPUT_FILE = "target/test-outputs/multiRecordTypeOutput.txt"; 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 5552c1afb..85ab20d3c 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 @@ -29,8 +29,8 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; * @since 2.0 */ @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations = { "/simple-job-launcher-context.xml", "/jobs/ioSampleJob.xml", - "/jobs/ioSample/multiResource.xml" }) +@ContextConfiguration(locations = { "/simple-job-launcher-context.xml", "/jobs/iosampleJob.xml", + "/jobs/iosample/multiResource.xml" }) public class MultiResourceFunctionalTests extends AbstractJobTests { /** 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 c4d423980..d46ffd1bb 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 @@ -31,8 +31,8 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; * @since 2.0 */ @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations = { "/simple-job-launcher-context.xml", "/jobs/ioSampleJob.xml", - "/jobs/ioSample/xml.xml" }) +@ContextConfiguration(locations = { "/simple-job-launcher-context.xml", "/jobs/iosampleJob.xml", + "/jobs/iosample/xml.xml" }) public class XmlFunctionalTests extends AbstractJobTests { private static final String OUTPUT_FILE = "target/test-outputs/output.xml"; diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/internal/DelegatingTradeLineAggregatorTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/internal/DelegatingTradeLineAggregatorTests.java index fbdf160b2..677a00ef1 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/internal/DelegatingTradeLineAggregatorTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/internal/DelegatingTradeLineAggregatorTests.java @@ -33,7 +33,7 @@ import org.springframework.batch.sample.domain.trade.Trade; public class DelegatingTradeLineAggregatorTests { @Test - public void testAggregate() { + public void testAggregateTrade() { BeanWrapperFieldExtractor tradeExtractor = new BeanWrapperFieldExtractor(); tradeExtractor.setNames(new String[] { "isin", "quantity", "price", "customer" }); @@ -41,7 +41,7 @@ public class DelegatingTradeLineAggregatorTests { tradeAggregator.setFieldExtractor(tradeExtractor); BeanWrapperFieldExtractor customerExtractor = new BeanWrapperFieldExtractor(); - tradeExtractor.setNames(new String[] { "id", "name", "credit" }); + customerExtractor.setNames(new String[] { "id", "name", "credit" }); DelimitedLineAggregator customerAggregator = new DelimitedLineAggregator(); customerAggregator.setFieldExtractor(customerExtractor); @@ -56,4 +56,9 @@ public class DelegatingTradeLineAggregatorTests { CustomerCredit c = new CustomerCredit(256, "customer1", new BigDecimal("3200.00")); assertEquals("256,customer1,3200.00", aggregator.aggregate(c)); } + + @Test + public void testAggregateCustomer(){ + + } }