Author: dkulp
Date: Wed Dec 15 04:56:27 2010
New Revision: 1049428
URL: http://svn.apache.org/viewvc?rev=1049428&view=rev
Log:
Start updating tests so they pass with IBM JDK. Still many to go.
Modified:
cxf/trunk/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/RPCInInterceptorTest.java
cxf/trunk/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/RPCOutInterceptorTest.java
cxf/trunk/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/TestBase.java
cxf/trunk/rt/core/src/test/java/org/apache/cxf/interceptor/DocLiteralInInterceptorTest.java
cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/codegen/CodeGeneratorProviderTest.java
cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/RequestPreprocessorTest.java
cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java
cxf/trunk/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/MAPAggregatorTest.java
cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessorTest.java
Modified:
cxf/trunk/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/RPCInInterceptorTest.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/RPCInInterceptorTest.java?rev=1049428&r1=1049427&r2=1049428&view=diff
==============================================================================
---
cxf/trunk/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/RPCInInterceptorTest.java
(original)
+++
cxf/trunk/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/RPCInInterceptorTest.java
Wed Dec 15 04:56:27 2010
@@ -68,6 +68,7 @@ public class RPCInInterceptorTest extend
service.getServiceInfos();
List<ServiceInfo> list = Arrays.asList(si);
EasyMock.expectLastCall().andReturn(list).anyTimes();
+ EasyMock.expect(service.isEmpty()).andReturn(true).anyTimes();
soapMessage.getExchange().put(Service.class, service);
soapMessage.getExchange().put(Message.SCHEMA_VALIDATION_ENABLED,
Boolean.FALSE);
Modified:
cxf/trunk/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/RPCOutInterceptorTest.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/RPCOutInterceptorTest.java?rev=1049428&r1=1049427&r2=1049428&view=diff
==============================================================================
---
cxf/trunk/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/RPCOutInterceptorTest.java
(original)
+++
cxf/trunk/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/RPCOutInterceptorTest.java
Wed Dec 15 04:56:27 2010
@@ -68,6 +68,7 @@ public class RPCOutInterceptorTest exten
control.reset();
Service service = control.createMock(Service.class);
+ EasyMock.expect(service.isEmpty()).andReturn(true).anyTimes();
JAXBDataBinding dataBinding = new
JAXBDataBinding(MyComplexStruct.class);
service.getDataBinding();
EasyMock.expectLastCall().andReturn(dataBinding).anyTimes();
Modified:
cxf/trunk/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/TestBase.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/TestBase.java?rev=1049428&r1=1049427&r2=1049428&view=diff
==============================================================================
---
cxf/trunk/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/TestBase.java
(original)
+++
cxf/trunk/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/TestBase.java
Wed Dec 15 04:56:27 2010
@@ -148,6 +148,8 @@ public class TestBase extends Assert {
EasyMock.expect(endpoint.getEndpointInfo()).andStubReturn(epi);
EasyMock.expect(endpoint.getBinding()).andStubReturn(xmlBinding);
EasyMock.expect(endpoint.getService()).andStubReturn(service);
+ EasyMock.expect(endpoint.isEmpty()).andReturn(true).anyTimes();
+
control.replay();
Modified:
cxf/trunk/rt/core/src/test/java/org/apache/cxf/interceptor/DocLiteralInInterceptorTest.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/test/java/org/apache/cxf/interceptor/DocLiteralInInterceptorTest.java?rev=1049428&r1=1049427&r2=1049428&view=diff
==============================================================================
---
cxf/trunk/rt/core/src/test/java/org/apache/cxf/interceptor/DocLiteralInInterceptorTest.java
(original)
+++
cxf/trunk/rt/core/src/test/java/org/apache/cxf/interceptor/DocLiteralInInterceptorTest.java
Wed Dec 15 04:56:27 2010
@@ -97,6 +97,7 @@ public class DocLiteralInInterceptorTest
exchange.put(Service.class, service);
EasyMock.expect(service.getDataBinding()).andReturn(new
SourceDataBinding());
EasyMock.expect(service.size()).andReturn(0).anyTimes();
+ EasyMock.expect(service.isEmpty()).andReturn(true).anyTimes();
Endpoint endpoint = control.createMock(Endpoint.class);
exchange.put(Endpoint.class, endpoint);
@@ -120,6 +121,7 @@ public class DocLiteralInInterceptorTest
EasyMock.expect(binding.getProperties()).andReturn(new HashMap<String,
Object>()).anyTimes();
EasyMock.expect(endpointInfo.getProperties()).andReturn(new
HashMap<String, Object>()).anyTimes();
EasyMock.expect(endpoint.size()).andReturn(0).anyTimes();
+ EasyMock.expect(endpoint.isEmpty()).andReturn(true).anyTimes();
ServiceInfo serviceInfo = control.createMock(ServiceInfo.class);
EasyMock.expect(endpointInfo.getService()).andReturn(serviceInfo).anyTimes();
@@ -177,6 +179,7 @@ public class DocLiteralInInterceptorTest
exchange.put(Service.class, service);
EasyMock.expect(service.getDataBinding()).andReturn(new
SourceDataBinding()).anyTimes();
EasyMock.expect(service.size()).andReturn(0).anyTimes();
+ EasyMock.expect(service.isEmpty()).andReturn(true).anyTimes();
Endpoint endpoint = control.createMock(Endpoint.class);
exchange.put(Endpoint.class, endpoint);
@@ -217,6 +220,7 @@ public class DocLiteralInInterceptorTest
EasyMock.expect(binding.getProperties()).andReturn(new HashMap<String,
Object>()).anyTimes();
EasyMock.expect(endpointInfo.getProperties()).andReturn(new
HashMap<String, Object>()).anyTimes();
EasyMock.expect(endpoint.size()).andReturn(0).anyTimes();
+ EasyMock.expect(endpoint.isEmpty()).andReturn(true).anyTimes();
EasyMock.expect(endpointInfo.getService()).andReturn(serviceInfo).anyTimes();
EasyMock.expect(endpointInfo.getName()).andReturn(new
QName("http://foo.com";, "endpoint")).anyTimes();
Modified:
cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/codegen/CodeGeneratorProviderTest.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/codegen/CodeGeneratorProviderTest.java?rev=1049428&r1=1049427&r2=1049428&view=diff
==============================================================================
---
cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/codegen/CodeGeneratorProviderTest.java
(original)
+++
cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/codegen/CodeGeneratorProviderTest.java
Wed Dec 15 04:56:27 2010
@@ -327,6 +327,7 @@ public class CodeGeneratorProviderTest e
e.put(Endpoint.class, endpoint);
endpoint.get(ProviderFactory.class.getName());
EasyMock.expectLastCall().andReturn(ProviderFactory.getSharedInstance());
+ EasyMock.expect(endpoint.isEmpty()).andReturn(true).anyTimes();
endpoint.getEndpointInfo();
EasyMock.expectLastCall().andReturn(epr).anyTimes();
control.replay();
Modified:
cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/RequestPreprocessorTest.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/RequestPreprocessorTest.java?rev=1049428&r1=1049427&r2=1049428&view=diff
==============================================================================
---
cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/RequestPreprocessorTest.java
(original)
+++
cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/RequestPreprocessorTest.java
Wed Dec 15 04:56:27 2010
@@ -120,6 +120,7 @@ public class RequestPreprocessorTest ext
control.reset();
Endpoint endp = control.createMock(Endpoint.class);
e.put(Endpoint.class, endp);
+ EasyMock.expect(endp.isEmpty()).andReturn(true).anyTimes();
endp.get(ProviderFactory.class.getName());
EasyMock.expectLastCall().andReturn(ProviderFactory.getInstance()).anyTimes();
ServletDestination d = control.createMock(ServletDestination.class);
Modified:
cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java?rev=1049428&r1=1049427&r2=1049428&view=diff
==============================================================================
---
cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java
(original)
+++
cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java
Wed Dec 15 04:56:27 2010
@@ -1455,6 +1455,8 @@ public class JAXRSUtilsTest extends Asse
EasyMock.expectLastCall().andReturn(null).anyTimes();
endpoint.size();
EasyMock.expectLastCall().andReturn(0).anyTimes();
+ endpoint.isEmpty();
+ EasyMock.expectLastCall().andReturn(true).anyTimes();
endpoint.get(ProviderFactory.class.getName());
EasyMock.expectLastCall().andReturn(factory).anyTimes();
EasyMock.replay(endpoint);
Modified:
cxf/trunk/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/MAPAggregatorTest.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/MAPAggregatorTest.java?rev=1049428&r1=1049427&r2=1049428&view=diff
==============================================================================
---
cxf/trunk/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/MAPAggregatorTest.java
(original)
+++
cxf/trunk/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/MAPAggregatorTest.java
Wed Dec 15 04:56:27 2010
@@ -823,7 +823,7 @@ public class MAPAggregatorTest extends A
Exchange exchange = control.createMock(Exchange.class);
exchange.get(Bus.class);
EasyMock.expectLastCall().andReturn(bus).anyTimes();
- //Exchange exchange = new ExchangeImpl();
+ EasyMock.expect(exchange.isEmpty()).andReturn(true).anyTimes();
return exchange;
}
Modified:
cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessorTest.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessorTest.java?rev=1049428&r1=1049427&r2=1049428&view=diff
==============================================================================
---
cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessorTest.java
(original)
+++
cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessorTest.java
Wed Dec 15 04:56:27 2010
@@ -505,8 +505,8 @@ public class JavaToProcessorTest extends
// To test there is wsam:action generated for the
String wsdlString = getStringFromFile(wsdlFile);
assertTrue("The wsam and wsaw action are not both generated",
wsdlString
- .indexOf("wsam:Action=\"http://cxf.apache.org/fault3\"";
- + " wsaw:Action=\"http://cxf.apache.org/fault3\"";) > -1);
+ .indexOf("wsam:Action=\"http://cxf.apache.org/fault3\"";) > -1
+ &&
wsdlString.indexOf("wsaw:Action=\"http://cxf.apache.org/fault3\"";) > -1);
assertTrue("The wsaAction is not generated for NOActionAnotation
method", wsdlString
.indexOf("http://fortest.tools.cxf.apache.org/AddNumbersImpl/addNumbers2Request";)
> -1);
assertTrue("The wsaAction is not generated for NOActionAnotation
method", wsdlString
