Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

INT-1951, INT-1981 cleaned up the test and changed the template.mf to reflect the lowest version of Spring-WS to be 2.0.0

Browse Source
This commit is contained in:
Oleg Zhurakousky
2011-08-08 17:24:53 -04:00
parent 5afd12a819
commit b2c7a45dcf
2 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
spring-integration-ws/src/test/java/org/springframework/integration/ws/config/WebServiceInboundGatewayParserTests.java
View File

@@ -16,14 +16,6 @@
package org.springframework.integration.ws.config;
import static junit.framework.Assert.assertEquals;
import static junit.framework.Assert.assertNotNull;
import static junit.framework.Assert.assertTrue;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import java.util.Collections;
import java.util.Map;
import java.util.Properties;
@@ -33,7 +25,6 @@ import javax.xml.transform.Source;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mockito;
import org.springframework.beans.DirectFieldAccessor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
@@ -41,7 +32,6 @@ import org.springframework.integration.Message;
import org.springframework.integration.MessageChannel;
import org.springframework.integration.MessageHeaders;
import org.springframework.integration.core.PollableChannel;
import org.springframework.integration.gateway.MessagingGatewaySupport;
import org.springframework.integration.history.MessageHistory;
import org.springframework.integration.mapping.HeaderMapper;
import org.springframework.integration.test.util.TestUtils;
@@ -55,6 +45,16 @@ import org.springframework.ws.context.DefaultMessageContext;
import org.springframework.ws.context.MessageContext;
import org.springframework.ws.soap.SoapHeader;
import static junit.framework.Assert.assertEquals;
import static junit.framework.Assert.assertNotNull;
import static junit.framework.Assert.assertTrue;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
/**
* @author Iwein Fuld
* @author Oleg Zhurakousky
@@ -131,9 +131,7 @@ public class WebServiceInboundGatewayParserTests {
assertThat((AbstractMarshaller) accessor.getPropertyValue("unmarshaller"),
is(marshaller));
assertTrue("messaging gateway is not running", marshallingGateway.isRunning());
//MessagingGatewaySupport mgs = (MessagingGatewaySupport) accessor.getPropertyValue("gatewayDelegate");
//DirectFieldAccessor mgsAccessor = new DirectFieldAccessor(mgs);
assertThat(
(MessageChannel) accessor.getPropertyValue("errorChannel"),
is(customErrorChannel));

2
spring-integration-ws/template.mf
View File

@@ -11,7 +11,7 @@ Import-Template:
org.springframework.scheduling.*;version="[3.1.0, 4.0.0)",
org.springframework.util;version="[3.1.0, 4.0.0)",
org.springframework.oxm;version="[1.5.9, 3.1.0)",
org.springframework.ws.*;version="[1.5.9, 2.1.0)",
org.springframework.ws.*;version="[2.0.0, 2.1.0)",
org.springframework.xml.*;version="[1.5.9, 2.1.0)",
org.apache.commons.logging;version="[1.1.1, 2.0.0)",
org.w3c.dom.*;version="0",