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 2019/01/08 11:59:20 UTC
[cxf] branch master updated: Removining unnecessary imports
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/master by this push:
new 29e5bb4 Removining unnecessary imports
29e5bb4 is described below
commit 29e5bb404e6b44a643e9228712f495244ea275e2
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Tue Jan 8 11:59:04 2019 +0000
Removining unnecessary imports
---
.../cxf/attachment/AttachmentDeserializerTest.java | 5 +-
.../apache/cxf/jaxrs/impl/ResponseImplTest.java | 5 +-
.../apache/cxf/jaxws/JAXWSMethodInvokerTest.java | 11 ++---
.../provider/AbstractOAuthDataProviderTest.java | 9 ++--
.../cxf/transport/jms/JMSHeaderTypeTest.java | 5 +-
.../cxf/sts/operation/IssueJWTClaimsUnitTest.java | 10 ++--
.../sts/token/provider/SAMLProviderActAsTest.java | 12 ++---
.../sts/kerberos/KerberosDelegationTokenTest.java | 2 +-
.../org/apache/cxf/systest/sts/jaas/JAASTest.java | 4 +-
.../apache/cxf/systest/sts/rest/STSRESTTest.java | 13 +++---
.../sts/stsclient/STSTokenOutInterceptorTest.java | 2 +-
.../sts/stsclient/STSTokenRetrieverTest.java | 2 +-
.../systest/jaxrs/JAXRS20ClientServerBookTest.java | 3 +-
.../systest/jaxrs/provider/JAXBProviderTest.java | 2 +-
.../oauth2/grants/AuthorizationGrantTest.java | 15 +++---
.../systest/jaxrs/security/oidc/OIDCFlowTest.java | 53 +++++++++++-----------
.../jaxrs/security/oidc/OIDCNegativeTest.java | 2 +-
.../systest/jaxrs/security/oidc/UserInfoTest.java | 21 ++++-----
.../cxf/systest/jms/JMSClientServerTest.java | 3 +-
.../cxf/systest/http/auth/DigestAuthTest.java | 4 +-
.../transform/feature/TransformFeatureTest.java | 5 +-
.../cxf/systest/ws/rm/SequenceTimeoutTest.java | 2 +-
.../cxf/systest/ws/rm/WSRM12ServerCycleTest.java | 3 +-
.../cxf/tools/validator/internal/Stax2DOMTest.java | 5 +-
24 files changed, 91 insertions(+), 107 deletions(-)
diff --git a/core/src/test/java/org/apache/cxf/attachment/AttachmentDeserializerTest.java b/core/src/test/java/org/apache/cxf/attachment/AttachmentDeserializerTest.java
index cfa7ee0..d778601 100644
--- a/core/src/test/java/org/apache/cxf/attachment/AttachmentDeserializerTest.java
+++ b/core/src/test/java/org/apache/cxf/attachment/AttachmentDeserializerTest.java
@@ -46,7 +46,6 @@ import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.message.XMLMessage;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
@@ -85,9 +84,9 @@ public class AttachmentDeserializerTest {
+ "------=_Part_34950_1098328613.1263781527359--";
Matcher m = Pattern.compile("^--(\\S*)$").matcher(message);
- Assert.assertFalse(m.find());
+ assertFalse(m.find());
m = Pattern.compile("^--(\\S*)$", Pattern.MULTILINE).matcher(message);
- Assert.assertTrue(m.find());
+ assertTrue(m.find());
msg = new MessageImpl();
msg.setContent(InputStream.class, new ByteArrayInputStream(message.getBytes(StandardCharsets.UTF_8)));
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/ResponseImplTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/ResponseImplTest.java
index 0b5f308..9fec53b 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/ResponseImplTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/ResponseImplTest.java
@@ -61,7 +61,6 @@ import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.staxutils.StaxUtils;
import org.easymock.EasyMock;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
@@ -82,7 +81,7 @@ public class ResponseImplTest {
Response response = Response.status(Response.Status.INTERNAL_SERVER_ERROR)
.entity(str)
.build();
- Assert.assertEquals(str, response.readEntity(String.class));
+ assertEquals(str, response.readEntity(String.class));
}
@Test
@@ -533,4 +532,4 @@ public class ResponseImplTest {
}
}
-}
\ No newline at end of file
+}
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/JAXWSMethodInvokerTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/JAXWSMethodInvokerTest.java
index bb9dc0d..69abf71 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/JAXWSMethodInvokerTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/JAXWSMethodInvokerTest.java
@@ -55,7 +55,6 @@ import org.apache.cxf.service.invoker.MethodDispatcher;
import org.apache.cxf.service.model.BindingOperationInfo;
import org.easymock.EasyMock;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
@@ -123,7 +122,7 @@ public class JAXWSMethodInvokerTest {
fail("Expected fault");
} catch (Fault fault) {
Message outMsg = ex.getOutMessage();
- Assert.assertNull(outMsg);
+ assertNull(outMsg);
}
}
@@ -145,11 +144,11 @@ public class JAXWSMethodInvokerTest {
fail("Expected fault");
} catch (Fault fault) {
Message outMsg = ex.getOutMessage();
- Assert.assertNotNull(outMsg);
+ assertNotNull(outMsg);
@SuppressWarnings("unchecked")
List<Header> headers = (List<Header>)outMsg.get(Header.HEADER_LIST);
- Assert.assertEquals(1, headers.size());
- Assert.assertEquals(TEST_HEADER_NAME, headers.get(0).getName());
+ assertEquals(1, headers.size());
+ assertEquals(TEST_HEADER_NAME, headers.get(0).getName());
}
}
@@ -300,4 +299,4 @@ public class JAXWSMethodInvokerTest {
return inMessage;
}
-}
\ No newline at end of file
+}
diff --git a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/provider/AbstractOAuthDataProviderTest.java b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/provider/AbstractOAuthDataProviderTest.java
index 8a676d5..7c2fadd 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/provider/AbstractOAuthDataProviderTest.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/provider/AbstractOAuthDataProviderTest.java
@@ -41,7 +41,6 @@ import org.apache.cxf.rs.security.oauth2.tokens.refresh.RefreshToken;
import org.apache.cxf.rs.security.oauth2.utils.OAuthConstants;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
@@ -365,11 +364,11 @@ abstract class AbstractOAuthDataProviderTest {
JwtToken jwt = jwtConsumer.getJwtToken();
// Validate claims
- Assert.assertNotNull(jwt.getClaim(JwtConstants.CLAIM_EXPIRY));
- Assert.assertNotNull(jwt.getClaim(JwtConstants.CLAIM_ISSUED_AT));
+ assertNotNull(jwt.getClaim(JwtConstants.CLAIM_EXPIRY));
+ assertNotNull(jwt.getClaim(JwtConstants.CLAIM_ISSUED_AT));
- Assert.assertTrue(jwtConsumer.verifySignatureWith(keyPair.getPublic(), SignatureAlgorithm.RS256));
+ assertTrue(jwtConsumer.verifySignatureWith(keyPair.getPublic(), SignatureAlgorithm.RS256));
}
}
-}
\ No newline at end of file
+}
diff --git a/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSHeaderTypeTest.java b/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSHeaderTypeTest.java
index bc671d7..8e0e84d 100644
--- a/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSHeaderTypeTest.java
+++ b/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSHeaderTypeTest.java
@@ -27,7 +27,6 @@ import javax.jms.Session;
import org.apache.activemq.ActiveMQConnectionFactory;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
@@ -43,7 +42,7 @@ public class JMSHeaderTypeTest {
message.setStringProperty(CONVERTED_RESPONSE_KEY, TEST_VALUE);
JMSMessageHeadersType messageHeaders = JMSMessageHeadersType.from(message);
Set<String> keys = messageHeaders.getPropertyKeys();
- Assert.assertEquals(1, keys.size());
+ assertEquals(1, keys.size());
assertEquals(TEST_VALUE, messageHeaders.getProperty(org.apache.cxf.message.Message.RESPONSE_CODE));
}
@@ -54,7 +53,7 @@ public class JMSHeaderTypeTest {
messageHeaders.putProperty(org.apache.cxf.message.Message.RESPONSE_CODE, TEST_VALUE);
messageHeaders.writeTo(message);
- Assert.assertEquals(CONVERTED_RESPONSE_KEY, message.getPropertyNames().nextElement());
+ assertEquals(CONVERTED_RESPONSE_KEY, message.getPropertyNames().nextElement());
}
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTClaimsUnitTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTClaimsUnitTest.java
index b0cd472..3fb5c03 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTClaimsUnitTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTClaimsUnitTest.java
@@ -87,8 +87,6 @@ import org.apache.wss4j.common.principal.CustomTokenPrincipal;
import org.apache.wss4j.common.saml.builder.SAML2Constants;
import org.apache.wss4j.common.util.DOM2Writer;
-import org.junit.Assert;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
@@ -160,7 +158,7 @@ public class IssueJWTClaimsUnitTest {
// Validate the token
JwsJwtCompactConsumer jwtConsumer = new JwsJwtCompactConsumer(token.getTextContent());
JwtToken jwt = jwtConsumer.getJwtToken();
- Assert.assertEquals("alice", jwt.getClaim(JwtConstants.CLAIM_SUBJECT));
+ assertEquals("alice", jwt.getClaim(JwtConstants.CLAIM_SUBJECT));
assertEquals(jwt.getClaim(ClaimTypes.LASTNAME.toString()), "doe");
assertEquals(jwt.getClaim(ROLE_CLAIM.toString()), "administrator");
}
@@ -288,7 +286,7 @@ public class IssueJWTClaimsUnitTest {
// Validate the token
JwsJwtCompactConsumer jwtConsumer = new JwsJwtCompactConsumer(token.getTextContent());
JwtToken jwt = jwtConsumer.getJwtToken();
- Assert.assertEquals("alice", jwt.getClaim(JwtConstants.CLAIM_SUBJECT));
+ assertEquals("alice", jwt.getClaim(JwtConstants.CLAIM_SUBJECT));
assertEquals(jwt.getClaim(ClaimTypes.LASTNAME.toString()), "doe");
}
@@ -417,7 +415,7 @@ public class IssueJWTClaimsUnitTest {
JwsJwtCompactConsumer jwtConsumer = new JwsJwtCompactConsumer(token.getTextContent());
JwtToken jwt = jwtConsumer.getJwtToken();
// subject unchanged
- Assert.assertEquals("alice", jwt.getClaim(JwtConstants.CLAIM_SUBJECT));
+ assertEquals("alice", jwt.getClaim(JwtConstants.CLAIM_SUBJECT));
// transformed claim (to uppercase)
assertEquals(jwt.getClaim(ClaimTypes.LASTNAME.toString()), "DOE");
}
@@ -568,7 +566,7 @@ public class IssueJWTClaimsUnitTest {
JwsJwtCompactConsumer jwtConsumer = new JwsJwtCompactConsumer(token.getTextContent());
JwtToken jwt = jwtConsumer.getJwtToken();
// subject changed (to uppercase)
- Assert.assertEquals("ALICE", jwt.getClaim(JwtConstants.CLAIM_SUBJECT));
+ assertEquals("ALICE", jwt.getClaim(JwtConstants.CLAIM_SUBJECT));
// claim unchanged but requested
assertEquals(jwt.getClaim(ClaimTypes.LASTNAME.toString()), "doe");
}
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderActAsTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderActAsTest.java
index cc0865c..2d365c7 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderActAsTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderActAsTest.java
@@ -118,7 +118,7 @@ public class SAMLProviderActAsTest {
}
}
- Assert.assertTrue(foundActAsAttribute);
+ assertTrue(foundActAsAttribute);
}
/**
@@ -166,7 +166,7 @@ public class SAMLProviderActAsTest {
}
}
- Assert.assertTrue(foundActAsAttribute);
+ assertTrue(foundActAsAttribute);
}
/**
@@ -277,7 +277,7 @@ public class SAMLProviderActAsTest {
}
}
- Assert.assertTrue(foundActAsAttribute);
+ assertTrue(foundActAsAttribute);
// Check that claims are also present
String tokenString = DOM2Writer.nodeToString(token);
@@ -335,7 +335,7 @@ public class SAMLProviderActAsTest {
}
}
- Assert.assertTrue(foundActAsAttribute);
+ assertTrue(foundActAsAttribute);
// Now get another token "ActAs" the previous token
providerParameters =
@@ -376,8 +376,8 @@ public class SAMLProviderActAsTest {
}
}
- Assert.assertTrue(foundBob);
- Assert.assertTrue(foundTechnical);
+ assertTrue(foundBob);
+ assertTrue(foundTechnical);
}
private Element getSAMLAssertion() throws Exception {
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/kerberos/KerberosDelegationTokenTest.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/kerberos/KerberosDelegationTokenTest.java
index 400de63..5ac8758 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/kerberos/KerberosDelegationTokenTest.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/kerberos/KerberosDelegationTokenTest.java
@@ -135,7 +135,7 @@ public class KerberosDelegationTokenTest extends AbstractBusClientServerTestBase
WebClient.getConfig(client).getHttpConduit().setAuthSupplier(authSupplier);
int resp = client.post(numToDouble, Integer.class);
- org.junit.Assert.assertEquals(2 * numToDouble, resp);
+ assertEquals(2 * numToDouble, resp);
}
private static void doubleIt(DoubleItPortType port, int numToDouble) {
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/jaas/JAASTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/jaas/JAASTest.java
index 8f4eda1..d90cda1 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/jaas/JAASTest.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/jaas/JAASTest.java
@@ -407,12 +407,12 @@ public class JAASTest extends AbstractBusClientServerTestBase {
if (authFailureExpected) {
throw new RuntimeException("Exception expected");
}
- org.junit.Assert.assertEquals(2 * numToDouble, resp);
+ assertEquals(2 * numToDouble, resp);
} catch (WebApplicationException ex) {
if (!authFailureExpected) {
throw new RuntimeException("Unexpected exception");
}
- org.junit.Assert.assertEquals(500, ex.getResponse().getStatus());
+ assertEquals(500, ex.getResponse().getStatus());
}
}
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/rest/STSRESTTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/rest/STSRESTTest.java
index 78492aa..f036868 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/rest/STSRESTTest.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/rest/STSRESTTest.java
@@ -72,7 +72,6 @@ import org.apache.wss4j.dom.handler.RequestData;
import org.apache.wss4j.dom.processor.Processor;
import org.apache.wss4j.dom.processor.SAMLTokenProcessor;
-import org.junit.Assert;
import org.junit.BeforeClass;
import static org.junit.Assert.assertEquals;
@@ -1331,22 +1330,22 @@ public class STSRESTTest extends AbstractBusClientServerTestBase {
JwtToken jwt = jwtConsumer.getJwtToken();
// Validate claims
- Assert.assertEquals("DoubleItSTSIssuer", jwt.getClaim(JwtConstants.CLAIM_ISSUER));
+ assertEquals("DoubleItSTSIssuer", jwt.getClaim(JwtConstants.CLAIM_ISSUER));
if (audience != null) {
@SuppressWarnings("unchecked")
List<String> audiences = (List<String>)jwt.getClaim(JwtConstants.CLAIM_AUDIENCE);
assertEquals(1, audiences.size());
- Assert.assertEquals(audience, audiences.get(0));
+ assertEquals(audience, audiences.get(0));
}
- Assert.assertNotNull(jwt.getClaim(JwtConstants.CLAIM_EXPIRY));
- Assert.assertNotNull(jwt.getClaim(JwtConstants.CLAIM_ISSUED_AT));
+ assertNotNull(jwt.getClaim(JwtConstants.CLAIM_EXPIRY));
+ assertNotNull(jwt.getClaim(JwtConstants.CLAIM_ISSUED_AT));
KeyStore keystore = KeyStore.getInstance("JKS");
keystore.load(Loader.getResource("keys/servicestore.jks").openStream(), "sspass".toCharArray());
Certificate cert = keystore.getCertificate("mystskey");
- Assert.assertNotNull(cert);
+ assertNotNull(cert);
- Assert.assertTrue(jwtConsumer.verifySignatureWith((X509Certificate)cert,
+ assertTrue(jwtConsumer.verifySignatureWith((X509Certificate)cert,
SignatureAlgorithm.RS256));
}
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/stsclient/STSTokenOutInterceptorTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/stsclient/STSTokenOutInterceptorTest.java
index e9b0c0c..5d7a636 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/stsclient/STSTokenOutInterceptorTest.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/stsclient/STSTokenOutInterceptorTest.java
@@ -330,7 +330,7 @@ public class STSTokenOutInterceptorTest extends AbstractBusClientServerTestBase
Assert.assertNotNull(token);
Assert.assertEquals(TOKEN_TYPE_SAML_2_0, token.getTokenType());
Assert.assertNotNull(token.getId());
- Assert.assertTrue(token.getExpires().isAfter(Instant.now()));
+ assertTrue(token.getExpires().isAfter(Instant.now()));
Assert.assertEquals("Assertion", token.getToken().getLocalName());
}
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/stsclient/STSTokenRetrieverTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/stsclient/STSTokenRetrieverTest.java
index e545c6a..c9f1eee 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/stsclient/STSTokenRetrieverTest.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/stsclient/STSTokenRetrieverTest.java
@@ -268,7 +268,7 @@ public class STSTokenRetrieverTest extends AbstractBusClientServerTestBase {
Assert.assertNotNull(token);
Assert.assertEquals(TOKEN_TYPE_SAML_2_0, token.getTokenType());
Assert.assertNotNull(token.getId());
- Assert.assertTrue(token.getExpires().isAfter(Instant.now()));
+ assertTrue(token.getExpires().isAfter(Instant.now()));
Assert.assertEquals("Assertion", token.getToken().getLocalName());
}
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRS20ClientServerBookTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRS20ClientServerBookTest.java
index 96f4f06..81e4ed7 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRS20ClientServerBookTest.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRS20ClientServerBookTest.java
@@ -71,7 +71,6 @@ import org.apache.cxf.jaxrs.utils.JAXRSUtils;
import org.apache.cxf.systest.jaxrs.BookStore.BookInfo;
import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -983,7 +982,7 @@ public class JAXRS20ClientServerBookTest extends AbstractBusClientServerTestBase
ClientResponseContext respContext) throws IOException {
MultivaluedMap<String, String> headers = respContext.getHeaders();
if (!local) {
- Assert.assertEquals(1, headers.get("Date").size());
+ assertEquals(1, headers.get("Date").size());
}
headers.putSingle(HttpHeaders.LOCATION, "http://localhost/redirect");
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/provider/JAXBProviderTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/provider/JAXBProviderTest.java
index c90907b..960bad1 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/provider/JAXBProviderTest.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/provider/JAXBProviderTest.java
@@ -85,7 +85,7 @@ public class JAXBProviderTest extends AbstractBusClientServerTestBase {
String.class, "test");
Response response = client.post(test);
String result = response.readEntity(String.class);
- Assert.assertTrue(result.contains("<jaxbelement xmlns=\"org.apache.cxf\">test</jaxbelement>"));
+ assertTrue(result.contains("<jaxbelement xmlns=\"org.apache.cxf\">test</jaxbelement>"));
Assert.assertFalse(result.contains("WriteInCXFJaxbProvider"));
}
}
diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/grants/AuthorizationGrantTest.java b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/grants/AuthorizationGrantTest.java
index 7b4846f..0bbc369 100644
--- a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/grants/AuthorizationGrantTest.java
+++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/grants/AuthorizationGrantTest.java
@@ -52,7 +52,6 @@ import org.apache.cxf.testutil.common.TestUtil;
import org.apache.xml.security.utils.ClassLoaderUtils;
import org.junit.AfterClass;
-import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized.Parameters;
@@ -471,9 +470,9 @@ public class AuthorizationGrantTest extends AbstractBusClientServerTestBase {
keystore.load(ClassLoaderUtils.getResourceAsStream("keys/alice.jks", this.getClass()),
"password".toCharArray());
Certificate cert = keystore.getCertificate("alice");
- Assert.assertNotNull(cert);
+ assertNotNull(cert);
- Assert.assertTrue(jwtConsumer.verifySignatureWith((X509Certificate)cert,
+ assertTrue(jwtConsumer.verifySignatureWith((X509Certificate)cert,
SignatureAlgorithm.RS256));
}
}
@@ -545,17 +544,17 @@ public class AuthorizationGrantTest extends AbstractBusClientServerTestBase {
JwtToken jwt = jwtConsumer.getJwtToken();
// Validate claims
- Assert.assertNotNull(jwt.getClaim(JwtConstants.CLAIM_SUBJECT));
- Assert.assertNotNull(jwt.getClaim(JwtConstants.CLAIM_EXPIRY));
- Assert.assertNotNull(jwt.getClaim(JwtConstants.CLAIM_ISSUED_AT));
+ assertNotNull(jwt.getClaim(JwtConstants.CLAIM_SUBJECT));
+ assertNotNull(jwt.getClaim(JwtConstants.CLAIM_EXPIRY));
+ assertNotNull(jwt.getClaim(JwtConstants.CLAIM_ISSUED_AT));
KeyStore keystore = KeyStore.getInstance("JKS");
keystore.load(ClassLoaderUtils.getResourceAsStream("keys/alice.jks", this.getClass()),
"password".toCharArray());
Certificate cert = keystore.getCertificate("alice");
- Assert.assertNotNull(cert);
+ assertNotNull(cert);
- Assert.assertTrue(jwtConsumer.verifySignatureWith((X509Certificate)cert,
+ assertTrue(jwtConsumer.verifySignatureWith((X509Certificate)cert,
SignatureAlgorithm.RS256));
}
diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oidc/OIDCFlowTest.java b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oidc/OIDCFlowTest.java
index c95f609..aecda92 100644
--- a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oidc/OIDCFlowTest.java
+++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oidc/OIDCFlowTest.java
@@ -59,7 +59,6 @@ import org.apache.cxf.testutil.common.TestUtil;
import org.apache.xml.security.utils.ClassLoaderUtils;
import org.junit.AfterClass;
-import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized.Parameters;
@@ -509,8 +508,8 @@ public class OIDCFlowTest extends AbstractBusClientServerTestBase {
JwsJwtCompactConsumer jwtConsumer = new JwsJwtCompactConsumer(idToken);
JwtToken jwt = jwtConsumer.getJwtToken();
- Assert.assertNotNull(jwt.getClaims().getClaim(IdToken.ACCESS_TOKEN_HASH_CLAIM));
- Assert.assertNotNull(jwt.getClaims().getClaim(IdToken.NONCE_CLAIM));
+ assertNotNull(jwt.getClaims().getClaim(IdToken.ACCESS_TOKEN_HASH_CLAIM));
+ assertNotNull(jwt.getClaims().getClaim(IdToken.NONCE_CLAIM));
OidcUtils.validateAccessTokenHash(accessToken, jwt, true);
if (isAccessTokenInJWTFormat()) {
@@ -578,8 +577,8 @@ public class OIDCFlowTest extends AbstractBusClientServerTestBase {
JwsJwtCompactConsumer jwtConsumer = new JwsJwtCompactConsumer(idToken);
JwtToken jwt = jwtConsumer.getJwtToken();
- Assert.assertNotNull(jwt.getClaims().getClaim(IdToken.ACCESS_TOKEN_HASH_CLAIM));
- Assert.assertNotNull(jwt.getClaims().getClaim(IdToken.NONCE_CLAIM));
+ assertNotNull(jwt.getClaims().getClaim(IdToken.ACCESS_TOKEN_HASH_CLAIM));
+ assertNotNull(jwt.getClaims().getClaim(IdToken.NONCE_CLAIM));
OidcUtils.validateAccessTokenHash(accessToken, jwt, true);
if (isAccessTokenInJWTFormat()) {
@@ -642,8 +641,8 @@ public class OIDCFlowTest extends AbstractBusClientServerTestBase {
JwsJwtCompactConsumer jwtConsumer = new JwsJwtCompactConsumer(idToken);
JwtToken jwt = jwtConsumer.getJwtToken();
- Assert.assertNull(jwt.getClaims().getClaim(IdToken.ACCESS_TOKEN_HASH_CLAIM));
- Assert.assertNotNull(jwt.getClaims().getClaim(IdToken.NONCE_CLAIM));
+ assertNull(jwt.getClaims().getClaim(IdToken.ACCESS_TOKEN_HASH_CLAIM));
+ assertNotNull(jwt.getClaims().getClaim(IdToken.NONCE_CLAIM));
}
@org.junit.Test
@@ -680,7 +679,7 @@ public class OIDCFlowTest extends AbstractBusClientServerTestBase {
// check the code hash is returned from the implicit authorization endpoint
JwsJwtCompactConsumer jwtConsumer = new JwsJwtCompactConsumer(idToken);
JwtToken jwt = jwtConsumer.getJwtToken();
- Assert.assertNotNull(jwt.getClaims().getClaim(IdToken.AUTH_CODE_HASH_CLAIM));
+ assertNotNull(jwt.getClaims().getClaim(IdToken.AUTH_CODE_HASH_CLAIM));
// Now get the access token
client = WebClient.create(address, OAuth2TestUtils.setupProviders(),
@@ -701,7 +700,7 @@ public class OIDCFlowTest extends AbstractBusClientServerTestBase {
// check the code hash is returned from the token endpoint
jwtConsumer = new JwsJwtCompactConsumer(idToken);
jwt = jwtConsumer.getJwtToken();
- Assert.assertNotNull(jwt.getClaims().getClaim(IdToken.AUTH_CODE_HASH_CLAIM));
+ assertNotNull(jwt.getClaims().getClaim(IdToken.AUTH_CODE_HASH_CLAIM));
if (isAccessTokenInJWTFormat()) {
validateAccessToken(accessToken.getTokenKey());
@@ -764,7 +763,7 @@ public class OIDCFlowTest extends AbstractBusClientServerTestBase {
// check the code hash is returned from the token endpoint
JwsJwtCompactConsumer jwtConsumer = new JwsJwtCompactConsumer(idToken);
// returning c_hash in the id_token returned after exchanging the code is optional
- Assert.assertNull(jwtConsumer.getJwtClaims().getClaim(IdToken.AUTH_CODE_HASH_CLAIM));
+ assertNull(jwtConsumer.getJwtClaims().getClaim(IdToken.AUTH_CODE_HASH_CLAIM));
if (isAccessTokenInJWTFormat()) {
validateAccessToken(accessToken.getTokenKey());
@@ -805,7 +804,7 @@ public class OIDCFlowTest extends AbstractBusClientServerTestBase {
// check the code hash is returned from the implicit authorization endpoint
JwsJwtCompactConsumer jwtConsumer = new JwsJwtCompactConsumer(idToken);
JwtToken jwt = jwtConsumer.getJwtToken();
- Assert.assertNotNull(jwt.getClaims().getClaim(IdToken.AUTH_CODE_HASH_CLAIM));
+ assertNotNull(jwt.getClaims().getClaim(IdToken.AUTH_CODE_HASH_CLAIM));
// Check Access Token
String accessToken = OAuth2TestUtils.getSubstring(location, "access_token");
@@ -813,9 +812,9 @@ public class OIDCFlowTest extends AbstractBusClientServerTestBase {
jwtConsumer = new JwsJwtCompactConsumer(idToken);
jwt = jwtConsumer.getJwtToken();
- Assert.assertNotNull(jwt.getClaims().getClaim(IdToken.ACCESS_TOKEN_HASH_CLAIM));
+ assertNotNull(jwt.getClaims().getClaim(IdToken.ACCESS_TOKEN_HASH_CLAIM));
OidcUtils.validateAccessTokenHash(accessToken, jwt, true);
- Assert.assertNotNull(jwt.getClaims().getClaim(IdToken.AUTH_CODE_HASH_CLAIM));
+ assertNotNull(jwt.getClaims().getClaim(IdToken.AUTH_CODE_HASH_CLAIM));
if (isAccessTokenInJWTFormat()) {
validateAccessToken(accessToken);
@@ -956,7 +955,7 @@ public class OIDCFlowTest extends AbstractBusClientServerTestBase {
Response response = client.get();
JsonWebKeys jsonWebKeys = response.readEntity(JsonWebKeys.class);
- Assert.assertTrue(jwtConsumer.verifySignatureWith(jsonWebKeys.getKeys().get(0),
+ assertTrue(jwtConsumer.verifySignatureWith(jsonWebKeys.getKeys().get(0),
SignatureAlgorithm.RS256));
}
@@ -966,22 +965,22 @@ public class OIDCFlowTest extends AbstractBusClientServerTestBase {
JwtToken jwt = jwtConsumer.getJwtToken();
// Validate claims
- Assert.assertEquals("alice", jwt.getClaim(JwtConstants.CLAIM_SUBJECT));
- Assert.assertEquals("OIDC IdP", jwt.getClaim(JwtConstants.CLAIM_ISSUER));
- Assert.assertEquals("consumer-id", jwt.getClaim(JwtConstants.CLAIM_AUDIENCE));
- Assert.assertNotNull(jwt.getClaim(JwtConstants.CLAIM_EXPIRY));
- Assert.assertNotNull(jwt.getClaim(JwtConstants.CLAIM_ISSUED_AT));
+ assertEquals("alice", jwt.getClaim(JwtConstants.CLAIM_SUBJECT));
+ assertEquals("OIDC IdP", jwt.getClaim(JwtConstants.CLAIM_ISSUER));
+ assertEquals("consumer-id", jwt.getClaim(JwtConstants.CLAIM_AUDIENCE));
+ assertNotNull(jwt.getClaim(JwtConstants.CLAIM_EXPIRY));
+ assertNotNull(jwt.getClaim(JwtConstants.CLAIM_ISSUED_AT));
if (nonce != null) {
- Assert.assertEquals(nonce, jwt.getClaim(IdToken.NONCE_CLAIM));
+ assertEquals(nonce, jwt.getClaim(IdToken.NONCE_CLAIM));
}
KeyStore keystore = KeyStore.getInstance("JKS");
keystore.load(ClassLoaderUtils.getResourceAsStream("keys/alice.jks", this.getClass()),
"password".toCharArray());
Certificate cert = keystore.getCertificate("alice");
- Assert.assertNotNull(cert);
+ assertNotNull(cert);
- Assert.assertTrue(jwtConsumer.verifySignatureWith((X509Certificate)cert,
+ assertTrue(jwtConsumer.verifySignatureWith((X509Certificate)cert,
SignatureAlgorithm.RS256));
}
@@ -991,17 +990,17 @@ public class OIDCFlowTest extends AbstractBusClientServerTestBase {
JwtToken jwt = jwtConsumer.getJwtToken();
// Validate claims
- Assert.assertNotNull(jwt.getClaim(JwtConstants.CLAIM_SUBJECT));
- Assert.assertNotNull(jwt.getClaim(JwtConstants.CLAIM_EXPIRY));
- Assert.assertNotNull(jwt.getClaim(JwtConstants.CLAIM_ISSUED_AT));
+ assertNotNull(jwt.getClaim(JwtConstants.CLAIM_SUBJECT));
+ assertNotNull(jwt.getClaim(JwtConstants.CLAIM_EXPIRY));
+ assertNotNull(jwt.getClaim(JwtConstants.CLAIM_ISSUED_AT));
KeyStore keystore = KeyStore.getInstance("JKS");
keystore.load(ClassLoaderUtils.getResourceAsStream("keys/alice.jks", this.getClass()),
"password".toCharArray());
Certificate cert = keystore.getCertificate("alice");
- Assert.assertNotNull(cert);
+ assertNotNull(cert);
- Assert.assertTrue(jwtConsumer.verifySignatureWith((X509Certificate)cert,
+ assertTrue(jwtConsumer.verifySignatureWith((X509Certificate)cert,
SignatureAlgorithm.RS256));
}
diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oidc/OIDCNegativeTest.java b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oidc/OIDCNegativeTest.java
index 02734af..e75b314 100644
--- a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oidc/OIDCNegativeTest.java
+++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oidc/OIDCNegativeTest.java
@@ -203,7 +203,7 @@ public class OIDCNegativeTest extends AbstractBusClientServerTestBase {
JwsJwtCompactConsumer jwtConsumer = new JwsJwtCompactConsumer(idToken);
JwtToken jwt = jwtConsumer.getJwtToken();
- Assert.assertNotNull(jwt.getClaims().getClaim(IdToken.AUTH_TIME_CLAIM));
+ assertNotNull(jwt.getClaims().getClaim(IdToken.AUTH_TIME_CLAIM));
}
@org.junit.Test
diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oidc/UserInfoTest.java b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oidc/UserInfoTest.java
index 87f36c9..99a841b 100644
--- a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oidc/UserInfoTest.java
+++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oidc/UserInfoTest.java
@@ -52,7 +52,6 @@ import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
import org.apache.cxf.testutil.common.TestUtil;
import org.junit.AfterClass;
-import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized.Parameters;
@@ -227,9 +226,9 @@ public class UserInfoTest extends AbstractBusClientServerTestBase {
keystore.load(ClassLoaderUtils.getResourceAsStream("keys/alice.jks", this.getClass()),
"password".toCharArray());
Certificate cert = keystore.getCertificate("alice");
- Assert.assertNotNull(cert);
+ assertNotNull(cert);
- Assert.assertTrue(jwtConsumer.verifySignatureWith((X509Certificate)cert,
+ assertTrue(jwtConsumer.verifySignatureWith((X509Certificate)cert,
SignatureAlgorithm.RS256));
}
@@ -296,22 +295,22 @@ public class UserInfoTest extends AbstractBusClientServerTestBase {
JwtToken jwt = jwtConsumer.getJwtToken();
// Validate claims
- Assert.assertEquals("alice", jwt.getClaim(JwtConstants.CLAIM_SUBJECT));
- Assert.assertEquals("OIDC IdP", jwt.getClaim(JwtConstants.CLAIM_ISSUER));
- Assert.assertEquals("consumer-id", jwt.getClaim(JwtConstants.CLAIM_AUDIENCE));
- Assert.assertNotNull(jwt.getClaim(JwtConstants.CLAIM_EXPIRY));
- Assert.assertNotNull(jwt.getClaim(JwtConstants.CLAIM_ISSUED_AT));
+ assertEquals("alice", jwt.getClaim(JwtConstants.CLAIM_SUBJECT));
+ assertEquals("OIDC IdP", jwt.getClaim(JwtConstants.CLAIM_ISSUER));
+ assertEquals("consumer-id", jwt.getClaim(JwtConstants.CLAIM_AUDIENCE));
+ assertNotNull(jwt.getClaim(JwtConstants.CLAIM_EXPIRY));
+ assertNotNull(jwt.getClaim(JwtConstants.CLAIM_ISSUED_AT));
if (nonce != null) {
- Assert.assertEquals(nonce, jwt.getClaim(IdToken.NONCE_CLAIM));
+ assertEquals(nonce, jwt.getClaim(IdToken.NONCE_CLAIM));
}
KeyStore keystore = KeyStore.getInstance("JKS");
keystore.load(ClassLoaderUtils.getResourceAsStream("keys/alice.jks", this.getClass()),
"password".toCharArray());
Certificate cert = keystore.getCertificate("alice");
- Assert.assertNotNull(cert);
+ assertNotNull(cert);
- Assert.assertTrue(jwtConsumer.verifySignatureWith((X509Certificate)cert,
+ assertTrue(jwtConsumer.verifySignatureWith((X509Certificate)cert,
SignatureAlgorithm.RS256));
}
diff --git a/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/JMSClientServerTest.java b/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/JMSClientServerTest.java
index ce8b171..8ebfa63 100644
--- a/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/JMSClientServerTest.java
+++ b/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/JMSClientServerTest.java
@@ -69,7 +69,6 @@ import org.apache.hello_world_doc_lit.SOAPService7;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Ignore;
@@ -608,7 +607,7 @@ public class JMSClientServerTest extends AbstractBusClientServerTestBase {
String name = "FooBar";
String reply = greeter.greetMe(name);
- Assert.assertEquals("Hello " + name, reply);
+ assertEquals("Hello " + name, reply);
((Closeable)greeter).close();
}
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/http/auth/DigestAuthTest.java b/systests/transports/src/test/java/org/apache/cxf/systest/http/auth/DigestAuthTest.java
index eeb67e6..19aab66 100644
--- a/systests/transports/src/test/java/org/apache/cxf/systest/http/auth/DigestAuthTest.java
+++ b/systests/transports/src/test/java/org/apache/cxf/systest/http/auth/DigestAuthTest.java
@@ -103,9 +103,9 @@ public class DigestAuthTest extends AbstractBusClientServerTestBase {
Assert.fail("Unexpected reply (" + answer + "). Should throw exception");
} catch (Exception e) {
Throwable cause = e.getCause();
- Assert.assertEquals(HTTPException.class, cause.getClass());
+ assertEquals(HTTPException.class, cause.getClass());
HTTPException he = (HTTPException)cause;
- Assert.assertEquals(401, he.getResponseCode());
+ assertEquals(401, he.getResponseCode());
}
}
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/transform/feature/TransformFeatureTest.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/transform/feature/TransformFeatureTest.java
index 156a80a..82331e2 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/transform/feature/TransformFeatureTest.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/transform/feature/TransformFeatureTest.java
@@ -31,7 +31,6 @@ import org.apache.cxf.feature.transform.XSLTOutInterceptor;
import org.apache.cxf.frontend.ClientProxy;
import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
-import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -62,7 +61,7 @@ public class TransformFeatureTest extends AbstractBusClientServerTestBase {
XSLTOutInterceptor outInterceptor = new XSLTOutInterceptor(XSLT_REQUEST_PATH);
client.getOutInterceptors().add(outInterceptor);
String response = port.echo("test");
- Assert.assertTrue("Request was not transformed", response.contains(TRANSFORMED_CONSTANT));
+ assertTrue("Request was not transformed", response.contains(TRANSFORMED_CONSTANT));
}
@Test
@@ -96,7 +95,7 @@ public class TransformFeatureTest extends AbstractBusClientServerTestBase {
XSLTInInterceptor inInterceptor = new XSLTInInterceptor(XSLT_RESPONSE_PATH);
client.getInInterceptors().add(inInterceptor);
String response = port.echo("test");
- Assert.assertTrue(response.contains(TRANSFORMED_CONSTANT));
+ assertTrue(response.contains(TRANSFORMED_CONSTANT));
}
}
diff --git a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/SequenceTimeoutTest.java b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/SequenceTimeoutTest.java
index 3300753..e3bae2f 100644
--- a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/SequenceTimeoutTest.java
+++ b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/SequenceTimeoutTest.java
@@ -197,7 +197,7 @@ public class SequenceTimeoutTest extends AbstractBusClientServerTestBase {
fail("The sequence should have been terminated");
} catch (Throwable t) {
//expected
- Assert.assertTrue(t.getMessage().contains("not a known Sequence identifier"));
+ assertTrue(t.getMessage().contains("not a known Sequence identifier"));
}
rmManager.getStore();
}
diff --git a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/WSRM12ServerCycleTest.java b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/WSRM12ServerCycleTest.java
index d5b0239..d5d79b1 100644
--- a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/WSRM12ServerCycleTest.java
+++ b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/WSRM12ServerCycleTest.java
@@ -44,7 +44,6 @@ import org.apache.cxf.ws.rm.manager.DestinationPolicyType;
import org.apache.cxf.ws.rm.persistence.jdbc.RMTxStore;
import org.apache.cxf.ws.rmp.v200502.RMAssertion;
-import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -167,7 +166,7 @@ public class WSRM12ServerCycleTest extends AbstractBusClientServerTestBase {
ConnectionHelper.setKeepAliveConnection(control, false, true);
updateAddressPort(control, PORT);
- Assert.assertTrue("Failed to start greeter", control.startGreeter(cfg));
+ assertTrue("Failed to start greeter", control.startGreeter(cfg));
System.setProperty("db.name", getPrefix() + "-recovery");
Bus greeterBus = new SpringBusFactory().createBus();
diff --git a/tools/validator/src/test/java/org/apache/cxf/tools/validator/internal/Stax2DOMTest.java b/tools/validator/src/test/java/org/apache/cxf/tools/validator/internal/Stax2DOMTest.java
index 64d230c..e154d33 100644
--- a/tools/validator/src/test/java/org/apache/cxf/tools/validator/internal/Stax2DOMTest.java
+++ b/tools/validator/src/test/java/org/apache/cxf/tools/validator/internal/Stax2DOMTest.java
@@ -30,7 +30,6 @@ import org.w3c.dom.Document;
import org.apache.cxf.helpers.IOUtils;
import org.apache.cxf.staxutils.StaxUtils;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertTrue;
@@ -76,7 +75,7 @@ public class Stax2DOMTest {
if (!deleted) {
tempFile.deleteOnExit();
}
- Assert.assertTrue(
+ assertTrue(
"Stax2DOM left the input stream open, file cannot be deleted: "
+ tempFile, deleted);
}
@@ -98,4 +97,4 @@ public class Stax2DOMTest {
assertDocumentContent(doc);
assertDelete(tempFile);
}
-}
\ No newline at end of file
+}