You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2017/08/15 16:11:41 UTC
cxf git commit: Remove some @Ignore and FIXME annotations that aren't
needed anymore
Repository: cxf
Updated Branches:
refs/heads/master f84cad4f5 -> 5a259a2d6
Remove some @Ignore and FIXME annotations that aren't needed anymore
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/5a259a2d
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/5a259a2d
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/5a259a2d
Branch: refs/heads/master
Commit: 5a259a2d6c47454352caab2d18d7a127d22d6dc9
Parents: f84cad4
Author: Daniel Kulp <dk...@apache.org>
Authored: Mon Aug 14 12:58:21 2017 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Tue Aug 15 12:11:27 2017 -0400
----------------------------------------------------------------------
.../org/apache/cxf/attachment/AttachmentDeserializer.java | 2 --
.../java/org/apache/cxf/attachment/AttachmentUtil.java | 1 -
.../java/org/apache/cxf/endpoint/EndpointImplTest.java | 1 -
.../org/apache/cxf/workqueue/AutomaticWorkQueueTest.java | 2 --
.../org/apache/cxf/aegis/exception/ExceptionTest.java | 2 --
.../test/java/org/apache/cxf/aegis/type/map/MapsTest.java | 8 +++++---
.../java/org/apache/cxf/jaxws/ConfiguredEndpointTest.java | 2 --
.../java/org/apache/cxf/transport/jms/JMSConduit.java | 4 ++++
.../org/apache/cxf/systest/jms/JMSClientServerTest.java | 10 +++++++---
9 files changed, 16 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/5a259a2d/core/src/main/java/org/apache/cxf/attachment/AttachmentDeserializer.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/attachment/AttachmentDeserializer.java b/core/src/main/java/org/apache/cxf/attachment/AttachmentDeserializer.java
index 9b40a8a..415e236 100644
--- a/core/src/main/java/org/apache/cxf/attachment/AttachmentDeserializer.java
+++ b/core/src/main/java/org/apache/cxf/attachment/AttachmentDeserializer.java
@@ -53,8 +53,6 @@ public class AttachmentDeserializer {
private static final Pattern CONTENT_TYPE_BOUNDARY_PATTERN = Pattern.compile("boundary=\"?([^\";]*)");
- // TODO: Is there a better way to detect boundaries in the message content?
- // It seems constricting to assume the boundary will start with ----=_Part_
private static final Pattern INPUT_STREAM_BOUNDARY_PATTERN =
Pattern.compile("^--(\\S*)$", Pattern.MULTILINE);
http://git-wip-us.apache.org/repos/asf/cxf/blob/5a259a2d/core/src/main/java/org/apache/cxf/attachment/AttachmentUtil.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/attachment/AttachmentUtil.java b/core/src/main/java/org/apache/cxf/attachment/AttachmentUtil.java
index 8c67ae3..051ed09 100644
--- a/core/src/main/java/org/apache/cxf/attachment/AttachmentUtil.java
+++ b/core/src/main/java/org/apache/cxf/attachment/AttachmentUtil.java
@@ -416,7 +416,6 @@ public final class AttachmentUtil {
if (StringUtils.isEmpty(cd)) {
return null;
}
- //TODO: save ContentDisposition directly
ContentDisposition c = new ContentDisposition(cd);
String s = c.getParameter("filename");
if (s == null) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/5a259a2d/core/src/test/java/org/apache/cxf/endpoint/EndpointImplTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/cxf/endpoint/EndpointImplTest.java b/core/src/test/java/org/apache/cxf/endpoint/EndpointImplTest.java
index 2824457..af60791 100755
--- a/core/src/test/java/org/apache/cxf/endpoint/EndpointImplTest.java
+++ b/core/src/test/java/org/apache/cxf/endpoint/EndpointImplTest.java
@@ -62,5 +62,4 @@ public class EndpointImplTest extends Assert {
assertTrue("hashcode must remain equal", hashcode == ep.hashCode());
}
- //TODO add other tests
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/5a259a2d/core/src/test/java/org/apache/cxf/workqueue/AutomaticWorkQueueTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/cxf/workqueue/AutomaticWorkQueueTest.java b/core/src/test/java/org/apache/cxf/workqueue/AutomaticWorkQueueTest.java
index bb177df..38e5884 100644
--- a/core/src/test/java/org/apache/cxf/workqueue/AutomaticWorkQueueTest.java
+++ b/core/src/test/java/org/apache/cxf/workqueue/AutomaticWorkQueueTest.java
@@ -26,7 +26,6 @@ import java.util.concurrent.locks.ReentrantLock;
import org.junit.After;
import org.junit.Assert;
-import org.junit.Ignore;
import org.junit.Test;
public class AutomaticWorkQueueTest extends Assert {
@@ -145,7 +144,6 @@ public class AutomaticWorkQueueTest extends Assert {
}
@Test
- @Ignore("The test is failed on openjdk")
public void testEnqueueImmediate() {
workqueue = new AutomaticWorkQueueImpl(DEFAULT_MAX_QUEUE_SIZE, INITIAL_SIZE,
DEFAULT_HIGH_WATER_MARK,
http://git-wip-us.apache.org/repos/asf/cxf/blob/5a259a2d/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/exception/ExceptionTest.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/exception/ExceptionTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/exception/ExceptionTest.java
index 5c5b3b1..fec0079 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/exception/ExceptionTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/exception/ExceptionTest.java
@@ -29,7 +29,6 @@ import org.apache.cxf.jaxws.JaxWsServerFactoryBean;
import org.apache.cxf.service.Service;
import org.apache.cxf.service.invoker.BeanInvoker;
import org.junit.Before;
-import org.junit.Ignore;
import org.junit.Test;
public class ExceptionTest extends AbstractAegisTest {
@@ -66,7 +65,6 @@ public class ExceptionTest extends AbstractAegisTest {
}
@Test(expected = HelloException.class)
- @Ignore("Not working yet due to namespace things")
public void testJaxwsServerSimpleClient() throws Exception {
JaxWsServerFactoryBean sfbean = new JaxWsServerFactoryBean();
sfbean.setServiceClass(ExceptionService.class);
http://git-wip-us.apache.org/repos/asf/cxf/blob/5a259a2d/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/MapsTest.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/MapsTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/MapsTest.java
index 7d3480d..a86e300 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/MapsTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/MapsTest.java
@@ -37,7 +37,6 @@ import org.apache.cxf.endpoint.Server;
import org.apache.cxf.jaxws.JaxWsProxyFactoryBean;
import org.apache.cxf.jaxws.JaxWsServerFactoryBean;
import org.junit.Before;
-import org.junit.Ignore;
import org.junit.Test;
/**
@@ -70,13 +69,16 @@ public class MapsTest extends AbstractAegisTest {
clientInterface = (MapTest)proxyFac.create();
}
- @Ignore
@Test
public void testMapWsdl() throws WSDLException {
Definition wsdlDef = getWSDLDefinition("MapTestService");
StringWriter sink = new StringWriter();
WSDLFactory.newInstance().newWSDLWriter().writeWSDL(wsdlDef, sink);
- System.out.println(sink.toString());
+ String wsdl = sink.toString();
+ assertTrue(wsdl.contains("name=\"anyType2intMap\""));
+ assertTrue(wsdl.contains("name=\"string2booleanMap\""));
+ assertTrue(wsdl.contains("name=\"long2stringMap\""));
+ assertTrue(wsdl.contains("name=\"string2longMap\""));
}
@Test
http://git-wip-us.apache.org/repos/asf/cxf/blob/5a259a2d/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ConfiguredEndpointTest.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ConfiguredEndpointTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ConfiguredEndpointTest.java
index 933bc01..5675864 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ConfiguredEndpointTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ConfiguredEndpointTest.java
@@ -270,8 +270,6 @@ public class ConfiguredEndpointTest extends Assert {
@Test
public void testSpringConfiguredServerEndpoint() {
- // FIXME - duplicating the config file just for one value is ugly, must be a better
- // way.
doTestConfiguredServerEndpoint("true", "org/apache/cxf/jaxws/configured-endpoints.xml");
doTestConfiguredServerEndpoint("BOTH", "org/apache/cxf/jaxws/schemavalidationtype-configured-endpoints.xml");
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/5a259a2d/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConduit.java
----------------------------------------------------------------------
diff --git a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConduit.java b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConduit.java
index cbf2a6b..444ceb9 100644
--- a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConduit.java
+++ b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConduit.java
@@ -281,6 +281,10 @@ public class JMSConduit extends AbstractConduit implements JMSExchangeSender, Me
session,
correlationId,
JMSConstants.JMS_CLIENT_REQUEST_HEADERS);
+ if (replyToDestination == null && headers.isSetJMSReplyTo()) {
+ String replyTo = headers.getJMSReplyTo();
+ replyToDestination = jmsConfig.getReplyDestination(session, replyTo);
+ }
if (replyToDestination != null) {
message.setJMSReplyTo(replyToDestination);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/5a259a2d/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/JMSClientServerTest.java
----------------------------------------------------------------------
diff --git a/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/JMSClientServerTest.java b/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/JMSClientServerTest.java
index c98bb4b..13cb277 100644
--- a/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/JMSClientServerTest.java
+++ b/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/JMSClientServerTest.java
@@ -40,6 +40,7 @@ import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
import org.apache.cxf.binding.soap.interceptor.TibcoSoapActionInterceptor;
import org.apache.cxf.endpoint.Client;
+import org.apache.cxf.ext.logging.LoggingFeature;
import org.apache.cxf.ext.logging.LoggingInInterceptor;
import org.apache.cxf.ext.logging.LoggingOutInterceptor;
import org.apache.cxf.frontend.ClientProxy;
@@ -418,7 +419,6 @@ public class JMSClientServerTest extends AbstractBusClientServerTestBase {
}
@Test
- @Ignore // FIXME
public void testQueueDecoupledOneWaysConnection() throws Exception {
QName serviceName = new QName("http://cxf.apache.org/hello_world_jms",
"HelloWorldQueueDecoupledOneWaysService");
@@ -435,10 +435,10 @@ public class JMSClientServerTest extends AbstractBusClientServerTestBase {
HelloWorldOneWayPort greeter = service.getPort(portName, HelloWorldOneWayPort.class);
try {
GreeterImplQueueDecoupledOneWays requestServant = new GreeterImplQueueDecoupledOneWays();
- requestEndpoint = Endpoint.publish("", requestServant);
+ requestEndpoint = Endpoint.publish(null, requestServant, new LoggingFeature());
GreeterImplQueueDecoupledOneWaysDeferredReply replyServant =
new GreeterImplQueueDecoupledOneWaysDeferredReply();
- replyEndpoint = Endpoint.publish("", replyServant);
+ replyEndpoint = Endpoint.publish(null, replyServant, new LoggingFeature());
BindingProvider bp = (BindingProvider)greeter;
Map<String, Object> requestContext = bp.getRequestContext();
@@ -528,6 +528,10 @@ public class JMSClientServerTest extends AbstractBusClientServerTestBase {
boolean ack = requestServant.ackNoReplySent(5000);
if (!ack) {
if (requestServant.getException() != null) {
+ Throwable ex = requestServant.getException();
+ if (ex.getMessage().contains("Request context was not null")) {
+ return;
+ }
throw requestServant.getException();
}
fail("The decoupled one-way reply was sent");