You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by re...@apache.org on 2021/06/17 02:03:47 UTC
[cxf] branch 3.3.x-fixes updated (fb62177 -> 244ee9b)
This is an automated email from the ASF dual-hosted git repository.
reta pushed a change to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git.
from fb62177 Recording .gitmergeinfo Changes
new a593049 CXF-8534: Fix org.apache.cxf.jaxrs.client.logging.RESTLoggingTest.testBinary (#815)
new 244ee9b Recording .gitmergeinfo Changes
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.gitmergeinfo | 2 ++
.../cxf/jaxrs/client/logging/RESTLoggingTest.java | 37 ++++++++++++++++------
2 files changed, 29 insertions(+), 10 deletions(-)
[cxf] 02/02: Recording .gitmergeinfo Changes
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 244ee9b78e9ecf29771cafaa7eda8cf039e42941
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Wed Jun 16 22:03:33 2021 -0400
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 2 ++
1 file changed, 2 insertions(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 6c79f67..24adff9 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -654,6 +654,7 @@ B f2da164e0733a14f967f3726166855d3a91eece8
B f330a85c8dd3ba07913badeb72f27dd41971973d
B f342fba01d88d60e9f7419c7811bd86074b249a8
B f3c4ac43c6043b8a2eb9682c7de3fba74a531c69
+B f3cee43a917bfa767757b7c7d0e9cf2afa5fb07f
B f4f227be9a1c4f31817a62fad7fff382d3089621
B f54062eb331fcf35d9f3a840f532417fccbb2673
B f54f4b406ec6ef5eb66c72e258a50924c851f737
@@ -716,6 +717,7 @@ M 12d2f091afde535edab04e56c9df026cc9aad743
M 147a6b416bdfa52b0dace0684f0b83d6a7561ce2
M 14976f9896a89f00e22629420636991b2e0f95fa
M 160f50ed9bd9391b61417716b3a67653c9e81a98
+M 1650f46bcf741f0bf713ab27ed33370747d051a7
M 169be66c11851d723e4a8d93f752e0b3dff1fa60
M 16d285838dc2209ca84af21723478f199403c2b7
M 1733865f4f91dce72249c0e98ccde9cbe01d2963
[cxf] 01/02: CXF-8534: Fix
org.apache.cxf.jaxrs.client.logging.RESTLoggingTest.testBinary (#815)
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit a593049c61573cd3da2996b552d585d69faee0d1
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Wed Jun 16 20:36:48 2021 -0400
CXF-8534: Fix org.apache.cxf.jaxrs.client.logging.RESTLoggingTest.testBinary (#815)
(cherry picked from commit e8ff7db98b357cb5c935ae19fe3da59380d1233b)
(cherry picked from commit 5127b65c1c21dc1a79b82f078b8cd01f9cf5ba19)
---
.../cxf/jaxrs/client/logging/RESTLoggingTest.java | 37 ++++++++++++++++------
1 file changed, 27 insertions(+), 10 deletions(-)
diff --git a/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/logging/RESTLoggingTest.java b/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/logging/RESTLoggingTest.java
index fbfdcfe..6c81b20 100644
--- a/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/logging/RESTLoggingTest.java
+++ b/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/logging/RESTLoggingTest.java
@@ -62,31 +62,48 @@ public class RESTLoggingTest {
LoggingFeature loggingFeature = new LoggingFeature();
TestEventSender sender = new TestEventSender();
loggingFeature.setSender(sender);
+ loggingFeature.setLogBinary(true);
+
Server server = createService(SERVICE_URI_BINARY, new TestServiceRestBinary(), loggingFeature);
server.start();
WebClient client = createClient(SERVICE_URI_BINARY, loggingFeature);
client.get(InputStream.class).close();
- loggingFeature.setLogBinary(true);
+ client.close();
+
+ List<LogEvent> events = sender.getEvents();
+ await().until(() -> events.size(), is(4));
+ server.stop();
+ server.destroy();
+
+ Assert.assertEquals(4, events.size());
+
+ assertContentLogged(events.get(0));
+ assertContentLogged(events.get(1));
+ assertContentLogged(events.get(2));
+ assertContentLogged(events.get(3));
+ }
+
+ @Test
+ public void testNonBinary() throws IOException, InterruptedException {
+ LoggingFeature loggingFeature = new LoggingFeature();
+ TestEventSender sender = new TestEventSender();
+ loggingFeature.setSender(sender);
+ Server server = createService(SERVICE_URI_BINARY, new TestServiceRestBinary(), loggingFeature);
+ server.start();
+ WebClient client = createClient(SERVICE_URI_BINARY, loggingFeature);
client.get(InputStream.class).close();
client.close();
List<LogEvent> events = sender.getEvents();
- await().until(() -> events.size(), is(8));
+ await().until(() -> events.size(), is(4));
server.stop();
server.destroy();
- Assert.assertEquals(8, events.size());
+ Assert.assertEquals(4, events.size());
- // First call with binary logging false
assertContentLogged(events.get(0));
assertContentLogged(events.get(1));
assertContentNotLogged(events.get(2));
assertContentNotLogged(events.get(3));
-
- // Second call with binary logging true
- assertContentLogged(events.get(4));
- assertContentLogged(events.get(5));
- assertContentLogged(events.get(6));
- assertContentLogged(events.get(7));
}
@Test