You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2017/06/07 20:19:04 UTC
cxf git commit: More fixes
Repository: cxf
Updated Branches:
refs/heads/3.1.x-fixes b3dc83a35 -> 9de981a12
More fixes
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/9de981a1
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/9de981a1
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/9de981a1
Branch: refs/heads/3.1.x-fixes
Commit: 9de981a12c1c55616ecc771ce4b41822f8fb74b5
Parents: b3dc83a
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Wed Jun 7 21:18:56 2017 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Wed Jun 7 21:18:56 2017 +0100
----------------------------------------------------------------------
.../test/java/org/apache/cxf/systest/jaxrs/JAXRSAtomBookTest.java | 2 ++
.../test/java/org/apache/cxf/systest/jaxrs/JAXRSMultipartTest.java | 2 --
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/9de981a1/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAtomBookTest.java
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAtomBookTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAtomBookTest.java
index 4903e49..06ee29d 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAtomBookTest.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAtomBookTest.java
@@ -178,6 +178,8 @@ public class JAXRSAtomBookTest extends AbstractBusClientServerTestBase {
get.setHeader("Content-Type", "*/*");
get.setHeader("Accept", type);
try {
+ CloseableHttpResponse response = client.execute(get);
+ String jsonContent = EntityUtils.toString(response.getEntity());
String expected = getStringFromInputStream(
getClass().getResourceAsStream(resourcePath));
expected = expected.replaceAll("9080", PORT);
http://git-wip-us.apache.org/repos/asf/cxf/blob/9de981a1/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSMultipartTest.java
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSMultipartTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSMultipartTest.java
index 7c22a35..3086011 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSMultipartTest.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSMultipartTest.java
@@ -44,8 +44,6 @@ import javax.ws.rs.core.Response;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.Unmarshaller;
-import org.apache.cxf.ext.logging.LoggingInInterceptor;
-import org.apache.cxf.ext.logging.LoggingOutInterceptor;
import org.apache.cxf.helpers.FileUtils;
import org.apache.cxf.helpers.IOUtils;
import org.apache.cxf.interceptor.LoggingInInterceptor;