From f87bf69dcf9b345bb2e5df680f161ea06693cb72 Mon Sep 17 00:00:00 2001
From: Chris Schaefer <cschaefer@gopivotal.com>
Date: Tue, 18 Feb 2014 12:46:53 -0500
Subject: [PATCH] PartitionParserTests fixes

testFullPartitionConfigurationWithMapperSuppliedProperties
* remove assert on PartitionMapper.name as PropertyPartitionMapper is used and
  PartitionMapper.name does not get populated.

testFullPartitionConfigurationWithHardcodedProperties
* when run as part of the suite, the static fields name was populated by another test case.
  add explicit reference and hardcoded property to job def
---
 .../core/jsr/configuration/xml/PartitionParserTests.java     | 1 -
 .../fullPartitionParserWithHardcodedPropertiesTests.xml      | 5 +++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/jsr/configuration/xml/PartitionParserTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/jsr/configuration/xml/PartitionParserTests.java
index 672346635..13663f081 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/jsr/configuration/xml/PartitionParserTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/jsr/configuration/xml/PartitionParserTests.java
@@ -132,7 +132,6 @@ public class PartitionParserTests {
 		assertTrue(PartitionCollector.artifactNames.contains("collector1"));
 		assertTrue(PartitionCollector.artifactNames.contains("collector2"));
 
-		assertEquals(PartitionMapper.name, "mapper");
 		assertEquals(PartitionAnalyzer.name, "analyzer");
 		assertEquals(PartitionReducer.name, "reducer");
 	}
diff --git a/spring-batch-core/src/test/resources/META-INF/batch-jobs/fullPartitionParserWithHardcodedPropertiesTests.xml b/spring-batch-core/src/test/resources/META-INF/batch-jobs/fullPartitionParserWithHardcodedPropertiesTests.xml
index 9c2ff6bd7..302125f50 100644
--- a/spring-batch-core/src/test/resources/META-INF/batch-jobs/fullPartitionParserWithHardcodedPropertiesTests.xml
+++ b/spring-batch-core/src/test/resources/META-INF/batch-jobs/fullPartitionParserWithHardcodedPropertiesTests.xml
@@ -36,6 +36,11 @@
 					<property name="artifactName" value="reducer"/>
 				</properties>
 	    	</reducer>
+            <mapper ref="org.springframework.batch.core.jsr.configuration.xml.PartitionParserTests$PartitionMapper">
+                <properties>
+                    <property name="artifactName" value="mapper"/>
+                </properties>
+            </mapper>
 	    </partition>
 	</step>
 </job>