(ws-axiom) branch master updated: Make use of assertThrows

[veithen]

This is an automated email from the ASF dual-hosted git repository.

veithen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ws-axiom.git


The following commit(s) were added to refs/heads/master by this push:
     new aed7afbf4 Make use of assertThrows
aed7afbf4 is described below

commit aed7afbf478a8e54d61a886050835de03a35e499
Author: Andreas Veithen <andreas.veit...@gmail.com>
AuthorDate: Sun Mar 23 11:55:08 2025 +0000

    Make use of assertThrows
---
 .../scenario/broker/BrokerScenarioTest.java        |  7 ++++---
 .../scenario/validation/ValidationTest.java        | 22 ++++++++++------------
 ...rviceMessageFromInputStreamVersionMismatch.java | 16 ++++++++--------
 3 files changed, 22 insertions(+), 23 deletions(-)

diff --git 
a/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/scenario/broker/BrokerScenarioTest.java
 
b/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/scenario/broker/BrokerScenarioTest.java
index b18ff2442..305b42907 100644
--- 
a/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/scenario/broker/BrokerScenarioTest.java
+++ 
b/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/scenario/broker/BrokerScenarioTest.java
@@ -18,6 +18,8 @@
  */
 package org.apache.axiom.ts.springws.scenario.broker;
 
+import static org.junit.Assert.assertThrows;
+
 import java.util.Locale;
 
 import javax.xml.transform.Source;
@@ -73,9 +75,8 @@ public class BrokerScenarioTest extends ScenarioTestCase {
         Locale oldLocale = Locale.getDefault();
         Locale.setDefault(Locale.ENGLISH);
         try {
-            client.order(order);
-            fail("Expected SoapFaultClientException");
-        } catch (SoapFaultClientException ex) {
+            SoapFaultClientException ex =
+                    assertThrows(SoapFaultClientException.class, () -> 
client.order(order));
             assertEquals(spec.getSenderFaultCode(), ex.getFaultCode());
             assertEquals("Customer 23629 unknown", ex.getMessage());
         } finally {
diff --git 
a/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/scenario/validation/ValidationTest.java
 
b/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/scenario/validation/ValidationTest.java
index a5bffe24e..133fd5d08 100644
--- 
a/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/scenario/validation/ValidationTest.java
+++ 
b/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/scenario/validation/ValidationTest.java
@@ -18,6 +18,8 @@
  */
 package org.apache.axiom.ts.springws.scenario.validation;
 
+import static org.junit.Assert.assertThrows;
+
 import java.util.Iterator;
 
 import javax.xml.namespace.QName;
@@ -39,17 +41,13 @@ public class ValidationTest extends ScenarioTestCase {
 
         assertEquals(105.37, client.getQuote("GOOG"), 0.001);
 
-        try {
-            client.getQuote("TOOLONG");
-            fail("Expected SoapFaultClientException");
-        } catch (SoapFaultClientException ex) {
-            assertEquals(spec.getSenderFaultCode(), ex.getFaultCode());
-            Iterator<SoapFaultDetailElement> it =
-                    ex.getSoapFault().getFaultDetail().getDetailEntries();
-            assertTrue(it.hasNext());
-            assertEquals(
-                    new QName("http://springframework.org/spring-ws";, 
"ValidationError"),
-                    it.next().getName());
-        }
+        SoapFaultClientException ex =
+                assertThrows(SoapFaultClientException.class, () -> 
client.getQuote("TOOLONG"));
+        assertEquals(spec.getSenderFaultCode(), ex.getFaultCode());
+        Iterator<SoapFaultDetailElement> it = 
ex.getSoapFault().getFaultDetail().getDetailEntries();
+        assertTrue(it.hasNext());
+        assertEquals(
+                new QName("http://springframework.org/spring-ws";, 
"ValidationError"),
+                it.next().getName());
     }
 }
diff --git 
a/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/soap/messagefactory/TestCreateWebServiceMessageFromInputStreamVersionMismatch.java
 
b/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/soap/messagefactory/TestCreateWebServiceMessageFromInputStreamVersionMismatch.java
index 9957249bd..2e55eff0f 100644
--- 
a/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/soap/messagefactory/TestCreateWebServiceMessageFromInputStreamVersionMismatch.java
+++ 
b/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/soap/messagefactory/TestCreateWebServiceMessageFromInputStreamVersionMismatch.java
@@ -18,6 +18,8 @@
  */
 package org.apache.axiom.ts.springws.soap.messagefactory;
 
+import static org.junit.Assert.assertThrows;
+
 import java.io.InputStream;
 
 import org.apache.axiom.ts.soap.SOAPSampleSet;
@@ -40,13 +42,11 @@ public class 
TestCreateWebServiceMessageFromInputStreamVersionMismatch extends S
 
     @Override
     protected void runTest(SoapMessageFactory messageFactory) throws Throwable 
{
-        try {
-            messageFactory.createWebServiceMessage(
-                    new TransportInputStreamImpl(
-                            
SOAPSampleSet.NO_HEADER.getMessage(spec.getAltSpec())));
-            fail("Expected SoapMessageCreationException");
-        } catch (SoapMessageCreationException ex) {
-            // Expected
-        }
+        assertThrows(
+                SoapMessageCreationException.class,
+                () ->
+                        messageFactory.createWebServiceMessage(
+                                new TransportInputStreamImpl(
+                                        
SOAPSampleSet.NO_HEADER.getMessage(spec.getAltSpec()))));
     }
 }