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 2024/08/03 16:41:10 UTC
(cxf) branch 3.5.x-fixes updated (2616f6380a -> 3cebcf6603)
This is an automated email from the ASF dual-hosted git repository.
reta pushed a change to branch 3.5.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
from 2616f6380a Recording .gitmergeinfo Changes
new f0328f957a [CXF-9042] Fixed non-idempotent unit tests (#1978)
new 3cebcf6603 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 | 5 +++
.../cxf/management/InstrumentationManagerTest.java | 37 +++++++++++++---------
.../operation/ValidateJWTTransformationTest.java | 2 +-
.../systest/dispatch/DispatchClientServerTest.java | 15 +++++----
4 files changed, 37 insertions(+), 22 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.5.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 3cebcf6603faff9ba977d32b291ad56ee1355632
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Sat Aug 3 12:33:47 2024 -0400
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 6476c12cb8..f1d5ddbb9d 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -53,6 +53,7 @@ B 1d12d535fafc758640fb4c0a9e6acf47b4ff3cd2
B 1e50ab9d2f5d107b4a00aba69ab2357464bab329
B 1e7169c627d6908118f99dc98d774ffb53dd38c6
B 1f1bc3e036232d6afe8f447021d9604154fcca72
+B 1f70276da2d945dbea0f4c36cfd60260514fb724
B 1fccd47727c76524ca32714ff35f060aa37e1a9a
B 208eb4e3cbdf99a6aae0658a47bc9f5eaa803669
B 210cd832ef91c2f95569859b45b59c846d54ff97
@@ -665,6 +666,7 @@ M 4ac6fd8afd4647b4454d000f25005baf328bb021
M 4b14e146b096e09111e828c132c45ee5ea3e8f40
M 4b51a9540867466a4e966df9f6e15387919da7bc
M 4e25650e84daa3293ce20c65b572b8f7de05c8a8
+M 4e8ef3587d137172f298bf2fcdb355e0c007d9bc
M 4ef710250f5bb21bbcd3c5fd672543b06c1acb73
M 4f128130f7ce73089f2cc7079beb3e608dbe2af9
M 4f5b943e7286fa562d563a6224c6a099e8aadc0f
@@ -699,6 +701,7 @@ M 584b08ae11803f5c24725cdc0ad7c0b0b507927d
M 58d27b80335ec6246e542e367002b480ed7e9a69
M 58dc25cb2c441511a7ca65476e7a84d5d3df167b
M 58f74f5f6d156c4c368067801d2ff31c8ff2d069
+M 5943a9b715f027b2c84c443c33d5af9717fcc50a
M 5a17e6d7315f867b3a185c443bd5ec09a2bc1004
M 5b69dd06a61a8985e9166108e66e56f481a438cf
M 5b9788a6dd477113da850f5eea48cde9064eac01
@@ -743,6 +746,7 @@ M 6accc00a20bc51189a673153158c7d5653e3b930
M 6ae75647f08feeec514f343845d9f394d7fa5553
M 6afa014ed2942239bfa05956edad48ebaaa6ec2a
M 6c0ce887980ab168850ed6f8445f479598661382
+M 6cadb273e846dc0606941d29cb8eee7dad410dab
M 6d00f9b2ca2f7fa6936fb3868e7e29594bbc70d6
M 6d68137820399873504ea5d7edeee12b0c17aaec
M 6e55ace33716ec4b1f0ae79fe2e77d9db19d5245
@@ -1006,6 +1010,7 @@ M d86920ce70dfe74836f18180dc5d47c8437f0250
M d891059f0de95a27e69179a0bfa0e80eb251bb3f
M d8ac520f6089397a0801c20ccb502a5c3faef5b0
M d8d9b2d14341a79a95d64dc4ccdded810851c25c
+M d9b9caabea3f0aafe44994e74a95a4f3fb8dad9e
M da023814778f38a1dff4ce1572f43e0c66277f0a
M da38965e316064ddf61720d2383d6faa0cfb2d0a
M da64ddaeb7bf88a69ec04c2c3c6185bf558d2434
(cxf) 01/02: [CXF-9042] Fixed non-idempotent unit tests (#1978)
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.5.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit f0328f957a6d56f99a5580dc87056aa953bd209a
Author: Kaiyao Ke <47...@users.noreply.github.com>
AuthorDate: Fri Aug 2 21:35:00 2024 +0800
[CXF-9042] Fixed non-idempotent unit tests (#1978)
* fixed non-idempotent unit tests
* updated MBeans unregistering
* create new document when creating token wrapper
(cherry picked from commit 0740778cbc6e159a99a3811113b71440dd841236)
(cherry picked from commit 9f0f6d7d4ffaae183b1d4f3ad980081ee3082e29)
(cherry picked from commit 1a13da7f9e717121f9e7923ace259bd9ec4a7c8b)
---
.../cxf/management/InstrumentationManagerTest.java | 37 +++++++++++++---------
.../operation/ValidateJWTTransformationTest.java | 2 +-
.../systest/dispatch/DispatchClientServerTest.java | 15 +++++----
3 files changed, 32 insertions(+), 22 deletions(-)
diff --git a/rt/management/src/test/java/org/apache/cxf/management/InstrumentationManagerTest.java b/rt/management/src/test/java/org/apache/cxf/management/InstrumentationManagerTest.java
index 39ab81ac2d..5e0a136613 100644
--- a/rt/management/src/test/java/org/apache/cxf/management/InstrumentationManagerTest.java
+++ b/rt/management/src/test/java/org/apache/cxf/management/InstrumentationManagerTest.java
@@ -89,23 +89,30 @@ public class InstrumentationManagerTest {
ObjectName name = new ObjectName(ManagementConstants.DEFAULT_DOMAIN_NAME
+ ":type=WorkQueues,*");
Set<ObjectName> s = mbs.queryNames(name, null);
- assertEquals(2, s.size());
- Iterator<ObjectName> it = s.iterator();
- while (it.hasNext()) {
- ObjectName n = it.next();
- Long result =
- (Long)mbs.invoke(n, "getWorkQueueMaxSize", new Object[0], new String[0]);
- assertEquals(result, Long.valueOf(256));
- Integer hwm =
- (Integer)mbs.invoke(n, "getHighWaterMark", new Object[0], new String[0]);
- if (n.getCanonicalName().contains("test-wq")) {
- assertEquals(10, hwm.intValue());
- } else {
- assertEquals(15, hwm.intValue());
+ try {
+ assertEquals(2, s.size());
+ Iterator<ObjectName> it = s.iterator();
+ while (it.hasNext()) {
+ ObjectName n = it.next();
+ Long result =
+ (Long)mbs.invoke(n, "getWorkQueueMaxSize", new Object[0], new String[0]);
+ assertEquals(result, Long.valueOf(256));
+ Integer hwm =
+ (Integer)mbs.invoke(n, "getHighWaterMark", new Object[0], new String[0]);
+ if (n.getCanonicalName().contains("test-wq")) {
+ assertEquals(10, hwm.intValue());
+ } else {
+ assertEquals(15, hwm.intValue());
+ }
}
+ } finally {
+ // Unregister MBeans at the end of the test
+ Iterator<ObjectName> it2 = s.iterator();
+ while (it2.hasNext()) {
+ mbs.unregisterMBean(it2.next());
+ }
+ bus.shutdown(true);
}
-
- bus.shutdown(true);
}
@Test
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateJWTTransformationTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateJWTTransformationTest.java
index 36427a1d9c..97273e1d1a 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateJWTTransformationTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateJWTTransformationTest.java
@@ -338,7 +338,7 @@ public class ValidateJWTTransformationTest {
}
private Element createTokenWrapper(String token) {
- Document doc = DOMUtils.getEmptyDocument();
+ Document doc = DOMUtils.createDocument();
Element tokenWrapper = doc.createElementNS(null, "TokenWrapper");
tokenWrapper.setTextContent(token);
return tokenWrapper;
diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/DispatchClientServerTest.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/DispatchClientServerTest.java
index b50a85b91c..eee4457614 100644
--- a/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/DispatchClientServerTest.java
+++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/DispatchClientServerTest.java
@@ -625,6 +625,11 @@ public class DispatchClientServerTest extends AbstractBusClientServerTestBase {
@Test
public void testJAXBObjectPAYLOADWithFeature() throws Exception {
+ // Save initial counts
+ int initialCount = TestDispatchFeature.getCount();
+ int initialInInterceptorCount = TestDispatchFeature.getInInterceptorCount();
+ int initialOutInterceptorCount = TestDispatchFeature.getOutInterceptorCount();
+
createBus("org/apache/cxf/systest/dispatch/client-config.xml");
BusFactory.setThreadDefaultBus(bus);
@@ -654,15 +659,13 @@ public class DispatchClientServerTest extends AbstractBusClientServerTestBase {
String responseValue = ((GreetMeResponse)response).getResponseType();
assertEquals("Expected string, " + expected, expected, responseValue);
- assertEquals("Feature should be applied", 1, TestDispatchFeature.getCount());
+ assertEquals("Feature should be applied", initialCount + 1, TestDispatchFeature.getCount());
assertEquals("Feature based interceptors should be added",
- 1, TestDispatchFeature.getCount());
-
+ initialCount + 1, TestDispatchFeature.getCount());
assertEquals("Feature based In interceptors has be added to in chain.",
- 1, TestDispatchFeature.getInInterceptorCount());
-
+ initialInInterceptorCount + 1, TestDispatchFeature.getInInterceptorCount());
assertEquals("Feature based interceptors has to be added to out chain.",
- 1, TestDispatchFeature.getOutInterceptorCount());
+ initialOutInterceptorCount + 1, TestDispatchFeature.getOutInterceptorCount());
bus.shutdown(true);
}