Merge pull request #238 from garyrussell/INT-2294 which built upon pull request #237 from markfisher/INT-2294

INT-2294:

  Add SoapHeaderMapper Unit Tests

  Fixed null check for soapHeader (rather than source)

spring-integration-ws/src/main/java/org/springframework/integration/ws/DefaultSoapHeaderMapper.java

@@ -44,7 +44,7 @@ import org.springframework.xml.namespace.QNameUtils;
  * 
  * @author Mark Fisher
  * @author Oleg Zhurakousky
- * @since 2.0
+ * @since 2.1
  */
 public class DefaultSoapHeaderMapper extends AbstractHeaderMapper<SoapMessage> implements SoapHeaderMapper {
 	
@@ -62,9 +62,9 @@ public class DefaultSoapHeaderMapper extends AbstractHeaderMapper<SoapMessage> i
 
 	@Override
 	protected Map<String, Object> extractUserDefinedHeaders(SoapMessage source) {
-		SoapHeader soapHeader = source.getSoapHeader();
 		Map<String, Object> headers = new HashMap<String, Object>();
-		if (source != null) {
+		SoapHeader soapHeader = source.getSoapHeader();
+		if (soapHeader != null) {
 			Iterator<?> attributeIter = soapHeader.getAllAttributes();
 			while (attributeIter.hasNext()) {
 				Object name = attributeIter.next();

spring-integration-ws/src/test/java/org/springframework/integration/ws/DefaultSoapHeaderMapperTests.java

@@ -0,0 +1,78 @@
+/*
+ * Copyright 2002-2011 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.integration.ws;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertSame;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import java.util.Iterator;
+import java.util.Map;
+
+import javax.xml.namespace.QName;
+
+import org.junit.Test;
+import org.springframework.ws.soap.SoapHeader;
+import org.springframework.ws.soap.SoapHeaderElement;
+import org.springframework.ws.soap.SoapMessage;
+
+/**
+ * @author Gary Russell
+ * @since 2.1
+ *
+ */
+public class DefaultSoapHeaderMapperTests {
+
+	@Test
+	public void testNullSoapHeader() {
+		DefaultSoapHeaderMapper mapper = new DefaultSoapHeaderMapper();
+		SoapMessage soapMessage = mock(SoapMessage.class);
+		Map<String, Object> headers = mapper.toHeadersFromReply(soapMessage);
+		assertEquals(0, headers.size());
+	}
+
+	@Test
+	public void testCustomSoapHeader() {
+		DefaultSoapHeaderMapper mapper = new DefaultSoapHeaderMapper();
+		mapper.setReplyHeaderNames(new String[] {"x:attr", "x:elem"});
+		SoapMessage soapMessage = mock(SoapMessage.class);
+		SoapHeader soapHeader = mock(SoapHeader.class);
+		@SuppressWarnings("unchecked")
+		Iterator<QName> attrIterator = mock(Iterator.class);
+		QName attribute = new QName("http://x", "attr", "x");
+		@SuppressWarnings("unchecked")
+		Iterator<SoapHeaderElement> elementIterator = mock(Iterator.class);
+		SoapHeaderElement soapHeaderElement = mock(SoapHeaderElement.class);
+		QName element = new QName("http://x", "elem", "x");
+
+		when(soapMessage.getSoapHeader()).thenReturn(soapHeader);
+		when(soapHeader.getAllAttributes()).thenReturn(attrIterator);
+		when(attrIterator.hasNext()).thenReturn(true).thenReturn(false);
+		when(attrIterator.next()).thenReturn(attribute);
+		when(soapHeader.getAttributeValue(attribute)).thenReturn("attrValue");
+		when(soapHeader.examineAllHeaderElements()).thenReturn(elementIterator);
+		when(elementIterator.hasNext()).thenReturn(true).thenReturn(false);
+		when(elementIterator.next()).thenReturn(soapHeaderElement);
+		when(soapHeaderElement.getName()).thenReturn(element);
+
+		Map<String, Object> headers = mapper.toHeadersFromReply(soapMessage);
+		assertEquals(2, headers.size());
+		assertEquals("attrValue", headers.get("x:attr"));
+		assertSame(soapHeaderElement, headers.get("x:elem"));
+	}
+
+}