[CXF-9042] Fixed non-idempotent unit tests (apache#1978)

* fixed non-idempotent unit tests * updated MBeans unregistering * create new document when creating token wrapper (cherry picked from commit 0740778) (cherry picked from commit 9f0f6d7) (cherry picked from commit 1a13da7)
Talend · Aug 3, 2024 · f0328f9 · f0328f9
1 parent 2616f63
commit f0328f9
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 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
@@ -89,23 +89,30 @@ public void testWorkQueueInstrumentation() throws Exception {
         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/...ts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateJWTTransformationTest.java b/...ts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateJWTTransformationTest.java
@@ -338,7 +338,7 @@ public void testSAMLToJWTTransformation() throws Exception {
     }
 
     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
@@ -625,6 +625,11 @@ private void doJAXBPayload(Dispatch<Object> disp) throws Exception {
 
     @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 void testJAXBObjectPAYLOADWithFeature() throws Exception {
         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);
     }