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 2018/11/27 14:13:06 UTC
[cxf] 01/02: Simplifying junit assertions
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
commit 4c1ac0c9857bacf90cad6335d5541419d79fcf32
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Tue Nov 27 11:52:01 2018 +0000
Simplifying junit assertions
---
.../org/apache/cxf/staxutils/StaxUtilsTest.java | 2 +-
.../cxf/jca/core/resourceadapter/HandlerTest.java | 2 +-
.../ManagedConnectionFactoryImplTest.java | 4 +-
.../apache/cxf/binding/corba/CorbaConduitTest.java | 14 ++---
.../cxf/binding/corba/CorbaDestinationTest.java | 8 +--
.../cxf/binding/corba/CorbaServerConduitTest.java | 14 ++---
.../org/apache/cxf/js/rhino/ServerAppTest.java | 2 +-
.../cxf/management/InstrumentationManagerTest.java | 6 +-
.../cxf/management/jmx/BusRegistrationTest.java | 4 +-
.../cxf/transport/jms/JMSDestinationTest.java | 14 ++---
.../wsdl11/Wsdl11AttachmentPolicyProviderTest.java | 2 +-
.../org/apache/cxf/ws/rm/ManagedRMManagerTest.java | 4 +-
.../cxf/ws/security/wss4j/saml/SamlTokenTest.java | 4 +-
.../sts/claims/mapper/JexlIssueSamlClaimsTest.java | 4 +-
.../cxf/sts/operation/CancelSCTUnitTest.java | 2 +-
.../cxf/sts/operation/IssueJWTClaimsUnitTest.java | 4 +-
.../sts/operation/IssueJWTOnbehalfofUnitTest.java | 2 +-
.../cxf/sts/operation/IssueOnbehalfofUnitTest.java | 2 +-
.../cxf/sts/operation/IssueSamlClaimsUnitTest.java | 2 +-
.../cxf/sts/operation/RenewSamlUnitTest.java | 4 +-
.../operation/ValidateJWTTransformationTest.java | 4 +-
.../cxf/sts/operation/ValidateJWTUnitTest.java | 2 +-
.../cxf/sts/operation/ValidateSCTUnitTest.java | 2 +-
.../cxf/sts/operation/ValidateSamlUnitTest.java | 2 +-
.../ValidateTokenTransformationUnitTest.java | 2 +-
.../cxf/sts/token/canceller/SCTCancellerTest.java | 6 +-
.../cxf/sts/token/provider/JWTClaimsTest.java | 12 ++--
.../sts/token/provider/JWTProviderActAsTest.java | 6 +-
.../token/provider/JWTProviderLifetimeTest.java | 12 ++--
.../token/provider/JWTProviderOnBehalfOfTest.java | 6 +-
.../token/provider/JWTTokenProviderRealmTest.java | 6 +-
.../sts/token/provider/JWTTokenProviderTest.java | 14 ++---
.../cxf/sts/token/provider/SAMLClaimsTest.java | 16 +++---
.../sts/token/provider/SAMLProviderActAsTest.java | 16 +++---
.../sts/token/provider/SAMLProviderCustomTest.java | 16 +++---
.../token/provider/SAMLProviderKeyTypeTest.java | 38 ++++++-------
.../token/provider/SAMLProviderLifetimeTest.java | 14 ++---
.../token/provider/SAMLProviderOnBehalfOfTest.java | 10 ++--
.../sts/token/provider/SAMLProviderRealmTest.java | 12 ++--
.../cxf/sts/token/provider/SCTProviderTest.java | 16 +++---
.../renewer/SAMLTokenRenewerLifetimeTest.java | 28 +++++-----
.../sts/token/renewer/SAMLTokenRenewerPOPTest.java | 16 +++---
.../token/renewer/SAMLTokenRenewerRealmTest.java | 30 +++++-----
.../sts/token/renewer/SAMLTokenRenewerTest.java | 62 ++++++++++-----------
.../validator/JWTTokenValidatorRealmTest.java | 20 +++----
.../sts/token/validator/JWTTokenValidatorTest.java | 36 ++++++------
.../SAMLTokenValidatorCachedRealmTest.java | 10 ++--
.../validator/SAMLTokenValidatorRealmTest.java | 18 +++---
.../token/validator/SAMLTokenValidatorTest.java | 64 +++++++++++-----------
.../cxf/sts/token/validator/SCTValidatorTest.java | 12 ++--
.../validator/UsernameTokenValidatorTest.java | 24 ++++----
.../token/validator/X509TokenValidatorTest.java | 10 ++--
.../asymmetric_encr/AsymmetricEncryptionTest.java | 2 +-
.../systest/sts/custom/CustomParameterTest.java | 2 +-
.../systest/sts/delegation/SAMLDelegationTest.java | 12 ++--
.../cxf/systest/sts/issueunit/IssueUnitTest.java | 34 ++++++------
.../apache/cxf/systest/sts/rest/STSRESTTest.java | 36 ++++++------
.../cxf/systest/sts/itests/unit/STSUnitTest.java | 4 +-
.../cxf/systest/jaxrs/JAXRSSoapBookTest.java | 2 +-
.../cxf/systest/ldap/sts/LDAPClaimsTest.java | 2 +-
.../cxf/systest/coloc/AbstractColocTest.java | 2 +-
.../corba/CorbaBindingFactoryConfigurerTest.java | 6 +-
.../systest/type_test/AbstractTypeTestClient2.java | 14 ++---
.../common/dom/ExtendedDocumentBuilderTest.java | 2 +-
.../tools/common/toolspec/ToolExceptionTest.java | 4 +-
.../cxf/tools/common/toolspec/ToolSpecTest.java | 10 ++--
.../toolspec/parser/CommandLineParserTest.java | 2 +-
.../apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java | 2 +-
68 files changed, 389 insertions(+), 389 deletions(-)
diff --git a/core/src/test/java/org/apache/cxf/staxutils/StaxUtilsTest.java b/core/src/test/java/org/apache/cxf/staxutils/StaxUtilsTest.java
index e38d939..a0dfbd6 100644
--- a/core/src/test/java/org/apache/cxf/staxutils/StaxUtilsTest.java
+++ b/core/src/test/java/org/apache/cxf/staxutils/StaxUtilsTest.java
@@ -59,7 +59,7 @@ public class StaxUtilsTest extends Assert {
@Test
public void testFactoryCreation() {
XMLStreamReader reader = StaxUtils.createXMLStreamReader(getTestStream("./resources/amazon.xml"));
- assertTrue(reader != null);
+ assertNotNull(reader);
}
private InputStream getTestStream(String resource) {
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/HandlerTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/HandlerTest.java
index 4df0f58..29bd120 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/HandlerTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/HandlerTest.java
@@ -42,7 +42,7 @@ public class HandlerTest extends Assert {
String urls = "resourceadapter:" + urlpath;
URL res = new URL(null, urls, h);
InputStream is = h.openConnection(res).getInputStream();
- assertTrue("stream is not null", is != null);
+ assertNotNull("stream is not null", is);
}
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ManagedConnectionFactoryImplTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ManagedConnectionFactoryImplTest.java
index 68b03f8..4a7ff71 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ManagedConnectionFactoryImplTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ManagedConnectionFactoryImplTest.java
@@ -102,7 +102,7 @@ public class ManagedConnectionFactoryImplTest extends Assert {
connectionSet.add(con1);
ManagedConnection mcon = mcf.matchManagedConnections(connectionSet, subject, cri2);
- assertTrue("should not get a match", mcon == null);
+ assertNull("should not get a match", mcon);
}
@Test
@@ -117,7 +117,7 @@ public class ManagedConnectionFactoryImplTest extends Assert {
connectionSet.add(con1);
ManagedConnection mcon = mcf.matchManagedConnections(connectionSet, subject, cri);
- assertTrue("Connection must be null", mcon == null);
+ assertNull("Connection must be null", mcon);
}
@Test
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaConduitTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaConduitTest.java
index 74a756c..c488b05 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaConduitTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaConduitTest.java
@@ -103,7 +103,7 @@ public class CorbaConduitTest extends Assert {
@Test
public void testCorbaConduit() throws Exception {
CorbaConduit conduit = setupCorbaConduit(false);
- assertTrue("conduit should not be null", conduit != null);
+ assertNotNull("conduit should not be null", conduit);
}
@Test
@@ -128,11 +128,11 @@ public class CorbaConduitTest extends Assert {
ex.printStackTrace();
}
OutputStream os = message.getContent(OutputStream.class);
- assertTrue("OutputStream should not be null", os != null);
+ assertNotNull("OutputStream should not be null", os);
ORB orb2 = (ORB)message.get("orb");
- assertTrue("Orb should not be null", orb2 != null);
+ assertNotNull("Orb should not be null", orb2);
Object obj = message.get("endpoint");
- assertTrue("EndpointReferenceType should not be null", obj != null);
+ assertNotNull("EndpointReferenceType should not be null", obj);
}
@@ -147,7 +147,7 @@ public class CorbaConduitTest extends Assert {
EndpointReferenceType t = null;
EndpointReferenceType ref = conduit.getTargetReference(t);
- assertTrue("ref should not be null", ref != null);
+ assertNotNull("ref should not be null", ref);
}
@Test
@@ -160,7 +160,7 @@ public class CorbaConduitTest extends Assert {
endpointInfo.setAddress("corbaloc::localhost:40000/Simple");
CorbaConduit conduit = new CorbaConduit(endpointInfo, destination.getAddress(), orbConfig);
String address = conduit.getAddress();
- assertTrue("address should not be null", address != null);
+ assertNotNull("address should not be null", address);
assertEquals(address, "corbaloc::localhost:40000/Simple");
}
@@ -197,7 +197,7 @@ public class CorbaConduitTest extends Assert {
public void testGetTarget() throws Exception {
CorbaConduit conduit = setupCorbaConduit(false);
EndpointReferenceType endpoint = conduit.getTarget();
- assertTrue("EndpointReferenceType should not be null", endpoint != null);
+ assertNotNull("EndpointReferenceType should not be null", endpoint);
}
@Test
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaDestinationTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaDestinationTest.java
index bee0d79..f1bf815 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaDestinationTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaDestinationTest.java
@@ -50,11 +50,11 @@ public class CorbaDestinationTest extends Assert {
CorbaDestination destination = new CorbaDestination(endpointInfo, orbConfig);
EndpointReferenceType rtype = destination.getAddress();
- assertTrue("EndpointReferenceType should not be null", rtype != null);
+ assertNotNull("EndpointReferenceType should not be null", rtype);
BindingInfo bindingInfo = destination.getBindingInfo();
- assertTrue("BindingInfo should not be null", bindingInfo != null);
+ assertNotNull("BindingInfo should not be null", bindingInfo);
EndpointInfo e2 = destination.getEndPointInfo();
- assertTrue("EndpointInfo should not be null", e2 != null);
+ assertNotNull("EndpointInfo should not be null", e2);
Message m = new MessageImpl();
CorbaServerConduit serverConduit = (CorbaServerConduit)destination.getBackChannel(m);
@@ -76,7 +76,7 @@ public class CorbaDestinationTest extends Assert {
Endpoint endpoint = new EndpointImpl(bus, service, endpointInfo);
MessageObserver observer = new ChainInitiationObserver(endpoint, bus);
destination.setMessageObserver(observer);
- assertTrue("orb should not be null", destination.getOrb() != null);
+ assertNotNull("orb should not be null", destination.getOrb());
try {
File file = new File("endpoint.ior");
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaServerConduitTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaServerConduitTest.java
index bca1ab3..6bdc81d 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaServerConduitTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaServerConduitTest.java
@@ -98,7 +98,7 @@ public class CorbaServerConduitTest extends Assert {
@Test
public void testCorbaServerConduit() throws Exception {
CorbaServerConduit conduit = setupCorbaServerConduit(false);
- assertTrue("conduit should not be null", conduit != null);
+ assertNotNull("conduit should not be null", conduit);
}
@Test
@@ -120,11 +120,11 @@ public class CorbaServerConduitTest extends Assert {
ex.printStackTrace();
}
OutputStream os = message.getContent(OutputStream.class);
- assertTrue("OutputStream should not be null", os != null);
+ assertNotNull("OutputStream should not be null", os);
ORB orb2 = (ORB)message.get("orb");
- assertTrue("Orb should not be null", orb2 != null);
+ assertNotNull("Orb should not be null", orb2);
Object obj = message.get("endpoint");
- assertTrue("EndpointReferenceType should not be null", obj != null);
+ assertNotNull("EndpointReferenceType should not be null", obj);
assertTrue("passed in targetObject is used",
targetObject.equals(message.get(CorbaConstants.CORBA_ENDPOINT_OBJECT)));
@@ -149,7 +149,7 @@ public class CorbaServerConduitTest extends Assert {
EndpointReferenceType t = null;
EndpointReferenceType ref = conduit.getTargetReference(t);
- assertTrue("ref should not be null", ref != null);
+ assertNotNull("ref should not be null", ref);
destination.shutdown();
}
@@ -168,7 +168,7 @@ public class CorbaServerConduitTest extends Assert {
orbConfig,
corbaTypeMap);
String address = conduit.getAddress();
- assertTrue("address should not be null", address != null);
+ assertNotNull("address should not be null", address);
assertEquals(address, "corbaloc::localhost:40000/Simple");
}
@@ -295,7 +295,7 @@ public class CorbaServerConduitTest extends Assert {
public void testGetTarget() {
CorbaServerConduit conduit = setupCorbaServerConduit(false);
EndpointReferenceType endpoint = conduit.getTarget();
- assertTrue("EndpointReferenceType should not be null", endpoint != null);
+ assertNotNull("EndpointReferenceType should not be null", endpoint);
}
diff --git a/rt/frontend/js/src/test/java/org/apache/cxf/js/rhino/ServerAppTest.java b/rt/frontend/js/src/test/java/org/apache/cxf/js/rhino/ServerAppTest.java
index 818e6e8..51fd0fb 100644
--- a/rt/frontend/js/src/test/java/org/apache/cxf/js/rhino/ServerAppTest.java
+++ b/rt/frontend/js/src/test/java/org/apache/cxf/js/rhino/ServerAppTest.java
@@ -218,7 +218,7 @@ public class ServerAppTest extends Assert {
public void testDirectory() throws Exception {
File f = new File(emptyFile);
String dir = f.getParent();
- assertTrue(dir != null);
+ assertNotNull(dir);
EasyMock.checkOrder(phMock, false);
phMock.createAndPublish(new File(emptyFile), epAddr, true);
String file = getClass().getResource("empty/empty2.jsx").toURI().getPath();
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 f902bd9..e454f79 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
@@ -59,7 +59,7 @@ public class InstrumentationManagerTest extends Assert {
SpringBusFactory factory = new SpringBusFactory();
bus = factory.createBus();
im = bus.getExtension(InstrumentationManager.class);
- assertTrue("Instrumentation Manager should not be null", im != null);
+ assertNotNull("Instrumentation Manager should not be null", im);
MBeanServer mbs = im.getMBeanServer();
assertNull("MBeanServer should not be available.", mbs);
}
@@ -69,7 +69,7 @@ public class InstrumentationManagerTest extends Assert {
SpringBusFactory factory = new SpringBusFactory();
bus = factory.createBus("managed-spring3.xml", true);
im = bus.getExtension(InstrumentationManager.class);
- assertTrue("Instrumentation Manager should not be null", im != null);
+ assertNotNull("Instrumentation Manager should not be null", im);
MBeanServer mbs = im.getMBeanServer();
assertNotNull("MBeanServer should be available.", mbs);
}
@@ -80,7 +80,7 @@ public class InstrumentationManagerTest extends Assert {
SpringBusFactory factory = new SpringBusFactory();
bus = factory.createBus("managed-spring.xml", true);
im = bus.getExtension(InstrumentationManager.class);
- assertTrue("Instrumentation Manager should not be null", im != null);
+ assertNotNull("Instrumentation Manager should not be null", im);
WorkQueueManagerImpl wqm = new WorkQueueManagerImpl();
wqm.setBus(bus);
wqm.getAutomaticWorkQueue();
diff --git a/rt/management/src/test/java/org/apache/cxf/management/jmx/BusRegistrationTest.java b/rt/management/src/test/java/org/apache/cxf/management/jmx/BusRegistrationTest.java
index cbc5be6..c1e2cfe 100644
--- a/rt/management/src/test/java/org/apache/cxf/management/jmx/BusRegistrationTest.java
+++ b/rt/management/src/test/java/org/apache/cxf/management/jmx/BusRegistrationTest.java
@@ -78,12 +78,12 @@ public class BusRegistrationTest extends Assert {
serverBus = factory.createBus(conf);
assertEquals("CXF-Test-Bus", serverBus.getId());
serverIM = serverBus.getExtension(InstrumentationManager.class);
- assertTrue("Instrumentation Manager should not be null", serverIM != null);
+ assertNotNull("Instrumentation Manager should not be null", serverIM);
Thread t = new Thread(new Runnable() {
public void run() {
clientBus = factory.createBus("no-connector-spring.xml");
clientIM = clientBus.getExtension(InstrumentationManager.class);
- assertTrue("Instrumentation Manager should not be null", clientIM != null);
+ assertNotNull("Instrumentation Manager should not be null", clientIM);
ready = true;
running = true;
while (running) {
diff --git a/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSDestinationTest.java b/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSDestinationTest.java
index 4d54868..8622473 100644
--- a/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSDestinationTest.java
+++ b/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSDestinationTest.java
@@ -74,7 +74,7 @@ public class JMSDestinationTest extends AbstractJMSTester {
sendOneWayMessage(conduit, outMessage);
waitForReceiveDestMessage();
- assertTrue("The destiantion should have got the message ", destMessage != null);
+ assertNotNull("The destiantion should have got the message ", destMessage);
verifyReceivedMessage(destMessage);
verifyHeaders(destMessage, outMessage);
conduit.close();
@@ -118,7 +118,7 @@ public class JMSDestinationTest extends AbstractJMSTester {
// wait for the message to be get from the destination
waitForReceiveDestMessage();
// just verify the Destination inMessage
- assertTrue("The destiantion should have got the message ", destMessage != null);
+ assertNotNull("The destiantion should have got the message ", destMessage);
verifyReceivedMessage(destMessage);
verifyHeaders(destMessage, outMessage);
conduit.close();
@@ -395,7 +395,7 @@ public class JMSDestinationTest extends AbstractJMSTester {
sendOneWayMessage(conduit, outMessage);
waitForReceiveDestMessage();
// just verify the Destination inMessage
- assertTrue("The destination should have got the message ", destMessage != null);
+ assertNotNull("The destination should have got the message ", destMessage);
verifyReplyToNotSet(destMessage);
destMessage = null;
@@ -404,7 +404,7 @@ public class JMSDestinationTest extends AbstractJMSTester {
sendOneWayMessage(conduit, outMessage);
waitForReceiveDestMessage();
- assertTrue("The destination should have got the message ", destMessage != null);
+ assertNotNull("The destination should have got the message ", destMessage);
String exName = getQueueName(conduit.getJmsConfig().getReplyDestination());
verifyReplyToSet(destMessage, Queue.class, exName);
destMessage = null;
@@ -417,7 +417,7 @@ public class JMSDestinationTest extends AbstractJMSTester {
setupMessageHeader(outMessage, "cidValue", contextReplyTo);
sendOneWayMessage(conduit, outMessage);
waitForReceiveDestMessage();
- assertTrue("The destiantion should have got the message ", destMessage != null);
+ assertNotNull("The destiantion should have got the message ", destMessage);
verifyReplyToSet(destMessage, Queue.class, exName);
destMessage = null;
@@ -429,7 +429,7 @@ public class JMSDestinationTest extends AbstractJMSTester {
outMessage.put(JMSConstants.JMS_SET_REPLY_TO, Boolean.FALSE);
sendOneWayMessage(conduit, outMessage);
waitForReceiveDestMessage();
- assertTrue("The destiantion should have got the message ", destMessage != null);
+ assertNotNull("The destiantion should have got the message ", destMessage);
verifyReplyToNotSet(destMessage);
destMessage = null;
@@ -440,7 +440,7 @@ public class JMSDestinationTest extends AbstractJMSTester {
outMessage.put(JMSConstants.JMS_SET_REPLY_TO, Boolean.TRUE);
sendOneWayMessage(conduit, outMessage);
waitForReceiveDestMessage();
- assertTrue("The destiantion should have got the message ", destMessage != null);
+ assertNotNull("The destiantion should have got the message ", destMessage);
exName = getQueueName(conduit.getJmsConfig().getReplyDestination());
verifyReplyToSet(destMessage, Queue.class, exName);
destMessage = null;
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/wsdl11/Wsdl11AttachmentPolicyProviderTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/wsdl11/Wsdl11AttachmentPolicyProviderTest.java
index 4dea1bc..8bd7561 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/wsdl11/Wsdl11AttachmentPolicyProviderTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/wsdl11/Wsdl11AttachmentPolicyProviderTest.java
@@ -186,7 +186,7 @@ public class Wsdl11AttachmentPolicyProviderTest extends Assert {
verifyAssertionsOnly(p, 3);
EndpointInfo ei = new EndpointInfo();
- assertTrue(app.getElementPolicy(ei) == null);
+ assertNull(app.getElementPolicy(ei));
}
@Test
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ManagedRMManagerTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ManagedRMManagerTest.java
index 399abd0..ddbb556 100755
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ManagedRMManagerTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ManagedRMManagerTest.java
@@ -87,8 +87,8 @@ public class ManagedRMManagerTest extends Assert {
im = bus.getExtension(InstrumentationManager.class);
manager = bus.getExtension(RMManager.class);
endpoint = createTestEndpoint();
- assertTrue("Instrumentation Manager should not be null", im != null);
- assertTrue("RMManager should not be null", manager != null);
+ assertNotNull("Instrumentation Manager should not be null", im);
+ assertNotNull("RMManager should not be null", manager);
MBeanServer mbs = im.getMBeanServer();
assertNotNull("MBeanServer should be available.", mbs);
diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/SamlTokenTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/SamlTokenTest.java
index 3945df6..2b2d689 100644
--- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/SamlTokenTest.java
+++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/SamlTokenTest.java
@@ -294,7 +294,7 @@ public class SamlTokenTest extends AbstractSecurityTest {
assert receivedAssertion.isSigned();
actionResult = handlerResults.get(0).getActionResults().get(WSConstants.SIGN).get(0);
- assertTrue(actionResult != null);
+ assertNotNull(actionResult);
}
/**
@@ -358,7 +358,7 @@ public class SamlTokenTest extends AbstractSecurityTest {
assert receivedAssertion.isSigned();
actionResult = handlerResults.get(0).getActionResults().get(WSConstants.SIGN).get(0);
- assertTrue(actionResult != null);
+ assertNotNull(actionResult);
}
/**
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/claims/mapper/JexlIssueSamlClaimsTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/claims/mapper/JexlIssueSamlClaimsTest.java
index fd242fc..522c7fb 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/claims/mapper/JexlIssueSamlClaimsTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/claims/mapper/JexlIssueSamlClaimsTest.java
@@ -229,7 +229,7 @@ public class JexlIssueSamlClaimsTest extends org.junit.Assert {
// create a SAML Token via the SAMLTokenProvider which contains claims
CallbackHandler callbackHandler = new PasswordCallbackHandler();
- Element samlToken = createSAMLAssertion(WSS4JConstants.WSS_SAML2_TOKEN_TYPE,
+ Element samlToken = createSAMLAssertion(WSS4JConstants.WSS_SAML2_TOKEN_TYPE,
crypto, "mystskey", callbackHandler,
realms);
Document docToken = samlToken.getOwnerDocument();
@@ -356,7 +356,7 @@ public class JexlIssueSamlClaimsTest extends org.junit.Assert {
providerParameters.setRequestedSecondaryClaims(requestedClaims);
TokenProviderResponse providerResponse = samlTokenProvider.createToken(providerParameters);
- assertTrue(providerResponse != null);
+ assertNotNull(providerResponse);
assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null);
return (Element)providerResponse.getToken();
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/CancelSCTUnitTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/CancelSCTUnitTest.java
index fae7171..a8e0133 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/CancelSCTUnitTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/CancelSCTUnitTest.java
@@ -180,7 +180,7 @@ public class CancelSCTUnitTest extends org.junit.Assert {
assertTrue(sctTokenProvider.canHandleToken(STSUtils.TOKEN_TYPE_SCT_05_12));
TokenProviderResponse providerResponse = sctTokenProvider.createToken(providerParameters);
- assertTrue(providerResponse != null);
+ assertNotNull(providerResponse);
assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null);
return providerResponse;
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 7984c54..49a1383 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
@@ -367,7 +367,7 @@ public class IssueJWTClaimsUnitTest extends org.junit.Assert {
Element samlToken =
createSAMLAssertion(WSS4JConstants.WSS_SAML2_TOKEN_TYPE, crypto, "mystskey",
callbackHandler, realms);
-
+
DocumentFragment f = samlToken.getOwnerDocument().createDocumentFragment();
f.appendChild(samlToken);
Document docToken = samlToken.getOwnerDocument();
@@ -727,7 +727,7 @@ public class IssueJWTClaimsUnitTest extends org.junit.Assert {
providerParameters.setRequestedSecondaryClaims(requestedClaims);
TokenProviderResponse providerResponse = samlTokenProvider.createToken(providerParameters);
- assertTrue(providerResponse != null);
+ assertNotNull(providerResponse);
assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null);
return (Element)providerResponse.getToken();
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTOnbehalfofUnitTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTOnbehalfofUnitTest.java
index 2ed09ff..b43f287 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTOnbehalfofUnitTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTOnbehalfofUnitTest.java
@@ -404,7 +404,7 @@ public class IssueJWTOnbehalfofUnitTest extends org.junit.Assert {
providerParameters.setRealm("A");
}
TokenProviderResponse providerResponse = samlTokenProvider.createToken(providerParameters);
- assertTrue(providerResponse != null);
+ assertNotNull(providerResponse);
assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null);
return (Element)providerResponse.getToken();
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueOnbehalfofUnitTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueOnbehalfofUnitTest.java
index c433365..10b7b68 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueOnbehalfofUnitTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueOnbehalfofUnitTest.java
@@ -1225,7 +1225,7 @@ public class IssueOnbehalfofUnitTest extends org.junit.Assert {
providerParameters.setRealm("A");
}
TokenProviderResponse providerResponse = samlTokenProvider.createToken(providerParameters);
- assertTrue(providerResponse != null);
+ assertNotNull(providerResponse);
assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null);
return (Element)providerResponse.getToken();
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueSamlClaimsUnitTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueSamlClaimsUnitTest.java
index 86d48c2..e804f73 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueSamlClaimsUnitTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueSamlClaimsUnitTest.java
@@ -928,7 +928,7 @@ public class IssueSamlClaimsUnitTest extends org.junit.Assert {
providerParameters.setRequestedSecondaryClaims(requestedClaims);
TokenProviderResponse providerResponse = samlTokenProvider.createToken(providerParameters);
- assertTrue(providerResponse != null);
+ assertNotNull(providerResponse);
assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null);
return (Element)providerResponse.getToken();
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/RenewSamlUnitTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/RenewSamlUnitTest.java
index b484889..5fa925d 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/RenewSamlUnitTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/RenewSamlUnitTest.java
@@ -502,7 +502,7 @@ public class RenewSamlUnitTest extends org.junit.Assert {
if (ttlMs != 0) {
Lifetime lifetime = new Lifetime();
-
+
Instant creationTime = Instant.now();
Instant expirationTime = creationTime.plusNanos(ttlMs * 1000000L);
@@ -513,7 +513,7 @@ public class RenewSamlUnitTest extends org.junit.Assert {
}
TokenProviderResponse providerResponse = samlTokenProvider.createToken(providerParameters);
- assertTrue(providerResponse != null);
+ assertNotNull(providerResponse);
assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null);
return (Element)providerResponse.getToken();
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 2c950b4..6651c39 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
@@ -361,7 +361,7 @@ public class ValidateJWTTransformationTest extends org.junit.Assert {
assertTrue(tokenProvider.canHandleToken(JWTTokenProvider.JWT_TOKEN_TYPE));
TokenProviderResponse providerResponse = tokenProvider.createToken(providerParameters);
- assertTrue(providerResponse != null);
+ assertNotNull(providerResponse);
assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null);
return providerResponse;
@@ -497,7 +497,7 @@ public class ValidateJWTTransformationTest extends org.junit.Assert {
providerParameters.setRequestedSecondaryClaims(requestedClaims);
TokenProviderResponse providerResponse = samlTokenProvider.createToken(providerParameters);
- assertTrue(providerResponse != null);
+ assertNotNull(providerResponse);
assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null);
return (Element)providerResponse.getToken();
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateJWTUnitTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateJWTUnitTest.java
index e4a37f0..c8116e5 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateJWTUnitTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateJWTUnitTest.java
@@ -181,7 +181,7 @@ public class ValidateJWTUnitTest extends org.junit.Assert {
assertTrue(tokenProvider.canHandleToken(JWTTokenProvider.JWT_TOKEN_TYPE));
TokenProviderResponse providerResponse = tokenProvider.createToken(providerParameters);
- assertTrue(providerResponse != null);
+ assertNotNull(providerResponse);
assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null);
return providerResponse;
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateSCTUnitTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateSCTUnitTest.java
index d82def5..b8ceed6 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateSCTUnitTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateSCTUnitTest.java
@@ -187,7 +187,7 @@ public class ValidateSCTUnitTest extends org.junit.Assert {
assertTrue(sctTokenProvider.canHandleToken(STSUtils.TOKEN_TYPE_SCT_05_12));
TokenProviderResponse providerResponse = sctTokenProvider.createToken(providerParameters);
- assertTrue(providerResponse != null);
+ assertNotNull(providerResponse);
assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null);
return providerResponse;
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateSamlUnitTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateSamlUnitTest.java
index 4a0ff2f..d4638b4 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateSamlUnitTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateSamlUnitTest.java
@@ -243,7 +243,7 @@ public class ValidateSamlUnitTest extends org.junit.Assert {
tokenType, STSConstants.BEARER_KEY_KEYTYPE, crypto, signatureUsername, callbackHandler
);
TokenProviderResponse providerResponse = samlTokenProvider.createToken(providerParameters);
- assertTrue(providerResponse != null);
+ assertNotNull(providerResponse);
assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null);
return (Element)providerResponse.getToken();
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateTokenTransformationUnitTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateTokenTransformationUnitTest.java
index c149130..c375fe7 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateTokenTransformationUnitTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateTokenTransformationUnitTest.java
@@ -860,7 +860,7 @@ public class ValidateTokenTransformationUnitTest extends org.junit.Assert {
providerParameters.setRequestedSecondaryClaims(requestedClaims);
TokenProviderResponse providerResponse = samlTokenProvider.createToken(providerParameters);
- assertTrue(providerResponse != null);
+ assertNotNull(providerResponse);
assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null);
return (Element)providerResponse.getToken();
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/canceller/SCTCancellerTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/canceller/SCTCancellerTest.java
index aef2881..ee6cad5 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/canceller/SCTCancellerTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/canceller/SCTCancellerTest.java
@@ -72,12 +72,12 @@ public class SCTCancellerTest extends org.junit.Assert {
assertTrue(sctCanceller.canHandleToken(cancelTarget));
TokenCancellerResponse cancellerResponse = sctCanceller.cancelToken(cancellerParameters);
- assertTrue(cancellerResponse != null);
+ assertNotNull(cancellerResponse);
assertTrue(cancellerResponse.getToken().getState() == STATE.CANCELLED);
// Try to cancel the token again - this should fail
cancellerResponse = sctCanceller.cancelToken(cancellerParameters);
- assertTrue(cancellerResponse != null);
+ assertNotNull(cancellerResponse);
assertFalse(cancellerResponse.getToken().getState() == STATE.CANCELLED);
}
@@ -101,7 +101,7 @@ public class SCTCancellerTest extends org.junit.Assert {
assertTrue(sctCanceller.canHandleToken(cancelTarget));
TokenCancellerResponse cancellerResponse = sctCanceller.cancelToken(cancellerParameters);
- assertTrue(cancellerResponse != null);
+ assertNotNull(cancellerResponse);
assertFalse(cancellerResponse.getToken().getState() == STATE.CANCELLED);
}
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTClaimsTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTClaimsTest.java
index f11421a..87b33c0 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTClaimsTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTClaimsTest.java
@@ -81,7 +81,7 @@ public class JWTClaimsTest extends org.junit.Assert {
assertTrue(tokenProvider.canHandleToken(JWTTokenProvider.JWT_TOKEN_TYPE));
TokenProviderResponse providerResponse = tokenProvider.createToken(providerParameters);
- assertTrue(providerResponse != null);
+ assertNotNull(providerResponse);
assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null);
String token = (String)providerResponse.getToken();
@@ -120,7 +120,7 @@ public class JWTClaimsTest extends org.junit.Assert {
providerParameters.setRequestedSecondaryClaims(secondaryClaims);
TokenProviderResponse providerResponse = tokenProvider.createToken(providerParameters);
- assertTrue(providerResponse != null);
+ assertNotNull(providerResponse);
assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null);
String token = (String)providerResponse.getToken();
@@ -163,7 +163,7 @@ public class JWTClaimsTest extends org.junit.Assert {
providerParameters.setRequestedSecondaryClaims(secondaryClaims);
TokenProviderResponse providerResponse = tokenProvider.createToken(providerParameters);
- assertTrue(providerResponse != null);
+ assertNotNull(providerResponse);
assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null);
String token = (String)providerResponse.getToken();
@@ -201,7 +201,7 @@ public class JWTClaimsTest extends org.junit.Assert {
providerParameters.setRequestedPrimaryClaims(claims);
TokenProviderResponse providerResponse = tokenProvider.createToken(providerParameters);
- assertTrue(providerResponse != null);
+ assertNotNull(providerResponse);
assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null);
String token = (String)providerResponse.getToken();
@@ -235,7 +235,7 @@ public class JWTClaimsTest extends org.junit.Assert {
assertTrue(tokenProvider.canHandleToken(JWTTokenProvider.JWT_TOKEN_TYPE));
TokenProviderResponse providerResponse = tokenProvider.createToken(providerParameters);
- assertTrue(providerResponse != null);
+ assertNotNull(providerResponse);
assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null);
String token = (String)providerResponse.getToken();
@@ -275,7 +275,7 @@ public class JWTClaimsTest extends org.junit.Assert {
assertTrue(tokenProvider.canHandleToken(JWTTokenProvider.JWT_TOKEN_TYPE));
TokenProviderResponse providerResponse = tokenProvider.createToken(providerParameters);
- assertTrue(providerResponse != null);
+ assertNotNull(providerResponse);
assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null);
String token = (String)providerResponse.getToken();
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTProviderActAsTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTProviderActAsTest.java
index 60a3aed..05b9dde 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTProviderActAsTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTProviderActAsTest.java
@@ -80,7 +80,7 @@ public class JWTProviderActAsTest extends org.junit.Assert {
assertTrue(tokenProvider.canHandleToken(JWTTokenProvider.JWT_TOKEN_TYPE));
TokenProviderResponse providerResponse = tokenProvider.createToken(providerParameters);
- assertTrue(providerResponse != null);
+ assertNotNull(providerResponse);
assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null);
String token = (String)providerResponse.getToken();
@@ -113,7 +113,7 @@ public class JWTProviderActAsTest extends org.junit.Assert {
assertTrue(tokenProvider.canHandleToken(JWTTokenProvider.JWT_TOKEN_TYPE));
TokenProviderResponse providerResponse = tokenProvider.createToken(providerParameters);
- assertTrue(providerResponse != null);
+ assertNotNull(providerResponse);
assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null);
String token = (String)providerResponse.getToken();
@@ -134,7 +134,7 @@ public class JWTProviderActAsTest extends org.junit.Assert {
providerParameters.setPrincipal(new CustomTokenPrincipal(user));
assertTrue(samlTokenProvider.canHandleToken(WSS4JConstants.WSS_SAML_TOKEN_TYPE));
TokenProviderResponse providerResponse = samlTokenProvider.createToken(providerParameters);
- assertTrue(providerResponse != null);
+ assertNotNull(providerResponse);
assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null);
return (Element)providerResponse.getToken();
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTProviderLifetimeTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTProviderLifetimeTest.java
index 10906f2..39dbaad 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTProviderLifetimeTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTProviderLifetimeTest.java
@@ -75,7 +75,7 @@ public class JWTProviderLifetimeTest extends org.junit.Assert {
providerParameters.getTokenRequirements().setLifetime(lifetime);
TokenProviderResponse providerResponse = tokenProvider.createToken(providerParameters);
- assertTrue(providerResponse != null);
+ assertNotNull(providerResponse);
assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null);
long duration = Duration.between(providerResponse.getCreated(), providerResponse.getExpires()).getSeconds();
@@ -105,7 +105,7 @@ public class JWTProviderLifetimeTest extends org.junit.Assert {
TokenProviderParameters providerParameters = createProviderParameters(JWTTokenProvider.JWT_TOKEN_TYPE);
TokenProviderResponse providerResponse = tokenProvider.createToken(providerParameters);
- assertTrue(providerResponse != null);
+ assertNotNull(providerResponse);
assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null);
long duration = Duration.between(providerResponse.getCreated(), providerResponse.getExpires()).getSeconds();
@@ -223,7 +223,7 @@ public class JWTProviderLifetimeTest extends org.junit.Assert {
providerParameters.getTokenRequirements().setLifetime(lifetime);
TokenProviderResponse providerResponse = tokenProvider.createToken(providerParameters);
- assertTrue(providerResponse != null);
+ assertNotNull(providerResponse);
assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null);
long duration = Duration.between(providerResponse.getCreated(), providerResponse.getExpires()).getSeconds();
assertEquals(maxLifetime, duration);
@@ -264,7 +264,7 @@ public class JWTProviderLifetimeTest extends org.junit.Assert {
providerParameters.getTokenRequirements().setLifetime(lifetime);
TokenProviderResponse providerResponse = tokenProvider.createToken(providerParameters);
- assertTrue(providerResponse != null);
+ assertNotNull(providerResponse);
assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null);
long duration = Duration.between(providerResponse.getCreated(), providerResponse.getExpires()).getSeconds();
assertEquals(50, duration);
@@ -314,7 +314,7 @@ public class JWTProviderLifetimeTest extends org.junit.Assert {
claimsProvider.setFutureTimeToLive(60L * 60L);
TokenProviderResponse providerResponse = tokenProvider.createToken(providerParameters);
- assertTrue(providerResponse != null);
+ assertNotNull(providerResponse);
assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null);
String token = (String)providerResponse.getToken();
@@ -349,7 +349,7 @@ public class JWTProviderLifetimeTest extends org.junit.Assert {
providerParameters.getTokenRequirements().setLifetime(lifetime);
TokenProviderResponse providerResponse = tokenProvider.createToken(providerParameters);
- assertTrue(providerResponse != null);
+ assertNotNull(providerResponse);
assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null);
long duration = Duration.between(providerResponse.getCreated(), providerResponse.getExpires()).getSeconds();
assertEquals(claimsProvider.getLifetime(), duration);
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTProviderOnBehalfOfTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTProviderOnBehalfOfTest.java
index 6f6f798..6fd30bd 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTProviderOnBehalfOfTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTProviderOnBehalfOfTest.java
@@ -80,7 +80,7 @@ public class JWTProviderOnBehalfOfTest extends org.junit.Assert {
assertTrue(tokenProvider.canHandleToken(JWTTokenProvider.JWT_TOKEN_TYPE));
TokenProviderResponse providerResponse = tokenProvider.createToken(providerParameters);
- assertTrue(providerResponse != null);
+ assertNotNull(providerResponse);
assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null);
String token = (String)providerResponse.getToken();
@@ -112,7 +112,7 @@ public class JWTProviderOnBehalfOfTest extends org.junit.Assert {
assertTrue(tokenProvider.canHandleToken(JWTTokenProvider.JWT_TOKEN_TYPE));
TokenProviderResponse providerResponse = tokenProvider.createToken(providerParameters);
- assertTrue(providerResponse != null);
+ assertNotNull(providerResponse);
assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null);
String token = (String)providerResponse.getToken();
@@ -132,7 +132,7 @@ public class JWTProviderOnBehalfOfTest extends org.junit.Assert {
providerParameters.setPrincipal(new CustomTokenPrincipal(user));
assertTrue(samlTokenProvider.canHandleToken(WSS4JConstants.WSS_SAML_TOKEN_TYPE));
TokenProviderResponse providerResponse = samlTokenProvider.createToken(providerParameters);
- assertTrue(providerResponse != null);
+ assertNotNull(providerResponse);
assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null);
return (Element)providerResponse.getToken();
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTTokenProviderRealmTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTTokenProviderRealmTest.java
index 2e92b5a..47934a8 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTTokenProviderRealmTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTTokenProviderRealmTest.java
@@ -63,7 +63,7 @@ public class JWTTokenProviderRealmTest extends org.junit.Assert {
// Realm "A"
assertTrue(jwtTokenProvider.canHandleToken(JWTTokenProvider.JWT_TOKEN_TYPE, "A"));
TokenProviderResponse providerResponse = jwtTokenProvider.createToken(providerParameters);
- assertTrue(providerResponse != null);
+ assertNotNull(providerResponse);
assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null);
String token = (String)providerResponse.getToken();
@@ -77,7 +77,7 @@ public class JWTTokenProviderRealmTest extends org.junit.Assert {
providerParameters.setRealm("B");
assertTrue(jwtTokenProvider.canHandleToken(JWTTokenProvider.JWT_TOKEN_TYPE, "B"));
providerResponse = jwtTokenProvider.createToken(providerParameters);
- assertTrue(providerResponse != null);
+ assertNotNull(providerResponse);
assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null);
token = (String)providerResponse.getToken();
@@ -91,7 +91,7 @@ public class JWTTokenProviderRealmTest extends org.junit.Assert {
providerParameters.setRealm(null);
assertTrue(jwtTokenProvider.canHandleToken(JWTTokenProvider.JWT_TOKEN_TYPE, null));
providerResponse = jwtTokenProvider.createToken(providerParameters);
- assertTrue(providerResponse != null);
+ assertNotNull(providerResponse);
assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null);
token = (String)providerResponse.getToken();
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTTokenProviderTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTTokenProviderTest.java
index 9028552..b3693e5 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTTokenProviderTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTTokenProviderTest.java
@@ -77,7 +77,7 @@ public class JWTTokenProviderTest extends org.junit.Assert {
assertTrue(jwtTokenProvider.canHandleToken(JWTTokenProvider.JWT_TOKEN_TYPE));
TokenProviderResponse providerResponse = jwtTokenProvider.createToken(providerParameters);
- assertTrue(providerResponse != null);
+ assertNotNull(providerResponse);
assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null);
String token = (String)providerResponse.getToken();
@@ -104,7 +104,7 @@ public class JWTTokenProviderTest extends org.junit.Assert {
assertTrue(jwtTokenProvider.canHandleToken(JWTTokenProvider.JWT_TOKEN_TYPE));
TokenProviderResponse providerResponse = jwtTokenProvider.createToken(providerParameters);
- assertTrue(providerResponse != null);
+ assertNotNull(providerResponse);
assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null);
String token = (String)providerResponse.getToken();
@@ -146,7 +146,7 @@ public class JWTTokenProviderTest extends org.junit.Assert {
assertTrue(jwtTokenProvider.canHandleToken(JWTTokenProvider.JWT_TOKEN_TYPE));
TokenProviderResponse providerResponse = jwtTokenProvider.createToken(providerParameters);
- assertTrue(providerResponse != null);
+ assertNotNull(providerResponse);
assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null);
String token = (String)providerResponse.getToken();
@@ -186,7 +186,7 @@ public class JWTTokenProviderTest extends org.junit.Assert {
assertTrue(jwtTokenProvider.canHandleToken(JWTTokenProvider.JWT_TOKEN_TYPE));
TokenProviderResponse providerResponse = jwtTokenProvider.createToken(providerParameters);
- assertTrue(providerResponse != null);
+ assertNotNull(providerResponse);
assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null);
String token = (String)providerResponse.getToken();
@@ -219,7 +219,7 @@ public class JWTTokenProviderTest extends org.junit.Assert {
assertTrue(jwtTokenProvider.canHandleToken(JWTTokenProvider.JWT_TOKEN_TYPE));
TokenProviderResponse providerResponse = jwtTokenProvider.createToken(providerParameters);
- assertTrue(providerResponse != null);
+ assertNotNull(providerResponse);
assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null);
String token = (String)providerResponse.getToken();
@@ -271,7 +271,7 @@ public class JWTTokenProviderTest extends org.junit.Assert {
assertTrue(jwtTokenProvider.canHandleToken(JWTTokenProvider.JWT_TOKEN_TYPE));
TokenProviderResponse providerResponse = jwtTokenProvider.createToken(providerParameters);
- assertTrue(providerResponse != null);
+ assertNotNull(providerResponse);
assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null);
String token = (String)providerResponse.getToken();
@@ -320,7 +320,7 @@ public class JWTTokenProviderTest extends org.junit.Assert {
assertTrue(jwtTokenProvider.canHandleToken(JWTTokenProvider.JWT_TOKEN_TYPE));
TokenProviderResponse providerResponse = jwtTokenProvider.createToken(providerParameters);
- assertTrue(providerResponse != null);
+ assertNotNull(providerResponse);
assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null);
String token = (String)providerResponse.getToken();
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLClaimsTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLClaimsTest.java
index 8a0f8c1..706fa2d 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLClaimsTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLClaimsTest.java
@@ -91,7 +91,7 @@ public class SAMLClaimsTest extends org.junit.Assert {
assertTrue(samlTokenProvider.canHandleToken(WSS4JConstants.WSS_SAML2_TOKEN_TYPE));
TokenProviderResponse providerResponse = samlTokenProvider.createToken(providerParameters);
- assertTrue(providerResponse != null);
+ assertNotNull(providerResponse);
assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null);
Element token = (Element)providerResponse.getToken();
@@ -132,7 +132,7 @@ public class SAMLClaimsTest extends org.junit.Assert {
assertTrue(samlTokenProvider.canHandleToken(WSS4JConstants.WSS_SAML2_TOKEN_TYPE));
TokenProviderResponse providerResponse = samlTokenProvider.createToken(providerParameters);
- assertTrue(providerResponse != null);
+ assertNotNull(providerResponse);
assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null);
Element token = (Element)providerResponse.getToken();
@@ -177,7 +177,7 @@ public class SAMLClaimsTest extends org.junit.Assert {
assertTrue(samlTokenProvider.canHandleToken(WSS4JConstants.WSS_SAML2_TOKEN_TYPE));
TokenProviderResponse providerResponse = samlTokenProvider.createToken(providerParameters);
- assertTrue(providerResponse != null);
+ assertNotNull(providerResponse);
assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null);
Element token = (Element)providerResponse.getToken();
@@ -217,7 +217,7 @@ public class SAMLClaimsTest extends org.junit.Assert {
assertTrue(samlTokenProvider.canHandleToken(WSS4JConstants.WSS_SAML2_TOKEN_TYPE));
TokenProviderResponse providerResponse = samlTokenProvider.createToken(providerParameters);
- assertTrue(providerResponse != null);
+ assertNotNull(providerResponse);
assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null);
Element token = (Element)providerResponse.getToken();
@@ -270,7 +270,7 @@ public class SAMLClaimsTest extends org.junit.Assert {
assertTrue(samlTokenProvider.canHandleToken(WSS4JConstants.WSS_SAML2_TOKEN_TYPE));
TokenProviderResponse providerResponse = samlTokenProvider.createToken(providerParameters);
- assertTrue(providerResponse != null);
+ assertNotNull(providerResponse);
assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null);
Element token = (Element)providerResponse.getToken();
@@ -355,7 +355,7 @@ public class SAMLClaimsTest extends org.junit.Assert {
assertTrue(samlTokenProvider.canHandleToken(WSS4JConstants.WSS_SAML2_TOKEN_TYPE));
TokenProviderResponse providerResponse = samlTokenProvider.createToken(providerParameters);
- assertTrue(providerResponse != null);
+ assertNotNull(providerResponse);
assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null);
Element token = (Element)providerResponse.getToken();
@@ -394,7 +394,7 @@ public class SAMLClaimsTest extends org.junit.Assert {
assertTrue(samlTokenProvider.canHandleToken(WSS4JConstants.WSS_SAML2_TOKEN_TYPE));
TokenProviderResponse providerResponse = samlTokenProvider.createToken(providerParameters);
- assertTrue(providerResponse != null);
+ assertNotNull(providerResponse);
assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null);
Element token = (Element)providerResponse.getToken();
@@ -438,7 +438,7 @@ public class SAMLClaimsTest extends org.junit.Assert {
assertTrue(samlTokenProvider.canHandleToken(WSS4JConstants.WSS_SAML2_TOKEN_TYPE));
TokenProviderResponse providerResponse = samlTokenProvider.createToken(providerParameters);
- assertTrue(providerResponse != null);
+ assertNotNull(providerResponse);
assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null);
Element token = (Element)providerResponse.getToken();
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 f67bc96..a591e93 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
@@ -89,7 +89,7 @@ public class SAMLProviderActAsTest extends org.junit.Assert {
assertTrue(samlTokenProvider.canHandleToken(WSS4JConstants.WSS_SAML_TOKEN_TYPE));
TokenProviderResponse providerResponse = samlTokenProvider.createToken(providerParameters);
- assertTrue(providerResponse != null);
+ assertNotNull(providerResponse);
assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null);
// Verify the token
@@ -137,7 +137,7 @@ public class SAMLProviderActAsTest extends org.junit.Assert {
assertTrue(samlTokenProvider.canHandleToken(WSS4JConstants.WSS_SAML2_TOKEN_TYPE));
TokenProviderResponse providerResponse = samlTokenProvider.createToken(providerParameters);
- assertTrue(providerResponse != null);
+ assertNotNull(providerResponse);
assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null);
// Verify the token
@@ -192,7 +192,7 @@ public class SAMLProviderActAsTest extends org.junit.Assert {
assertTrue(samlTokenProvider.canHandleToken(WSS4JConstants.WSS_SAML_TOKEN_TYPE));
TokenProviderResponse providerResponse = samlTokenProvider.createToken(providerParameters);
- assertTrue(providerResponse != null);
+ assertNotNull(providerResponse);
assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null);
Element token = (Element)providerResponse.getToken();
@@ -208,7 +208,7 @@ public class SAMLProviderActAsTest extends org.junit.Assert {
((SAMLTokenProvider)samlTokenProvider).setAttributeStatementProviders(customProviderList);
providerResponse = samlTokenProvider.createToken(providerParameters);
- assertTrue(providerResponse != null);
+ assertNotNull(providerResponse);
assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null);
token = (Element)providerResponse.getToken();
@@ -248,7 +248,7 @@ public class SAMLProviderActAsTest extends org.junit.Assert {
assertTrue(samlTokenProvider.canHandleToken(WSS4JConstants.WSS_SAML2_TOKEN_TYPE));
TokenProviderResponse providerResponse = samlTokenProvider.createToken(providerParameters);
- assertTrue(providerResponse != null);
+ assertNotNull(providerResponse);
assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null);
// Verify the token
@@ -306,7 +306,7 @@ public class SAMLProviderActAsTest extends org.junit.Assert {
assertTrue(samlTokenProvider.canHandleToken(WSS4JConstants.WSS_SAML_TOKEN_TYPE));
TokenProviderResponse providerResponse = samlTokenProvider.createToken(providerParameters);
- assertTrue(providerResponse != null);
+ assertNotNull(providerResponse);
assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null);
// Verify the token
@@ -345,7 +345,7 @@ public class SAMLProviderActAsTest extends org.junit.Assert {
assertTrue(samlTokenProvider.canHandleToken(WSS4JConstants.WSS_SAML2_TOKEN_TYPE));
providerResponse = samlTokenProvider.createToken(providerParameters);
- assertTrue(providerResponse != null);
+ assertNotNull(providerResponse);
assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null);
// Verify the token
@@ -383,7 +383,7 @@ public class SAMLProviderActAsTest extends org.junit.Assert {
providerParameters.setPrincipal(new CustomTokenPrincipal("bob"));
assertTrue(samlTokenProvider.canHandleToken(WSS4JConstants.WSS_SAML_TOKEN_TYPE));
TokenProviderResponse providerResponse = samlTokenProvider.createToken(providerParameters);
- assertTrue(providerResponse != null);
+ assertNotNull(providerResponse);
assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null);
return (Element)providerResponse.getToken();
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderCustomTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderCustomTest.java
index 5c17f43..c78e302 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderCustomTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderCustomTest.java
@@ -62,7 +62,7 @@ public class SAMLProviderCustomTest extends org.junit.Assert {
assertTrue(samlTokenProvider.canHandleToken(WSS4JConstants.WSS_SAML_TOKEN_TYPE));
TokenProviderResponse providerResponse = samlTokenProvider.createToken(providerParameters);
- assertTrue(providerResponse != null);
+ assertNotNull(providerResponse);
assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null);
Element token = (Element)providerResponse.getToken();
@@ -90,7 +90,7 @@ public class SAMLProviderCustomTest extends org.junit.Assert {
assertTrue(samlTokenProvider.canHandleToken(WSS4JConstants.WSS_SAML2_TOKEN_TYPE));
TokenProviderResponse providerResponse = samlTokenProvider.createToken(providerParameters);
- assertTrue(providerResponse != null);
+ assertNotNull(providerResponse);
assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null);
Element token = (Element)providerResponse.getToken();
@@ -118,7 +118,7 @@ public class SAMLProviderCustomTest extends org.junit.Assert {
assertTrue(samlTokenProvider.canHandleToken(WSS4JConstants.WSS_SAML_TOKEN_TYPE));
TokenProviderResponse providerResponse = samlTokenProvider.createToken(providerParameters);
- assertTrue(providerResponse != null);
+ assertNotNull(providerResponse);
assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null);
Element token = (Element)providerResponse.getToken();
@@ -151,7 +151,7 @@ public class SAMLProviderCustomTest extends org.junit.Assert {
assertTrue(samlTokenProvider.canHandleToken(WSS4JConstants.WSS_SAML2_TOKEN_TYPE));
TokenProviderResponse providerResponse = samlTokenProvider.createToken(providerParameters);
- assertTrue(providerResponse != null);
+ assertNotNull(providerResponse);
assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null);
Element token = (Element)providerResponse.getToken();
@@ -178,7 +178,7 @@ public class SAMLProviderCustomTest extends org.junit.Assert {
assertTrue(samlTokenProvider.canHandleToken(WSS4JConstants.WSS_SAML_TOKEN_TYPE));
TokenProviderResponse providerResponse = samlTokenProvider.createToken(providerParameters);
- assertTrue(providerResponse != null);
+ assertNotNull(providerResponse);
assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null);
Element token = (Element)providerResponse.getToken();
@@ -206,7 +206,7 @@ public class SAMLProviderCustomTest extends org.junit.Assert {
assertTrue(samlTokenProvider.canHandleToken(WSS4JConstants.WSS_SAML2_TOKEN_TYPE));
TokenProviderResponse providerResponse = samlTokenProvider.createToken(providerParameters);
- assertTrue(providerResponse != null);
+ assertNotNull(providerResponse);
assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null);
Element token = (Element)providerResponse.getToken();
@@ -231,7 +231,7 @@ public class SAMLProviderCustomTest extends org.junit.Assert {
assertTrue(samlTokenProvider.canHandleToken(WSS4JConstants.WSS_SAML_TOKEN_TYPE));
TokenProviderResponse providerResponse = samlTokenProvider.createToken(providerParameters);
- assertTrue(providerResponse != null);
+ assertNotNull(providerResponse);
assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null);
Element token = (Element)providerResponse.getToken();
@@ -258,7 +258,7 @@ public class SAMLProviderCustomTest extends org.junit.Assert {
assertTrue(samlTokenProvider.canHandleToken(WSS4JConstants.WSS_SAML_TOKEN_TYPE));
TokenProviderResponse providerResponse = samlTokenProvider.createToken(providerParameters);
- assertTrue(providerResponse != null);
+ assertNotNull(providerResponse);
assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null);
Element token = (Element)providerResponse.getToken();
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderKeyTypeTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderKeyTypeTest.java
index 4d31154..0df0cfb 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderKeyTypeTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderKeyTypeTest.java
@@ -66,7 +66,7 @@ public class SAMLProviderKeyTypeTest extends org.junit.Assert {
createProviderParameters(WSS4JConstants.WSS_SAML_TOKEN_TYPE, STSConstants.BEARER_KEY_KEYTYPE);
assertTrue(samlTokenProvider.canHandleToken(WSS4JConstants.WSS_SAML_TOKEN_TYPE));
TokenProviderResponse providerResponse = samlTokenProvider.createToken(providerParameters);
- assertTrue(providerResponse != null);
+ assertNotNull(providerResponse);
assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null);
Element token = (Element)providerResponse.getToken();
@@ -89,7 +89,7 @@ public class SAMLProviderKeyTypeTest extends org.junit.Assert {
createProviderParameters(WSS4JConstants.WSS_SAML2_TOKEN_TYPE, STSConstants.BEARER_KEY_KEYTYPE);
assertTrue(samlTokenProvider.canHandleToken(WSS4JConstants.WSS_SAML2_TOKEN_TYPE));
TokenProviderResponse providerResponse = samlTokenProvider.createToken(providerParameters);
- assertTrue(providerResponse != null);
+ assertNotNull(providerResponse);
assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null);
Element token = (Element)providerResponse.getToken();
@@ -130,7 +130,7 @@ public class SAMLProviderKeyTypeTest extends org.junit.Assert {
providerParameters.getKeyRequirements().setReceivedKey(receivedKey);
TokenProviderResponse providerResponse = samlTokenProvider.createToken(providerParameters);
- assertTrue(providerResponse != null);
+ assertNotNull(providerResponse);
assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null);
Element token = (Element)providerResponse.getToken();
@@ -170,7 +170,7 @@ public class SAMLProviderKeyTypeTest extends org.junit.Assert {
providerParameters.getKeyRequirements().setReceivedKey(receivedKey);
TokenProviderResponse providerResponse = samlTokenProvider.createToken(providerParameters);
- assertTrue(providerResponse != null);
+ assertNotNull(providerResponse);
assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null);
Element token = (Element)providerResponse.getToken();
@@ -218,7 +218,7 @@ public class SAMLProviderKeyTypeTest extends org.junit.Assert {
providerParameters.getKeyRequirements().setComputedKeyAlgorithm(STSConstants.COMPUTED_KEY_PSHA1);
TokenProviderResponse providerResponse = samlTokenProvider.createToken(providerParameters);
- assertTrue(providerResponse != null);
+ assertNotNull(providerResponse);
assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null);
Element token = (Element)providerResponse.getToken();
@@ -265,7 +265,7 @@ public class SAMLProviderKeyTypeTest extends org.junit.Assert {
providerParameters.getKeyRequirements().setEntropy(entropy);
TokenProviderResponse providerResponse = samlTokenProvider.createToken(providerParameters);
- assertTrue(providerResponse != null);
+ assertNotNull(providerResponse);
assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null);
Element token = (Element)providerResponse.getToken();
@@ -317,7 +317,7 @@ public class SAMLProviderKeyTypeTest extends org.junit.Assert {
providerParameters.getKeyRequirements().setComputedKeyAlgorithm(STSConstants.COMPUTED_KEY_PSHA1);
TokenProviderResponse providerResponse = samlTokenProvider.createToken(providerParameters);
- assertTrue(providerResponse != null);
+ assertNotNull(providerResponse);
assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null);
Element token = (Element)providerResponse.getToken();
@@ -386,7 +386,7 @@ public class SAMLProviderKeyTypeTest extends org.junit.Assert {
providerParameters.getStsProperties().getSignatureProperties().setUseKeyValue(true);
assertTrue(samlTokenProvider.canHandleToken(WSS4JConstants.WSS_SAML_TOKEN_TYPE));
TokenProviderResponse providerResponse = samlTokenProvider.createToken(providerParameters);
- assertTrue(providerResponse != null);
+ assertNotNull(providerResponse);
assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null);
Element token = (Element)providerResponse.getToken();
@@ -414,7 +414,7 @@ public class SAMLProviderKeyTypeTest extends org.junit.Assert {
((SAMLTokenProvider)samlTokenProvider).setSignToken(false);
TokenProviderResponse providerResponse = samlTokenProvider.createToken(providerParameters);
- assertTrue(providerResponse != null);
+ assertNotNull(providerResponse);
assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null);
Element token = (Element)providerResponse.getToken();
@@ -443,7 +443,7 @@ public class SAMLProviderKeyTypeTest extends org.junit.Assert {
);
assertTrue(samlTokenProvider.canHandleToken(WSS4JConstants.WSS_SAML_TOKEN_TYPE));
TokenProviderResponse providerResponse = samlTokenProvider.createToken(providerParameters);
- assertTrue(providerResponse != null);
+ assertNotNull(providerResponse);
assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null);
Element token = (Element)providerResponse.getToken();
@@ -470,7 +470,7 @@ public class SAMLProviderKeyTypeTest extends org.junit.Assert {
// This will fail as the requested c14n algorithm is rejected
TokenProviderResponse providerResponse = samlTokenProvider.createToken(providerParameters);
- assertTrue(providerResponse != null);
+ assertNotNull(providerResponse);
assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null);
Element token = (Element)providerResponse.getToken();
@@ -488,7 +488,7 @@ public class SAMLProviderKeyTypeTest extends org.junit.Assert {
// This will succeed as the requested c14n algorithm is accepted
providerResponse = samlTokenProvider.createToken(providerParameters);
- assertTrue(providerResponse != null);
+ assertNotNull(providerResponse);
assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null);
token = (Element)providerResponse.getToken();
@@ -512,7 +512,7 @@ public class SAMLProviderKeyTypeTest extends org.junit.Assert {
// Default
TokenProviderResponse providerResponse = samlTokenProvider.createToken(providerParameters);
- assertTrue(providerResponse != null);
+ assertNotNull(providerResponse);
assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null);
Element token = (Element)providerResponse.getToken();
@@ -525,7 +525,7 @@ public class SAMLProviderKeyTypeTest extends org.junit.Assert {
// This will fail as the requested signature algorithm is rejected
providerResponse = samlTokenProvider.createToken(providerParameters);
- assertTrue(providerResponse != null);
+ assertNotNull(providerResponse);
assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null);
token = (Element)providerResponse.getToken();
@@ -539,7 +539,7 @@ public class SAMLProviderKeyTypeTest extends org.junit.Assert {
// This will succeed as the requested signature algorithm is accepted
providerResponse = samlTokenProvider.createToken(providerParameters);
- assertTrue(providerResponse != null);
+ assertNotNull(providerResponse);
assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null);
token = (Element)providerResponse.getToken();
@@ -558,7 +558,7 @@ public class SAMLProviderKeyTypeTest extends org.junit.Assert {
// Default
TokenProviderResponse providerResponse = samlTokenProvider.createToken(providerParameters);
- assertTrue(providerResponse != null);
+ assertNotNull(providerResponse);
assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null);
Element token = (Element)providerResponse.getToken();
@@ -571,7 +571,7 @@ public class SAMLProviderKeyTypeTest extends org.junit.Assert {
signatureProperties.setDigestAlgorithm(WSS4JConstants.SHA1);
providerResponse = samlTokenProvider.createToken(providerParameters);
- assertTrue(providerResponse != null);
+ assertNotNull(providerResponse);
assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null);
token = (Element)providerResponse.getToken();
@@ -592,13 +592,13 @@ public class SAMLProviderKeyTypeTest extends org.junit.Assert {
keyRequirements.setEncryptWith(WSS4JConstants.AES_128);
keyRequirements.setKeySize(92);
TokenProviderResponse providerResponse = samlTokenProvider.createToken(providerParameters);
- assertTrue(providerResponse != null);
+ assertNotNull(providerResponse);
assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null);
keyRequirements.setKeySize(128);
keyRequirements.setEncryptWith(WSS4JConstants.AES_256);
providerResponse = samlTokenProvider.createToken(providerParameters);
- assertTrue(providerResponse != null);
+ assertNotNull(providerResponse);
assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null);
}
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderLifetimeTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderLifetimeTest.java
index 1c8964c..ea99d2d 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderLifetimeTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderLifetimeTest.java
@@ -78,7 +78,7 @@ public class SAMLProviderLifetimeTest extends org.junit.Assert {
assertTrue(samlTokenProvider.canHandleToken(WSS4JConstants.WSS_SAML2_TOKEN_TYPE));
TokenProviderResponse providerResponse = samlTokenProvider.createToken(providerParameters);
- assertTrue(providerResponse != null);
+ assertNotNull(providerResponse);
assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null);
long duration = Duration.between(providerResponse.getCreated(), providerResponse.getExpires()).getSeconds();
assertEquals(requestedLifetime, duration);
@@ -116,7 +116,7 @@ public class SAMLProviderLifetimeTest extends org.junit.Assert {
assertTrue(samlTokenProvider.canHandleToken(WSS4JConstants.WSS_SAML2_TOKEN_TYPE));
TokenProviderResponse providerResponse = samlTokenProvider.createToken(providerParameters);
- assertTrue(providerResponse != null);
+ assertNotNull(providerResponse);
assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null);
assertEquals(providerResponse.getExpires().toEpochMilli(), expirationTime.toEpochMilli());
}
@@ -143,7 +143,7 @@ public class SAMLProviderLifetimeTest extends org.junit.Assert {
assertTrue(samlTokenProvider.canHandleToken(WSS4JConstants.WSS_SAML2_TOKEN_TYPE));
TokenProviderResponse providerResponse = samlTokenProvider.createToken(providerParameters);
- assertTrue(providerResponse != null);
+ assertNotNull(providerResponse);
assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null);
long duration = Duration.between(providerResponse.getCreated(), providerResponse.getExpires()).getSeconds();
assertEquals(providerLifetime, duration);
@@ -263,7 +263,7 @@ public class SAMLProviderLifetimeTest extends org.junit.Assert {
assertTrue(samlTokenProvider.canHandleToken(WSS4JConstants.WSS_SAML2_TOKEN_TYPE));
TokenProviderResponse providerResponse = samlTokenProvider.createToken(providerParameters);
- assertTrue(providerResponse != null);
+ assertNotNull(providerResponse);
assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null);
long duration = Duration.between(providerResponse.getCreated(), providerResponse.getExpires()).getSeconds();
@@ -304,7 +304,7 @@ public class SAMLProviderLifetimeTest extends org.junit.Assert {
assertTrue(samlTokenProvider.canHandleToken(WSS4JConstants.WSS_SAML2_TOKEN_TYPE));
TokenProviderResponse providerResponse = samlTokenProvider.createToken(providerParameters);
- assertTrue(providerResponse != null);
+ assertNotNull(providerResponse);
assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null);
long duration = Duration.between(providerResponse.getCreated(), providerResponse.getExpires()).getSeconds();
@@ -354,7 +354,7 @@ public class SAMLProviderLifetimeTest extends org.junit.Assert {
conditionsProvider.setFutureTimeToLive(60L * 60L);
TokenProviderResponse providerResponse = samlTokenProvider.createToken(providerParameters);
- assertTrue(providerResponse != null);
+ assertNotNull(providerResponse);
assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null);
Element token = (Element)providerResponse.getToken();
String tokenString = DOM2Writer.nodeToString(token);
@@ -390,7 +390,7 @@ public class SAMLProviderLifetimeTest extends org.junit.Assert {
assertTrue(samlTokenProvider.canHandleToken(WSS4JConstants.WSS_SAML2_TOKEN_TYPE));
TokenProviderResponse providerResponse = samlTokenProvider.createToken(providerParameters);
- assertTrue(providerResponse != null);
+ assertNotNull(providerResponse);
assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null);
long duration = Duration.between(providerResponse.getCreated(), providerResponse.getExpires()).getSeconds();
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderOnBehalfOfTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderOnBehalfOfTest.java
index b4ed463..df97698 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderOnBehalfOfTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderOnBehalfOfTest.java
@@ -78,7 +78,7 @@ public class SAMLProviderOnBehalfOfTest extends org.junit.Assert {
assertTrue(samlTokenProvider.canHandleToken(WSS4JConstants.WSS_SAML_TOKEN_TYPE));
TokenProviderResponse providerResponse = samlTokenProvider.createToken(providerParameters);
- assertTrue(providerResponse != null);
+ assertNotNull(providerResponse);
assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null);
Element token = (Element)providerResponse.getToken();
@@ -108,7 +108,7 @@ public class SAMLProviderOnBehalfOfTest extends org.junit.Assert {
assertTrue(samlTokenProvider.canHandleToken(WSS4JConstants.WSS_SAML2_TOKEN_TYPE));
TokenProviderResponse providerResponse = samlTokenProvider.createToken(providerParameters);
- assertTrue(providerResponse != null);
+ assertNotNull(providerResponse);
assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null);
Element token = (Element)providerResponse.getToken();
@@ -145,7 +145,7 @@ public class SAMLProviderOnBehalfOfTest extends org.junit.Assert {
assertTrue(samlTokenProvider.canHandleToken(WSS4JConstants.WSS_SAML_TOKEN_TYPE));
TokenProviderResponse providerResponse = samlTokenProvider.createToken(providerParameters);
- assertTrue(providerResponse != null);
+ assertNotNull(providerResponse);
assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null);
Element token = (Element)providerResponse.getToken();
@@ -161,7 +161,7 @@ public class SAMLProviderOnBehalfOfTest extends org.junit.Assert {
((SAMLTokenProvider)samlTokenProvider).setAttributeStatementProviders(customProviderList);
providerResponse = samlTokenProvider.createToken(providerParameters);
- assertTrue(providerResponse != null);
+ assertNotNull(providerResponse);
assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null);
token = (Element)providerResponse.getToken();
@@ -177,7 +177,7 @@ public class SAMLProviderOnBehalfOfTest extends org.junit.Assert {
providerParameters.setPrincipal(new CustomTokenPrincipal(user));
assertTrue(samlTokenProvider.canHandleToken(WSS4JConstants.WSS_SAML_TOKEN_TYPE));
TokenProviderResponse providerResponse = samlTokenProvider.createToken(providerParameters);
- assertTrue(providerResponse != null);
+ assertNotNull(providerResponse);
assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null);
return (Element)providerResponse.getToken();
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderRealmTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderRealmTest.java
index 8ae75ba..f33011a 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderRealmTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderRealmTest.java
@@ -68,7 +68,7 @@ public class SAMLProviderRealmTest extends org.junit.Assert {
// Realm "A"
assertTrue(samlTokenProvider.canHandleToken(WSS4JConstants.WSS_SAML_TOKEN_TYPE, "A"));
TokenProviderResponse providerResponse = samlTokenProvider.createToken(providerParameters);
- assertTrue(providerResponse != null);
+ assertNotNull(providerResponse);
assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null);
Element token = (Element)providerResponse.getToken();
@@ -82,7 +82,7 @@ public class SAMLProviderRealmTest extends org.junit.Assert {
providerParameters.setRealm("B");
assertTrue(samlTokenProvider.canHandleToken(WSS4JConstants.WSS_SAML_TOKEN_TYPE, "B"));
providerResponse = samlTokenProvider.createToken(providerParameters);
- assertTrue(providerResponse != null);
+ assertNotNull(providerResponse);
assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null);
token = (Element)providerResponse.getToken();
@@ -96,7 +96,7 @@ public class SAMLProviderRealmTest extends org.junit.Assert {
providerParameters.setRealm(null);
assertTrue(samlTokenProvider.canHandleToken(WSS4JConstants.WSS_SAML_TOKEN_TYPE, null));
providerResponse = samlTokenProvider.createToken(providerParameters);
- assertTrue(providerResponse != null);
+ assertNotNull(providerResponse);
assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null);
token = (Element)providerResponse.getToken();
@@ -129,7 +129,7 @@ public class SAMLProviderRealmTest extends org.junit.Assert {
// Realm "A"
assertTrue(samlTokenProvider.canHandleToken(WSS4JConstants.WSS_SAML_TOKEN_TYPE, "A"));
TokenProviderResponse providerResponse = samlTokenProvider.createToken(providerParameters);
- assertTrue(providerResponse != null);
+ assertNotNull(providerResponse);
assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null);
Element token = (Element)providerResponse.getToken();
@@ -143,7 +143,7 @@ public class SAMLProviderRealmTest extends org.junit.Assert {
providerParameters.setRealm("B");
assertTrue(samlTokenProvider.canHandleToken(WSS4JConstants.WSS_SAML_TOKEN_TYPE, "B"));
providerResponse = samlTokenProvider.createToken(providerParameters);
- assertTrue(providerResponse != null);
+ assertNotNull(providerResponse);
assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null);
token = (Element)providerResponse.getToken();
@@ -157,7 +157,7 @@ public class SAMLProviderRealmTest extends org.junit.Assert {
providerParameters.setRealm(null);
assertTrue(samlTokenProvider.canHandleToken(WSS4JConstants.WSS_SAML_TOKEN_TYPE, null));
providerResponse = samlTokenProvider.createToken(providerParameters);
- assertTrue(providerResponse != null);
+ assertNotNull(providerResponse);
assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null);
token = (Element)providerResponse.getToken();
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SCTProviderTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SCTProviderTest.java
index aecf4d9..dbd497a 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SCTProviderTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SCTProviderTest.java
@@ -59,7 +59,7 @@ public class SCTProviderTest extends org.junit.Assert {
assertTrue(sctTokenProvider.canHandleToken(STSUtils.TOKEN_TYPE_SCT_05_12));
TokenProviderResponse providerResponse = sctTokenProvider.createToken(providerParameters);
- assertTrue(providerResponse != null);
+ assertNotNull(providerResponse);
assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null);
Element token = (Element)providerResponse.getToken();
@@ -80,7 +80,7 @@ public class SCTProviderTest extends org.junit.Assert {
assertTrue(sctTokenProvider.canHandleToken(STSUtils.TOKEN_TYPE_SCT_05_02));
TokenProviderResponse providerResponse = sctTokenProvider.createToken(providerParameters);
- assertTrue(providerResponse != null);
+ assertNotNull(providerResponse);
assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null);
Element token = (Element)providerResponse.getToken();
@@ -102,15 +102,15 @@ public class SCTProviderTest extends org.junit.Assert {
assertTrue(sctTokenProvider.canHandleToken(STSUtils.TOKEN_TYPE_SCT_05_12));
TokenProviderResponse providerResponse = sctTokenProvider.createToken(providerParameters);
- assertTrue(providerResponse != null);
+ assertNotNull(providerResponse);
assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null);
assertTrue(providerResponse.getEntropy() != null && providerResponse.getEntropy().length > 0);
((SCTProvider)sctTokenProvider).setReturnEntropy(false);
providerResponse = sctTokenProvider.createToken(providerParameters);
- assertTrue(providerResponse != null);
+ assertNotNull(providerResponse);
assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null);
- assertTrue(providerResponse.getEntropy() == null);
+ assertNull(providerResponse.getEntropy());
}
/**
@@ -125,7 +125,7 @@ public class SCTProviderTest extends org.junit.Assert {
assertTrue(sctTokenProvider.canHandleToken(STSUtils.TOKEN_TYPE_SCT_05_12));
TokenProviderResponse providerResponse = sctTokenProvider.createToken(providerParameters);
- assertTrue(providerResponse != null);
+ assertNotNull(providerResponse);
assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null);
Element token = (Element)providerResponse.getToken();
@@ -147,7 +147,7 @@ public class SCTProviderTest extends org.junit.Assert {
assertTrue(sctTokenProvider.canHandleToken(STSUtils.TOKEN_TYPE_SCT_05_12));
TokenProviderResponse providerResponse = sctTokenProvider.createToken(providerParameters);
- assertTrue(providerResponse != null);
+ assertNotNull(providerResponse);
assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null);
assertTrue(256L == providerResponse.getKeySize());
@@ -155,7 +155,7 @@ public class SCTProviderTest extends org.junit.Assert {
KeyRequirements keyRequirements = providerParameters.getKeyRequirements();
keyRequirements.setKeySize(192);
providerResponse = sctTokenProvider.createToken(providerParameters);
- assertTrue(providerResponse != null);
+ assertNotNull(providerResponse);
assertTrue(192L == providerResponse.getKeySize());
// Test a bad KeySize - it will just use the default keysize
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerLifetimeTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerLifetimeTest.java
index 3343c68..03ec5c6 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerLifetimeTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerLifetimeTest.java
@@ -91,7 +91,7 @@ public class SAMLTokenRenewerLifetimeTest extends org.junit.Assert {
Lifetime lifetime = new Lifetime();
lifetime.setCreated(creationTime.atZone(ZoneOffset.UTC).format(DateUtil.getDateTimeFormatter(true)));
lifetime.setExpires(expirationTime.atZone(ZoneOffset.UTC).format(DateUtil.getDateTimeFormatter(true)));
-
+
renewerParameters.getTokenRequirements().setLifetime(lifetime);
CallbackHandler callbackHandler = new PasswordCallbackHandler();
@@ -111,9 +111,9 @@ public class SAMLTokenRenewerLifetimeTest extends org.junit.Assert {
assertTrue(samlTokenRenewer.canHandleToken(renewTarget));
TokenRenewerResponse renewerResponse = samlTokenRenewer.renewToken(renewerParameters);
- assertTrue(renewerResponse != null);
- assertTrue(renewerResponse.getToken() != null);
-
+ assertNotNull(renewerResponse);
+ assertNotNull(renewerResponse.getToken());
+
long duration = Duration.between(renewerResponse.getCreated(), renewerResponse.getExpires()).getSeconds();
assertEquals(requestedLifetime, duration);
}
@@ -153,9 +153,9 @@ public class SAMLTokenRenewerLifetimeTest extends org.junit.Assert {
assertTrue(samlTokenRenewer.canHandleToken(renewTarget));
TokenRenewerResponse renewerResponse = samlTokenRenewer.renewToken(renewerParameters);
- assertTrue(renewerResponse != null);
- assertTrue(renewerResponse.getToken() != null);
-
+ assertNotNull(renewerResponse);
+ assertNotNull(renewerResponse.getToken());
+
long duration = Duration.between(renewerResponse.getCreated(), renewerResponse.getExpires()).getSeconds();
assertEquals(providerLifetime, duration);
}
@@ -187,7 +187,7 @@ public class SAMLTokenRenewerLifetimeTest extends org.junit.Assert {
Lifetime lifetime = new Lifetime();
lifetime.setCreated(creationTime.atZone(ZoneOffset.UTC).format(DateUtil.getDateTimeFormatter(true)));
lifetime.setExpires(expirationTime.atZone(ZoneOffset.UTC).format(DateUtil.getDateTimeFormatter(true)));
-
+
renewerParameters.getTokenRequirements().setLifetime(lifetime);
CallbackHandler callbackHandler = new PasswordCallbackHandler();
@@ -238,7 +238,7 @@ public class SAMLTokenRenewerLifetimeTest extends org.junit.Assert {
Lifetime lifetime = new Lifetime();
lifetime.setCreated(creationTime.atZone(ZoneOffset.UTC).format(DateUtil.getDateTimeFormatter(true)));
lifetime.setExpires(expirationTime.atZone(ZoneOffset.UTC).format(DateUtil.getDateTimeFormatter(true)));
-
+
renewerParameters.getTokenRequirements().setLifetime(lifetime);
CallbackHandler callbackHandler = new PasswordCallbackHandler();
@@ -294,7 +294,7 @@ public class SAMLTokenRenewerLifetimeTest extends org.junit.Assert {
Lifetime lifetime = new Lifetime();
lifetime.setCreated(creationTime.atZone(ZoneOffset.UTC).format(DateUtil.getDateTimeFormatter(true)));
lifetime.setExpires(expirationTime.atZone(ZoneOffset.UTC).format(DateUtil.getDateTimeFormatter(true)));
-
+
renewerParameters.getTokenRequirements().setLifetime(lifetime);
CallbackHandler callbackHandler = new PasswordCallbackHandler();
@@ -314,9 +314,9 @@ public class SAMLTokenRenewerLifetimeTest extends org.junit.Assert {
assertTrue(samlTokenRenewer.canHandleToken(renewTarget));
TokenRenewerResponse renewerResponse = samlTokenRenewer.renewToken(renewerParameters);
- assertTrue(renewerResponse != null);
- assertTrue(renewerResponse.getToken() != null);
-
+ assertNotNull(renewerResponse);
+ assertNotNull(renewerResponse.getToken());
+
long duration = Duration.between(renewerResponse.getCreated(), renewerResponse.getExpires()).getSeconds();
assertEquals(maxLifetime, duration);
}
@@ -386,7 +386,7 @@ public class SAMLTokenRenewerLifetimeTest extends org.junit.Assert {
}
TokenProviderResponse providerResponse = samlTokenProvider.createToken(providerParameters);
- assertTrue(providerResponse != null);
+ assertNotNull(providerResponse);
assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null);
return (Element)providerResponse.getToken();
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerPOPTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerPOPTest.java
index ec490d0..1c3dd30 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerPOPTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerPOPTest.java
@@ -108,8 +108,8 @@ public class SAMLTokenRenewerPOPTest extends org.junit.Assert {
TokenValidatorResponse validatorResponse =
samlTokenValidator.validateToken(validatorParameters);
- assertTrue(validatorResponse != null);
- assertTrue(validatorResponse.getToken() != null);
+ assertNotNull(validatorResponse);
+ assertNotNull(validatorResponse.getToken());
assertTrue(validatorResponse.getToken().getState() == STATE.VALID);
// Renew the Assertion
@@ -154,8 +154,8 @@ public class SAMLTokenRenewerPOPTest extends org.junit.Assert {
// Now successfully renew the token
TokenRenewerResponse renewerResponse =
samlTokenRenewer.renewToken(renewerParameters);
- assertTrue(renewerResponse != null);
- assertTrue(renewerResponse.getToken() != null);
+ assertNotNull(renewerResponse);
+ assertNotNull(renewerResponse.getToken());
}
/**
@@ -185,8 +185,8 @@ public class SAMLTokenRenewerPOPTest extends org.junit.Assert {
TokenValidatorResponse validatorResponse =
samlTokenValidator.validateToken(validatorParameters);
- assertTrue(validatorResponse != null);
- assertTrue(validatorResponse.getToken() != null);
+ assertNotNull(validatorResponse);
+ assertNotNull(validatorResponse.getToken());
assertTrue(validatorResponse.getToken().getState() == STATE.VALID);
// Renew the Assertion
@@ -288,7 +288,7 @@ public class SAMLTokenRenewerPOPTest extends org.junit.Assert {
if (ttlMs != 0) {
Lifetime lifetime = new Lifetime();
-
+
Instant creationTime = Instant.now();
Instant expirationTime = creationTime.plusNanos(ttlMs * 1000000L);
@@ -299,7 +299,7 @@ public class SAMLTokenRenewerPOPTest extends org.junit.Assert {
}
TokenProviderResponse providerResponse = samlTokenProvider.createToken(providerParameters);
- assertTrue(providerResponse != null);
+ assertNotNull(providerResponse);
assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null);
return (Element)providerResponse.getToken();
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerRealmTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerRealmTest.java
index 8220618..203173d 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerRealmTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerRealmTest.java
@@ -110,8 +110,8 @@ public class SAMLTokenRenewerRealmTest extends org.junit.Assert {
// Validate the token
TokenValidatorResponse validatorResponse =
samlTokenValidator.validateToken(validatorParameters);
- assertTrue(validatorResponse != null);
- assertTrue(validatorResponse.getToken() != null);
+ assertNotNull(validatorResponse);
+ assertNotNull(validatorResponse.getToken());
assertTrue(validatorResponse.getToken().getState() == STATE.EXPIRED);
assertTrue("A".equals(validatorResponse.getTokenRealm()));
@@ -135,8 +135,8 @@ public class SAMLTokenRenewerRealmTest extends org.junit.Assert {
assertTrue(samlTokenRenewer.canHandleToken(validatorResponse.getToken(), realm));
TokenRenewerResponse renewerResponse = samlTokenRenewer.renewToken(renewerParameters);
- assertTrue(renewerResponse != null);
- assertTrue(renewerResponse.getToken() != null);
+ assertNotNull(renewerResponse);
+ assertNotNull(renewerResponse.getToken());
// Now validate it again
ReceivedToken validateTarget = new ReceivedToken(renewerResponse.getToken());
@@ -144,8 +144,8 @@ public class SAMLTokenRenewerRealmTest extends org.junit.Assert {
validatorParameters.setToken(validateTarget);
validatorResponse = samlTokenValidator.validateToken(validatorParameters);
- assertTrue(validatorResponse != null);
- assertTrue(validatorResponse.getToken() != null);
+ assertNotNull(validatorResponse);
+ assertNotNull(validatorResponse.getToken());
assertTrue(validatorResponse.getToken().getState() == STATE.VALID);
}
@@ -183,8 +183,8 @@ public class SAMLTokenRenewerRealmTest extends org.junit.Assert {
// Validate the token
TokenValidatorResponse validatorResponse =
samlTokenValidator.validateToken(validatorParameters);
- assertTrue(validatorResponse != null);
- assertTrue(validatorResponse.getToken() != null);
+ assertNotNull(validatorResponse);
+ assertNotNull(validatorResponse.getToken());
assertTrue(validatorResponse.getToken().getState() == STATE.EXPIRED);
assertTrue("B".equals(validatorResponse.getTokenRealm()));
@@ -208,8 +208,8 @@ public class SAMLTokenRenewerRealmTest extends org.junit.Assert {
assertTrue(samlTokenRenewer.canHandleToken(validatorResponse.getToken(), realm));
TokenRenewerResponse renewerResponse = samlTokenRenewer.renewToken(renewerParameters);
- assertTrue(renewerResponse != null);
- assertTrue(renewerResponse.getToken() != null);
+ assertNotNull(renewerResponse);
+ assertNotNull(renewerResponse.getToken());
// Now validate it again
ReceivedToken validateTarget = new ReceivedToken(renewerResponse.getToken());
@@ -217,8 +217,8 @@ public class SAMLTokenRenewerRealmTest extends org.junit.Assert {
validatorParameters.setToken(validateTarget);
validatorResponse = samlTokenValidator.validateToken(validatorParameters);
- assertTrue(validatorResponse != null);
- assertTrue(validatorResponse.getToken() != null);
+ assertNotNull(validatorResponse);
+ assertNotNull(validatorResponse.getToken());
assertTrue(validatorResponse.getToken().getState() == STATE.VALID);
}
@@ -275,13 +275,13 @@ public class SAMLTokenRenewerRealmTest extends org.junit.Assert {
if (ttlMs != 0) {
Lifetime lifetime = new Lifetime();
-
+
Instant creationTime = Instant.now();
Instant expirationTime = creationTime.plusNanos(ttlMs * 1000000L);
lifetime.setCreated(creationTime.atZone(ZoneOffset.UTC).format(DateUtil.getDateTimeFormatter(true)));
lifetime.setExpires(expirationTime.atZone(ZoneOffset.UTC).format(DateUtil.getDateTimeFormatter(true)));
-
+
providerParameters.getTokenRequirements().setLifetime(lifetime);
}
@@ -290,7 +290,7 @@ public class SAMLTokenRenewerRealmTest extends org.junit.Assert {
((SAMLTokenProvider)samlTokenProvider).setRealmMap(samlRealms);
TokenProviderResponse providerResponse = samlTokenProvider.createToken(providerParameters);
- assertTrue(providerResponse != null);
+ assertNotNull(providerResponse);
assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null);
return (Element)providerResponse.getToken();
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerTest.java
index 09c78fb..ad3c360 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerTest.java
@@ -99,8 +99,8 @@ public class SAMLTokenRenewerTest extends org.junit.Assert {
TokenValidatorResponse validatorResponse =
samlTokenValidator.validateToken(validatorParameters);
- assertTrue(validatorResponse != null);
- assertTrue(validatorResponse.getToken() != null);
+ assertNotNull(validatorResponse);
+ assertNotNull(validatorResponse.getToken());
assertTrue(validatorResponse.getToken().getState() == STATE.VALID);
// Renew the Assertion
@@ -120,8 +120,8 @@ public class SAMLTokenRenewerTest extends org.junit.Assert {
TokenRenewerResponse renewerResponse =
samlTokenRenewer.renewToken(renewerParameters);
- assertTrue(renewerResponse != null);
- assertTrue(renewerResponse.getToken() != null);
+ assertNotNull(renewerResponse);
+ assertNotNull(renewerResponse.getToken());
String oldId = new SamlAssertionWrapper(samlToken).getId();
String newId = new SamlAssertionWrapper(renewerResponse.getToken()).getId();
@@ -133,8 +133,8 @@ public class SAMLTokenRenewerTest extends org.junit.Assert {
validatorParameters.setToken(validateTarget);
validatorResponse = samlTokenValidator.validateToken(validatorParameters);
- assertTrue(validatorResponse != null);
- assertTrue(validatorResponse.getToken() != null);
+ assertNotNull(validatorResponse);
+ assertNotNull(validatorResponse.getToken());
assertTrue(validatorResponse.getToken().getState() == STATE.VALID);
// Now try to renew it again!
@@ -145,8 +145,8 @@ public class SAMLTokenRenewerTest extends org.junit.Assert {
assertTrue(samlTokenRenewer.canHandleToken(validatorResponse.getToken()));
renewerResponse = samlTokenRenewer.renewToken(renewerParameters);
- assertTrue(renewerResponse != null);
- assertTrue(renewerResponse.getToken() != null);
+ assertNotNull(renewerResponse);
+ assertNotNull(renewerResponse.getToken());
}
/**
@@ -176,8 +176,8 @@ public class SAMLTokenRenewerTest extends org.junit.Assert {
TokenValidatorResponse validatorResponse =
samlTokenValidator.validateToken(validatorParameters);
- assertTrue(validatorResponse != null);
- assertTrue(validatorResponse.getToken() != null);
+ assertNotNull(validatorResponse);
+ assertNotNull(validatorResponse.getToken());
assertTrue(validatorResponse.getToken().getState() == STATE.VALID);
// Renew the Assertion
@@ -232,8 +232,8 @@ public class SAMLTokenRenewerTest extends org.junit.Assert {
TokenValidatorResponse validatorResponse =
samlTokenValidator.validateToken(validatorParameters);
- assertTrue(validatorResponse != null);
- assertTrue(validatorResponse.getToken() != null);
+ assertNotNull(validatorResponse);
+ assertNotNull(validatorResponse.getToken());
assertTrue(validatorResponse.getToken().getState() == STATE.EXPIRED);
// Renew the Assertion
@@ -261,8 +261,8 @@ public class SAMLTokenRenewerTest extends org.junit.Assert {
samlTokenRenewer.setAllowRenewalAfterExpiry(true);
TokenRenewerResponse renewerResponse =
samlTokenRenewer.renewToken(renewerParameters);
- assertTrue(renewerResponse != null);
- assertTrue(renewerResponse.getToken() != null);
+ assertNotNull(renewerResponse);
+ assertNotNull(renewerResponse.getToken());
String oldId = new SamlAssertionWrapper(samlToken).getId();
String newId = new SamlAssertionWrapper(renewerResponse.getToken()).getId();
@@ -274,8 +274,8 @@ public class SAMLTokenRenewerTest extends org.junit.Assert {
validatorParameters.setToken(validateTarget);
validatorResponse = samlTokenValidator.validateToken(validatorParameters);
- assertTrue(validatorResponse != null);
- assertTrue(validatorResponse.getToken() != null);
+ assertNotNull(validatorResponse);
+ assertNotNull(validatorResponse.getToken());
assertTrue(validatorResponse.getToken().getState() == STATE.VALID);
}
@@ -308,8 +308,8 @@ public class SAMLTokenRenewerTest extends org.junit.Assert {
TokenValidatorResponse validatorResponse =
samlTokenValidator.validateToken(validatorParameters);
- assertTrue(validatorResponse != null);
- assertTrue(validatorResponse.getToken() != null);
+ assertNotNull(validatorResponse);
+ assertNotNull(validatorResponse.getToken());
assertTrue(validatorResponse.getToken().getState() == STATE.EXPIRED);
// Renew the Assertion
@@ -337,8 +337,8 @@ public class SAMLTokenRenewerTest extends org.junit.Assert {
samlTokenRenewer.setAllowRenewalAfterExpiry(true);
TokenRenewerResponse renewerResponse =
samlTokenRenewer.renewToken(renewerParameters);
- assertTrue(renewerResponse != null);
- assertTrue(renewerResponse.getToken() != null);
+ assertNotNull(renewerResponse);
+ assertNotNull(renewerResponse.getToken());
String oldId = new SamlAssertionWrapper(samlToken).getId();
String newId = new SamlAssertionWrapper(renewerResponse.getToken()).getId();
@@ -350,8 +350,8 @@ public class SAMLTokenRenewerTest extends org.junit.Assert {
validatorParameters.setToken(validateTarget);
validatorResponse = samlTokenValidator.validateToken(validatorParameters);
- assertTrue(validatorResponse != null);
- assertTrue(validatorResponse.getToken() != null);
+ assertNotNull(validatorResponse);
+ assertNotNull(validatorResponse.getToken());
assertTrue(validatorResponse.getToken().getState() == STATE.VALID);
}
@@ -385,8 +385,8 @@ public class SAMLTokenRenewerTest extends org.junit.Assert {
TokenValidatorResponse validatorResponse =
samlTokenValidator.validateToken(validatorParameters);
- assertTrue(validatorResponse != null);
- assertTrue(validatorResponse.getToken() != null);
+ assertNotNull(validatorResponse);
+ assertNotNull(validatorResponse.getToken());
assertTrue(validatorResponse.getToken().getState() == STATE.EXPIRED);
// Renew the Assertion
@@ -444,8 +444,8 @@ public class SAMLTokenRenewerTest extends org.junit.Assert {
TokenValidatorResponse validatorResponse =
samlTokenValidator.validateToken(validatorParameters);
- assertTrue(validatorResponse != null);
- assertTrue(validatorResponse.getToken() != null);
+ assertNotNull(validatorResponse);
+ assertNotNull(validatorResponse.getToken());
assertTrue(validatorResponse.getToken().getState() == STATE.EXPIRED);
// Renew the Assertion
@@ -500,8 +500,8 @@ public class SAMLTokenRenewerTest extends org.junit.Assert {
TokenValidatorResponse validatorResponse =
samlTokenValidator.validateToken(validatorParameters);
- assertTrue(validatorResponse != null);
- assertTrue(validatorResponse.getToken() != null);
+ assertNotNull(validatorResponse);
+ assertNotNull(validatorResponse.getToken());
assertTrue(validatorResponse.getToken().getState() == STATE.VALID);
// Renew the Assertion
@@ -579,18 +579,18 @@ public class SAMLTokenRenewerTest extends org.junit.Assert {
if (ttlMs != 0) {
Lifetime lifetime = new Lifetime();
-
+
Instant creationTime = Instant.now();
Instant expirationTime = creationTime.plusNanos(ttlMs * 1000000L);
lifetime.setCreated(creationTime.atZone(ZoneOffset.UTC).format(DateUtil.getDateTimeFormatter(true)));
lifetime.setExpires(expirationTime.atZone(ZoneOffset.UTC).format(DateUtil.getDateTimeFormatter(true)));
-
+
providerParameters.getTokenRequirements().setLifetime(lifetime);
}
TokenProviderResponse providerResponse = samlTokenProvider.createToken(providerParameters);
- assertTrue(providerResponse != null);
+ assertNotNull(providerResponse);
assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null);
return (Element)providerResponse.getToken();
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/JWTTokenValidatorRealmTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/JWTTokenValidatorRealmTest.java
index 30c4626..67fec74 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/JWTTokenValidatorRealmTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/JWTTokenValidatorRealmTest.java
@@ -71,7 +71,7 @@ public class JWTTokenValidatorRealmTest extends org.junit.Assert {
assertTrue(jwtTokenProvider.canHandleToken(JWTTokenProvider.JWT_TOKEN_TYPE));
TokenProviderResponse providerResponse = jwtTokenProvider.createToken(providerParameters);
- assertTrue(providerResponse != null);
+ assertNotNull(providerResponse);
assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null);
String token = (String)providerResponse.getToken();
@@ -92,8 +92,8 @@ public class JWTTokenValidatorRealmTest extends org.junit.Assert {
TokenValidatorResponse validatorResponse =
jwtTokenValidator.validateToken(validatorParameters);
- assertTrue(validatorResponse != null);
- assertTrue(validatorResponse.getToken() != null);
+ assertNotNull(validatorResponse);
+ assertNotNull(validatorResponse.getToken());
assertTrue(validatorResponse.getToken().getState() == STATE.VALID);
assertNull(validatorResponse.getTokenRealm());
@@ -101,8 +101,8 @@ public class JWTTokenValidatorRealmTest extends org.junit.Assert {
((JWTTokenValidator)jwtTokenValidator).setRealmCodec(new IssuerJWTRealmCodec());
validatorResponse = jwtTokenValidator.validateToken(validatorParameters);
- assertTrue(validatorResponse != null);
- assertTrue(validatorResponse.getToken() != null);
+ assertNotNull(validatorResponse);
+ assertNotNull(validatorResponse.getToken());
assertTrue(validatorResponse.getToken().getState() == STATE.VALID);
assertTrue("A".equals(validatorResponse.getTokenRealm()));
@@ -122,7 +122,7 @@ public class JWTTokenValidatorRealmTest extends org.junit.Assert {
assertTrue(jwtTokenProvider.canHandleToken(JWTTokenProvider.JWT_TOKEN_TYPE));
TokenProviderResponse providerResponse = jwtTokenProvider.createToken(providerParameters);
- assertTrue(providerResponse != null);
+ assertNotNull(providerResponse);
assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null);
String token = (String)providerResponse.getToken();
@@ -143,8 +143,8 @@ public class JWTTokenValidatorRealmTest extends org.junit.Assert {
TokenValidatorResponse validatorResponse =
jwtTokenValidator.validateToken(validatorParameters);
- assertTrue(validatorResponse != null);
- assertTrue(validatorResponse.getToken() != null);
+ assertNotNull(validatorResponse);
+ assertNotNull(validatorResponse.getToken());
assertTrue(validatorResponse.getToken().getState() == STATE.VALID);
assertNull(validatorResponse.getTokenRealm());
@@ -152,8 +152,8 @@ public class JWTTokenValidatorRealmTest extends org.junit.Assert {
((JWTTokenValidator)jwtTokenValidator).setRealmCodec(new IssuerJWTRealmCodec());
validatorResponse = jwtTokenValidator.validateToken(validatorParameters);
- assertTrue(validatorResponse != null);
- assertTrue(validatorResponse.getToken() != null);
+ assertNotNull(validatorResponse);
+ assertNotNull(validatorResponse.getToken());
assertTrue(validatorResponse.getToken().getState() == STATE.VALID);
assertTrue("B".equals(validatorResponse.getTokenRealm()));
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/JWTTokenValidatorTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/JWTTokenValidatorTest.java
index 2b083ec..0d4967a 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/JWTTokenValidatorTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/JWTTokenValidatorTest.java
@@ -75,7 +75,7 @@ public class JWTTokenValidatorTest extends org.junit.Assert {
assertTrue(jwtTokenProvider.canHandleToken(JWTTokenProvider.JWT_TOKEN_TYPE));
TokenProviderResponse providerResponse = jwtTokenProvider.createToken(providerParameters);
- assertTrue(providerResponse != null);
+ assertNotNull(providerResponse);
assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null);
String token = (String)providerResponse.getToken();
@@ -96,8 +96,8 @@ public class JWTTokenValidatorTest extends org.junit.Assert {
TokenValidatorResponse validatorResponse =
jwtTokenValidator.validateToken(validatorParameters);
- assertTrue(validatorResponse != null);
- assertTrue(validatorResponse.getToken() != null);
+ assertNotNull(validatorResponse);
+ assertNotNull(validatorResponse.getToken());
assertTrue(validatorResponse.getToken().getState() == STATE.VALID);
Principal principal = validatorResponse.getPrincipal();
@@ -119,7 +119,7 @@ public class JWTTokenValidatorTest extends org.junit.Assert {
assertTrue(jwtTokenProvider.canHandleToken(JWTTokenProvider.JWT_TOKEN_TYPE));
TokenProviderResponse providerResponse = jwtTokenProvider.createToken(providerParameters);
- assertTrue(providerResponse != null);
+ assertNotNull(providerResponse);
assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null);
String token = (String)providerResponse.getToken();
@@ -140,8 +140,8 @@ public class JWTTokenValidatorTest extends org.junit.Assert {
TokenValidatorResponse validatorResponse =
jwtTokenValidator.validateToken(validatorParameters);
- assertTrue(validatorResponse != null);
- assertTrue(validatorResponse.getToken() != null);
+ assertNotNull(validatorResponse);
+ assertNotNull(validatorResponse.getToken());
assertTrue(validatorResponse.getToken().getState() == STATE.INVALID);
}
@@ -160,7 +160,7 @@ public class JWTTokenValidatorTest extends org.junit.Assert {
assertTrue(jwtTokenProvider.canHandleToken(JWTTokenProvider.JWT_TOKEN_TYPE));
TokenProviderResponse providerResponse = jwtTokenProvider.createToken(providerParameters);
- assertTrue(providerResponse != null);
+ assertNotNull(providerResponse);
assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null);
String token = (String)providerResponse.getToken();
@@ -181,8 +181,8 @@ public class JWTTokenValidatorTest extends org.junit.Assert {
TokenValidatorResponse validatorResponse =
jwtTokenValidator.validateToken(validatorParameters);
- assertTrue(validatorResponse != null);
- assertTrue(validatorResponse.getToken() != null);
+ assertNotNull(validatorResponse);
+ assertNotNull(validatorResponse.getToken());
assertTrue(validatorResponse.getToken().getState() == STATE.INVALID);
}
@@ -200,7 +200,7 @@ public class JWTTokenValidatorTest extends org.junit.Assert {
assertTrue(jwtTokenProvider.canHandleToken(JWTTokenProvider.JWT_TOKEN_TYPE));
TokenProviderResponse providerResponse = jwtTokenProvider.createToken(providerParameters);
- assertTrue(providerResponse != null);
+ assertNotNull(providerResponse);
assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null);
String token = (String)providerResponse.getToken();
@@ -223,8 +223,8 @@ public class JWTTokenValidatorTest extends org.junit.Assert {
TokenValidatorResponse validatorResponse =
jwtTokenValidator.validateToken(validatorParameters);
- assertTrue(validatorResponse != null);
- assertTrue(validatorResponse.getToken() != null);
+ assertNotNull(validatorResponse);
+ assertNotNull(validatorResponse.getToken());
assertTrue(validatorResponse.getToken().getState() == STATE.INVALID);
}
@@ -242,7 +242,7 @@ public class JWTTokenValidatorTest extends org.junit.Assert {
assertTrue(jwtTokenProvider.canHandleToken(JWTTokenProvider.JWT_TOKEN_TYPE));
TokenProviderResponse providerResponse = jwtTokenProvider.createToken(providerParameters);
- assertTrue(providerResponse != null);
+ assertNotNull(providerResponse);
assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null);
String token = (String)providerResponse.getToken();
@@ -267,8 +267,8 @@ public class JWTTokenValidatorTest extends org.junit.Assert {
TokenValidatorResponse validatorResponse =
jwtTokenValidator.validateToken(validatorParameters);
- assertTrue(validatorResponse != null);
- assertTrue(validatorResponse.getToken() != null);
+ assertNotNull(validatorResponse);
+ assertNotNull(validatorResponse.getToken());
assertTrue(validatorResponse.getToken().getState() == STATE.INVALID);
}
@@ -285,7 +285,7 @@ public class JWTTokenValidatorTest extends org.junit.Assert {
assertTrue(jwtTokenProvider.canHandleToken(JWTTokenProvider.JWT_TOKEN_TYPE));
TokenProviderResponse providerResponse = jwtTokenProvider.createToken(providerParameters);
- assertTrue(providerResponse != null);
+ assertNotNull(providerResponse);
assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null);
String token = (String)providerResponse.getToken();
@@ -310,8 +310,8 @@ public class JWTTokenValidatorTest extends org.junit.Assert {
TokenValidatorResponse validatorResponse =
jwtTokenValidator.validateToken(validatorParameters);
- assertTrue(validatorResponse != null);
- assertTrue(validatorResponse.getToken() != null);
+ assertNotNull(validatorResponse);
+ assertNotNull(validatorResponse.getToken());
assertTrue(validatorResponse.getToken().getState() == STATE.VALID);
Principal principal = validatorResponse.getPrincipal();
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorCachedRealmTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorCachedRealmTest.java
index 89e2c3d..2b822f5 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorCachedRealmTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorCachedRealmTest.java
@@ -93,8 +93,8 @@ public class SAMLTokenValidatorCachedRealmTest extends org.junit.Assert {
((SAMLTokenValidator)samlTokenValidator).setSamlRealmCodec(samlRealmCodec);
TokenValidatorResponse validatorResponse = samlTokenValidator.validateToken(validatorParameters);
- assertTrue(validatorResponse != null);
- assertTrue(validatorResponse.getToken() != null);
+ assertNotNull(validatorResponse);
+ assertNotNull(validatorResponse.getToken());
assertTrue(validatorResponse.getToken().getState() == STATE.VALID);
assertTrue("A".equals(validatorResponse.getTokenRealm()));
@@ -126,8 +126,8 @@ public class SAMLTokenValidatorCachedRealmTest extends org.junit.Assert {
((SAMLTokenValidator)samlTokenValidator).setSamlRealmCodec(samlRealmCodec);
TokenValidatorResponse validatorResponse = samlTokenValidator.validateToken(validatorParameters);
- assertTrue(validatorResponse != null);
- assertTrue(validatorResponse.getToken() != null);
+ assertNotNull(validatorResponse);
+ assertNotNull(validatorResponse.getToken());
assertTrue(validatorResponse.getToken().getState() == STATE.INVALID);
assertNull(validatorResponse.getTokenRealm());
@@ -182,7 +182,7 @@ public class SAMLTokenValidatorCachedRealmTest extends org.junit.Assert {
((SAMLTokenProvider)samlTokenProvider).setRealmMap(samlRealms);
TokenProviderResponse providerResponse = samlTokenProvider.createToken(providerParameters);
- assertTrue(providerResponse != null);
+ assertNotNull(providerResponse);
assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null);
return (Element)providerResponse.getToken();
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorRealmTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorRealmTest.java
index ab889bd..d8e6ecb 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorRealmTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorRealmTest.java
@@ -79,8 +79,8 @@ public class SAMLTokenValidatorRealmTest extends org.junit.Assert {
// Validate the token - no realm is returned
TokenValidatorResponse validatorResponse =
samlTokenValidator.validateToken(validatorParameters);
- assertTrue(validatorResponse != null);
- assertTrue(validatorResponse.getToken() != null);
+ assertNotNull(validatorResponse);
+ assertNotNull(validatorResponse.getToken());
assertTrue(validatorResponse.getToken().getState() == STATE.VALID);
assertNull(validatorResponse.getTokenRealm());
@@ -89,8 +89,8 @@ public class SAMLTokenValidatorRealmTest extends org.junit.Assert {
((SAMLTokenValidator)samlTokenValidator).setSamlRealmCodec(samlRealmCodec);
validatorResponse = samlTokenValidator.validateToken(validatorParameters);
- assertTrue(validatorResponse != null);
- assertTrue(validatorResponse.getToken() != null);
+ assertNotNull(validatorResponse);
+ assertNotNull(validatorResponse.getToken());
assertTrue(validatorResponse.getToken().getState() == STATE.VALID);
assertTrue("A".equals(validatorResponse.getTokenRealm()));
@@ -122,8 +122,8 @@ public class SAMLTokenValidatorRealmTest extends org.junit.Assert {
// Validate the token - no realm is returned
TokenValidatorResponse validatorResponse =
samlTokenValidator.validateToken(validatorParameters);
- assertTrue(validatorResponse != null);
- assertTrue(validatorResponse.getToken() != null);
+ assertNotNull(validatorResponse);
+ assertNotNull(validatorResponse.getToken());
assertTrue(validatorResponse.getToken().getState() == STATE.VALID);
assertNull(validatorResponse.getTokenRealm());
@@ -132,8 +132,8 @@ public class SAMLTokenValidatorRealmTest extends org.junit.Assert {
((SAMLTokenValidator)samlTokenValidator).setSamlRealmCodec(samlRealmCodec);
validatorResponse = samlTokenValidator.validateToken(validatorParameters);
- assertTrue(validatorResponse != null);
- assertTrue(validatorResponse.getToken() != null);
+ assertNotNull(validatorResponse);
+ assertNotNull(validatorResponse.getToken());
assertTrue(validatorResponse.getToken().getState() == STATE.VALID);
assertTrue("B".equals(validatorResponse.getTokenRealm()));
@@ -190,7 +190,7 @@ public class SAMLTokenValidatorRealmTest extends org.junit.Assert {
((SAMLTokenProvider)samlTokenProvider).setRealmMap(samlRealms);
TokenProviderResponse providerResponse = samlTokenProvider.createToken(providerParameters);
- assertTrue(providerResponse != null);
+ assertNotNull(providerResponse);
assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null);
return (Element)providerResponse.getToken();
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorTest.java
index 3cb7c68..2459a10 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorTest.java
@@ -109,8 +109,8 @@ public class SAMLTokenValidatorTest extends org.junit.Assert {
TokenValidatorResponse validatorResponse =
samlTokenValidator.validateToken(validatorParameters);
- assertTrue(validatorResponse != null);
- assertTrue(validatorResponse.getToken() != null);
+ assertNotNull(validatorResponse);
+ assertNotNull(validatorResponse.getToken());
assertTrue(validatorResponse.getToken().getState() == STATE.VALID);
Principal principal = validatorResponse.getPrincipal();
@@ -142,8 +142,8 @@ public class SAMLTokenValidatorTest extends org.junit.Assert {
TokenValidatorResponse validatorResponse =
samlTokenValidator.validateToken(validatorParameters);
- assertTrue(validatorResponse != null);
- assertTrue(validatorResponse.getToken() != null);
+ assertNotNull(validatorResponse);
+ assertNotNull(validatorResponse.getToken());
assertTrue(validatorResponse.getToken().getState() == STATE.VALID);
Principal principal = validatorResponse.getPrincipal();
@@ -180,8 +180,8 @@ public class SAMLTokenValidatorTest extends org.junit.Assert {
TokenValidatorResponse validatorResponse =
samlTokenValidator.validateToken(validatorParameters);
- assertTrue(validatorResponse != null);
- assertTrue(validatorResponse.getToken() != null);
+ assertNotNull(validatorResponse);
+ assertNotNull(validatorResponse.getToken());
assertTrue(validatorResponse.getToken().getState() == STATE.VALID);
}
@@ -213,8 +213,8 @@ public class SAMLTokenValidatorTest extends org.junit.Assert {
TokenValidatorResponse validatorResponse =
samlTokenValidator.validateToken(validatorParameters);
- assertTrue(validatorResponse != null);
- assertTrue(validatorResponse.getToken() != null);
+ assertNotNull(validatorResponse);
+ assertNotNull(validatorResponse.getToken());
assertTrue(validatorResponse.getToken().getState() == STATE.INVALID);
}
@@ -246,8 +246,8 @@ public class SAMLTokenValidatorTest extends org.junit.Assert {
TokenValidatorResponse validatorResponse =
samlTokenValidator.validateToken(validatorParameters);
- assertTrue(validatorResponse != null);
- assertTrue(validatorResponse.getToken() != null);
+ assertNotNull(validatorResponse);
+ assertNotNull(validatorResponse.getToken());
assertTrue(validatorResponse.getToken().getState() == STATE.INVALID);
}
@@ -277,8 +277,8 @@ public class SAMLTokenValidatorTest extends org.junit.Assert {
Thread.sleep(100);
TokenValidatorResponse validatorResponse =
samlTokenValidator.validateToken(validatorParameters);
- assertTrue(validatorResponse != null);
- assertTrue(validatorResponse.getToken() != null);
+ assertNotNull(validatorResponse);
+ assertNotNull(validatorResponse.getToken());
assertTrue(validatorResponse.getToken().getState() == STATE.EXPIRED);
}
@@ -307,8 +307,8 @@ public class SAMLTokenValidatorTest extends org.junit.Assert {
Thread.sleep(100);
TokenValidatorResponse validatorResponse =
samlTokenValidator.validateToken(validatorParameters);
- assertTrue(validatorResponse != null);
- assertTrue(validatorResponse.getToken() != null);
+ assertNotNull(validatorResponse);
+ assertNotNull(validatorResponse.getToken());
assertTrue(validatorResponse.getToken().getState() == STATE.EXPIRED);
}
@@ -343,16 +343,16 @@ public class SAMLTokenValidatorTest extends org.junit.Assert {
TokenValidatorResponse validatorResponse =
samlTokenValidator.validateToken(validatorParameters);
- assertTrue(validatorResponse != null);
- assertTrue(validatorResponse.getToken() != null);
+ assertNotNull(validatorResponse);
+ assertNotNull(validatorResponse.getToken());
assertTrue(validatorResponse.getToken().getState() == STATE.VALID);
certConstraints.clear();
certConstraints.add("XYZ");
((SAMLTokenValidator)samlTokenValidator).setSubjectConstraints(certConstraints);
validatorResponse = samlTokenValidator.validateToken(validatorParameters);
- assertTrue(validatorResponse != null);
- assertTrue(validatorResponse.getToken() != null);
+ assertNotNull(validatorResponse);
+ assertNotNull(validatorResponse.getToken());
assertTrue(validatorResponse.getToken().getState() == STATE.INVALID);
}
@@ -382,8 +382,8 @@ public class SAMLTokenValidatorTest extends org.junit.Assert {
TokenValidatorResponse validatorResponse =
samlTokenValidator.validateToken(validatorParameters);
- assertTrue(validatorResponse != null);
- assertTrue(validatorResponse.getToken() != null);
+ assertNotNull(validatorResponse);
+ assertNotNull(validatorResponse.getToken());
assertTrue(validatorResponse.getToken().getState() == STATE.VALID);
Principal principal = validatorResponse.getPrincipal();
@@ -416,8 +416,8 @@ public class SAMLTokenValidatorTest extends org.junit.Assert {
TokenValidatorResponse validatorResponse =
samlTokenValidator.validateToken(validatorParameters);
- assertTrue(validatorResponse != null);
- assertTrue(validatorResponse.getToken() != null);
+ assertNotNull(validatorResponse);
+ assertNotNull(validatorResponse.getToken());
assertTrue(validatorResponse.getToken().getState() == STATE.VALID);
Principal principal = validatorResponse.getPrincipal();
@@ -452,8 +452,8 @@ public class SAMLTokenValidatorTest extends org.junit.Assert {
TokenValidatorResponse validatorResponse =
samlTokenValidator.validateToken(validatorParameters);
- assertTrue(validatorResponse != null);
- assertTrue(validatorResponse.getToken() != null);
+ assertNotNull(validatorResponse);
+ assertNotNull(validatorResponse.getToken());
assertTrue(validatorResponse.getToken().getState() == STATE.VALID);
// Replace "alice" with "bob".
@@ -469,8 +469,8 @@ public class SAMLTokenValidatorTest extends org.junit.Assert {
assertTrue(samlTokenValidator.canHandleToken(validateTarget));
validatorResponse = samlTokenValidator.validateToken(validatorParameters);
- assertTrue(validatorResponse != null);
- assertTrue(validatorResponse.getToken() != null);
+ assertNotNull(validatorResponse);
+ assertNotNull(validatorResponse.getToken());
assertTrue(validatorResponse.getToken().getState() != STATE.VALID);
}
@@ -498,8 +498,8 @@ public class SAMLTokenValidatorTest extends org.junit.Assert {
TokenValidatorResponse validatorResponse =
samlTokenValidator.validateToken(validatorParameters);
- assertTrue(validatorResponse != null);
- assertTrue(validatorResponse.getToken() != null);
+ assertNotNull(validatorResponse);
+ assertNotNull(validatorResponse.getToken());
assertTrue(validatorResponse.getToken().getState() == STATE.VALID);
Principal principal = validatorResponse.getPrincipal();
@@ -553,7 +553,7 @@ public class SAMLTokenValidatorTest extends org.junit.Assert {
subjectName, tokenType, STSConstants.BEARER_KEY_KEYTYPE, crypto, signatureUsername, callbackHandler
);
TokenProviderResponse providerResponse = samlTokenProvider.createToken(providerParameters);
- assertTrue(providerResponse != null);
+ assertNotNull(providerResponse);
assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null);
return (Element)providerResponse.getToken();
@@ -583,7 +583,7 @@ public class SAMLTokenValidatorTest extends org.junit.Assert {
providerParameters.setRequestedPrimaryClaims(claims);
TokenProviderResponse providerResponse = samlTokenProvider.createToken(providerParameters);
- assertTrue(providerResponse != null);
+ assertNotNull(providerResponse);
assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null);
return (Element)providerResponse.getToken();
@@ -600,7 +600,7 @@ public class SAMLTokenValidatorTest extends org.junit.Assert {
"alice", tokenType, STSConstants.BEARER_KEY_KEYTYPE, crypto, signatureUsername, callbackHandler
);
TokenProviderResponse providerResponse = samlTokenProvider.createToken(providerParameters);
- assertTrue(providerResponse != null);
+ assertNotNull(providerResponse);
assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null);
return (Element)providerResponse.getToken();
@@ -631,7 +631,7 @@ public class SAMLTokenValidatorTest extends org.junit.Assert {
}
TokenProviderResponse providerResponse = samlTokenProvider.createToken(providerParameters);
- assertTrue(providerResponse != null);
+ assertNotNull(providerResponse);
assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null);
return (Element)providerResponse.getToken();
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SCTValidatorTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SCTValidatorTest.java
index 4aeb2fd..d31b63a 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SCTValidatorTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SCTValidatorTest.java
@@ -73,8 +73,8 @@ public class SCTValidatorTest extends org.junit.Assert {
TokenValidatorResponse validatorResponse =
sctValidator.validateToken(validatorParameters);
- assertTrue(validatorResponse != null);
- assertTrue(validatorResponse.getToken() != null);
+ assertNotNull(validatorResponse);
+ assertNotNull(validatorResponse.getToken());
assertTrue(validatorResponse.getToken().getState() == STATE.VALID);
assertTrue(
validatorResponse.getAdditionalProperties().get(SCTValidator.SCT_VALIDATOR_SECRET) != null
@@ -85,8 +85,8 @@ public class SCTValidatorTest extends org.junit.Assert {
tokenStore.remove(tokenStore.getToken(providerResponse.getTokenId()).getId());
assertNull(tokenStore.getToken(providerResponse.getTokenId()));
validatorResponse = sctValidator.validateToken(validatorParameters);
- assertTrue(validatorResponse != null);
- assertTrue(validatorResponse.getToken() != null);
+ assertNotNull(validatorResponse);
+ assertNotNull(validatorResponse.getToken());
assertTrue(validatorResponse.getToken().getState() == STATE.INVALID);
}
@@ -110,8 +110,8 @@ public class SCTValidatorTest extends org.junit.Assert {
TokenValidatorResponse validatorResponse =
sctValidator.validateToken(validatorParameters);
- assertTrue(validatorResponse != null);
- assertTrue(validatorResponse.getToken() != null);
+ assertNotNull(validatorResponse);
+ assertNotNull(validatorResponse.getToken());
assertTrue(validatorResponse.getToken().getState() == STATE.INVALID);
}
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/UsernameTokenValidatorTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/UsernameTokenValidatorTest.java
index 9cca59f..34f614a 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/UsernameTokenValidatorTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/UsernameTokenValidatorTest.java
@@ -82,8 +82,8 @@ public class UsernameTokenValidatorTest extends org.junit.Assert {
// This will fail as there is no password
TokenValidatorResponse validatorResponse =
usernameTokenValidator.validateToken(validatorParameters);
- assertTrue(validatorResponse != null);
- assertTrue(validatorResponse.getToken() != null);
+ assertNotNull(validatorResponse);
+ assertNotNull(validatorResponse.getToken());
assertTrue(validatorResponse.getToken().getState() == STATE.INVALID);
// Add a password
@@ -97,8 +97,8 @@ public class UsernameTokenValidatorTest extends org.junit.Assert {
usernameToken.getAny().add(passwordType);
validatorResponse = usernameTokenValidator.validateToken(validatorParameters);
- assertTrue(validatorResponse != null);
- assertTrue(validatorResponse.getToken() != null);
+ assertNotNull(validatorResponse);
+ assertNotNull(validatorResponse.getToken());
assertTrue(validatorResponse.getToken().getState() == STATE.VALID);
Principal principal = validatorResponse.getPrincipal();
@@ -143,16 +143,16 @@ public class UsernameTokenValidatorTest extends org.junit.Assert {
// This will fail as the username is bad
TokenValidatorResponse validatorResponse =
usernameTokenValidator.validateToken(validatorParameters);
- assertTrue(validatorResponse != null);
- assertTrue(validatorResponse.getToken() != null);
+ assertNotNull(validatorResponse);
+ assertNotNull(validatorResponse.getToken());
assertTrue(validatorResponse.getToken().getState() == STATE.INVALID);
// This will fail as the password is bad
username.setValue("alice");
password.setValue("badpassword");
validatorResponse = usernameTokenValidator.validateToken(validatorParameters);
- assertTrue(validatorResponse != null);
- assertTrue(validatorResponse.getToken() != null);
+ assertNotNull(validatorResponse);
+ assertNotNull(validatorResponse.getToken());
assertTrue(validatorResponse.getToken().getState() == STATE.INVALID);
}
@@ -218,8 +218,8 @@ public class UsernameTokenValidatorTest extends org.junit.Assert {
TokenValidatorResponse validatorResponse =
usernameTokenValidator.validateToken(validatorParameters);
- assertTrue(validatorResponse != null);
- assertTrue(validatorResponse.getToken() != null);
+ assertNotNull(validatorResponse);
+ assertNotNull(validatorResponse.getToken());
assertTrue(validatorResponse.getToken().getState() == STATE.VALID);
Principal principal = validatorResponse.getPrincipal();
@@ -228,8 +228,8 @@ public class UsernameTokenValidatorTest extends org.junit.Assert {
// Expected failure on a bad password
password.setValue("badpassword");
validatorResponse = usernameTokenValidator.validateToken(validatorParameters);
- assertTrue(validatorResponse != null);
- assertTrue(validatorResponse.getToken() != null);
+ assertNotNull(validatorResponse);
+ assertNotNull(validatorResponse.getToken());
assertTrue(validatorResponse.getToken().getState() == STATE.INVALID);
}
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/X509TokenValidatorTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/X509TokenValidatorTest.java
index 782c44e..56eca62 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/X509TokenValidatorTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/X509TokenValidatorTest.java
@@ -84,14 +84,14 @@ public class X509TokenValidatorTest extends org.junit.Assert {
// This will fail as the encoding type is not set
TokenValidatorResponse validatorResponse = null;
validatorResponse = x509TokenValidator.validateToken(validatorParameters);
- assertTrue(validatorResponse != null);
- assertTrue(validatorResponse.getToken() != null);
+ assertNotNull(validatorResponse);
+ assertNotNull(validatorResponse.getToken());
assertTrue(validatorResponse.getToken().getState() == STATE.INVALID);
binarySecurityToken.setEncodingType(WSS4JConstants.SOAPMESSAGE_NS + "#Base64Binary");
validatorResponse = x509TokenValidator.validateToken(validatorParameters);
- assertTrue(validatorResponse.getToken() != null);
+ assertNotNull(validatorResponse.getToken());
assertTrue(validatorResponse.getToken().getState() == STATE.VALID);
Principal principal = validatorResponse.getPrincipal();
@@ -131,8 +131,8 @@ public class X509TokenValidatorTest extends org.junit.Assert {
assertTrue(x509TokenValidator.canHandleToken(validateTarget));
TokenValidatorResponse validatorResponse = x509TokenValidator.validateToken(validatorParameters);
- assertTrue(validatorResponse != null);
- assertTrue(validatorResponse.getToken() != null);
+ assertNotNull(validatorResponse);
+ assertNotNull(validatorResponse.getToken());
assertTrue(validatorResponse.getToken().getState() == STATE.INVALID);
}
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/asymmetric_encr/AsymmetricEncryptionTest.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/asymmetric_encr/AsymmetricEncryptionTest.java
index 14a6519..449b6b5 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/asymmetric_encr/AsymmetricEncryptionTest.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/asymmetric_encr/AsymmetricEncryptionTest.java
@@ -96,7 +96,7 @@ public class AsymmetricEncryptionTest extends AbstractBusClientServerTestBase {
BusFactory.setThreadDefaultBus(bus);
SecurityToken token = requestSecurityToken(bus, test.getStsPort());
- assertTrue(token != null);
+ assertNotNull(token);
bus.shutdown(true);
}
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/custom/CustomParameterTest.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/custom/CustomParameterTest.java
index 8f429b5..bc184d0 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/custom/CustomParameterTest.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/custom/CustomParameterTest.java
@@ -355,7 +355,7 @@ public class CustomParameterTest extends AbstractBusClientServerTestBase {
assertTrue(results != null && results.size() == 1);
SamlAssertionWrapper assertion =
(SamlAssertionWrapper)results.get(0).get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
- assertTrue(assertion != null);
+ assertNotNull(assertion);
if (saml2) {
assertTrue(assertion.getSaml2() != null && assertion.getSaml1() == null);
} else {
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/delegation/SAMLDelegationTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/delegation/SAMLDelegationTest.java
index 99e350f..1317420 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/delegation/SAMLDelegationTest.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/delegation/SAMLDelegationTest.java
@@ -103,7 +103,7 @@ public class SAMLDelegationTest extends AbstractBusClientServerTestBase {
requestSecurityToken(SAML2_TOKEN_TYPE, BEARER_KEYTYPE, bus,
DEFAULT_ADDRESS, "Transport_UT_Port");
assertTrue(SAML2_TOKEN_TYPE.equals(token.getTokenType()));
- assertTrue(token.getToken() != null);
+ assertNotNull(token.getToken());
// Use the first token as OnBehalfOf to get another token
@@ -121,7 +121,7 @@ public class SAMLDelegationTest extends AbstractBusClientServerTestBase {
requestSecurityToken(SAML2_TOKEN_TYPE, BEARER_KEYTYPE, token.getToken(), bus,
DEFAULT_ADDRESS, true, "Transport_Port");
assertTrue(SAML2_TOKEN_TYPE.equals(token2.getTokenType()));
- assertTrue(token2.getToken() != null);
+ assertNotNull(token2.getToken());
bus.shutdown(true);
}
@@ -140,7 +140,7 @@ public class SAMLDelegationTest extends AbstractBusClientServerTestBase {
requestSecurityToken(SAML2_TOKEN_TYPE, BEARER_KEYTYPE, bus,
DEFAULT_ADDRESS, "Transport_UT_Port");
assertTrue(SAML2_TOKEN_TYPE.equals(token.getTokenType()));
- assertTrue(token.getToken() != null);
+ assertNotNull(token.getToken());
// Use the first token as ActAs to get another token
@@ -158,7 +158,7 @@ public class SAMLDelegationTest extends AbstractBusClientServerTestBase {
requestSecurityToken(SAML2_TOKEN_TYPE, BEARER_KEYTYPE, token.getToken(), bus,
DEFAULT_ADDRESS, false, "Transport_Port");
assertTrue(SAML2_TOKEN_TYPE.equals(token2.getTokenType()));
- assertTrue(token2.getToken() != null);
+ assertNotNull(token2.getToken());
bus.shutdown(true);
}
@@ -304,7 +304,7 @@ public class SAMLDelegationTest extends AbstractBusClientServerTestBase {
);
TokenProviderResponse providerResponse = samlTokenProvider.createToken(providerParameters);
- assertTrue(providerResponse != null);
+ assertNotNull(providerResponse);
assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null);
return (Element)providerResponse.getToken();
@@ -322,7 +322,7 @@ public class SAMLDelegationTest extends AbstractBusClientServerTestBase {
);
TokenProviderResponse providerResponse = samlTokenProvider.createToken(providerParameters);
- assertTrue(providerResponse != null);
+ assertNotNull(providerResponse);
assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null);
return (Element)providerResponse.getToken();
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issueunit/IssueUnitTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issueunit/IssueUnitTest.java
index 00b3385..bdde7da 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issueunit/IssueUnitTest.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issueunit/IssueUnitTest.java
@@ -154,7 +154,7 @@ public class IssueUnitTest extends AbstractBusClientServerTestBase {
requestSecurityToken(SAML1_TOKEN_TYPE, SYMMETRIC_KEY_KEYTYPE, bus, DEFAULT_ADDRESS);
assertTrue(token.getSecret() != null && token.getSecret().length > 0);
assertTrue(SAML1_TOKEN_TYPE.equals(token.getTokenType()));
- assertTrue(token.getToken() != null);
+ assertNotNull(token.getToken());
// Process the token
List<WSSecurityEngineResult> results = processToken(token);
@@ -162,7 +162,7 @@ public class IssueUnitTest extends AbstractBusClientServerTestBase {
assertTrue(results != null && results.size() == 1);
SamlAssertionWrapper assertion =
(SamlAssertionWrapper)results.get(0).get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
- assertTrue(assertion != null);
+ assertNotNull(assertion);
assertTrue(assertion.getSaml1() != null && assertion.getSaml2() == null);
assertTrue(assertion.isSigned());
@@ -173,7 +173,7 @@ public class IssueUnitTest extends AbstractBusClientServerTestBase {
}
assertTrue(OpenSAMLUtil.isMethodHolderOfKey(confirmMethod));
SAMLKeyInfo subjectKeyInfo = assertion.getSubjectKeyInfo();
- assertTrue(subjectKeyInfo.getSecret() != null);
+ assertNotNull(subjectKeyInfo.getSecret());
bus.shutdown(true);
}
@@ -195,14 +195,14 @@ public class IssueUnitTest extends AbstractBusClientServerTestBase {
requestSecurityToken(SAML2_TOKEN_TYPE, PUBLIC_KEY_KEYTYPE, bus, DEFAULT_ADDRESS);
assertTrue(token.getSecret() == null && token.getX509Certificate() != null);
assertTrue(SAML2_TOKEN_TYPE.equals(token.getTokenType()));
- assertTrue(token.getToken() != null);
+ assertNotNull(token.getToken());
// Process the token
List<WSSecurityEngineResult> results = processToken(token);
assertTrue(results != null && results.size() == 1);
SamlAssertionWrapper assertion =
(SamlAssertionWrapper)results.get(0).get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
- assertTrue(assertion != null);
+ assertNotNull(assertion);
assertTrue(assertion.getSaml1() == null && assertion.getSaml2() != null);
assertTrue(assertion.isSigned());
@@ -213,7 +213,7 @@ public class IssueUnitTest extends AbstractBusClientServerTestBase {
}
assertTrue(OpenSAMLUtil.isMethodHolderOfKey(confirmMethod));
SAMLKeyInfo subjectKeyInfo = assertion.getSubjectKeyInfo();
- assertTrue(subjectKeyInfo.getCerts() != null);
+ assertNotNull(subjectKeyInfo.getCerts());
bus.shutdown(true);
}
@@ -234,14 +234,14 @@ public class IssueUnitTest extends AbstractBusClientServerTestBase {
SecurityToken token =
requestSecurityToken(SAML1_TOKEN_TYPE, BEARER_KEYTYPE, bus, DEFAULT_ADDRESS);
assertTrue(SAML1_TOKEN_TYPE.equals(token.getTokenType()));
- assertTrue(token.getToken() != null);
+ assertNotNull(token.getToken());
// Process the token
List<WSSecurityEngineResult> results = processToken(token);
assertTrue(results != null && results.size() == 1);
SamlAssertionWrapper assertion =
(SamlAssertionWrapper)results.get(0).get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
- assertTrue(assertion != null);
+ assertNotNull(assertion);
assertTrue(assertion.getSaml1() != null && assertion.getSaml2() == null);
assertTrue(assertion.isSigned());
@@ -273,14 +273,14 @@ public class IssueUnitTest extends AbstractBusClientServerTestBase {
SAML2_TOKEN_TYPE, BEARER_KEYTYPE, null, bus, DEFAULT_ADDRESS, null, null, null, null
);
assertTrue(SAML2_TOKEN_TYPE.equals(token.getTokenType()));
- assertTrue(token.getToken() != null);
+ assertNotNull(token.getToken());
// Process the token
List<WSSecurityEngineResult> results = processToken(token);
assertTrue(results != null && results.size() == 1);
SamlAssertionWrapper assertion =
(SamlAssertionWrapper)results.get(0).get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
- assertTrue(assertion != null);
+ assertNotNull(assertion);
assertTrue(assertion.getSaml1() == null && assertion.getSaml2() != null);
assertTrue(assertion.isSigned());
@@ -333,14 +333,14 @@ public class IssueUnitTest extends AbstractBusClientServerTestBase {
SecurityToken token =
requestSecurityToken(SAML1_TOKEN_TYPE, BEARER_KEYTYPE, bus, DEFAULT_ADDRESS, context);
assertTrue(SAML1_TOKEN_TYPE.equals(token.getTokenType()));
- assertTrue(token.getToken() != null);
+ assertNotNull(token.getToken());
// Process the token
List<WSSecurityEngineResult> results = processToken(token);
assertTrue(results != null && results.size() == 1);
SamlAssertionWrapper assertion =
(SamlAssertionWrapper)results.get(0).get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
- assertTrue(assertion != null);
+ assertNotNull(assertion);
assertTrue(assertion.getSaml1() != null && assertion.getSaml2() == null);
assertTrue(assertion.isSigned());
@@ -370,14 +370,14 @@ public class IssueUnitTest extends AbstractBusClientServerTestBase {
SecurityToken token =
requestSecurityTokenTTL(SAML1_TOKEN_TYPE, BEARER_KEYTYPE, bus, DEFAULT_ADDRESS);
assertTrue(SAML1_TOKEN_TYPE.equals(token.getTokenType()));
- assertTrue(token.getToken() != null);
+ assertNotNull(token.getToken());
// Process the token
List<WSSecurityEngineResult> results = processToken(token);
assertTrue(results != null && results.size() == 1);
SamlAssertionWrapper assertion =
(SamlAssertionWrapper)results.get(0).get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
- assertTrue(assertion != null);
+ assertNotNull(assertion);
assertTrue(assertion.getSaml1() != null && assertion.getSaml2() == null);
assertTrue(assertion.isSigned());
@@ -438,13 +438,13 @@ public class IssueUnitTest extends AbstractBusClientServerTestBase {
bus, DEFAULT_ADDRESS, null, properties, "b-issuer", null);
*/
assertTrue(SAML2_TOKEN_TYPE.equals(token.getTokenType()));
- assertTrue(token.getToken() != null);
+ assertNotNull(token.getToken());
List<WSSecurityEngineResult> results = processToken(token);
assertTrue(results != null && results.size() == 1);
SamlAssertionWrapper assertion =
(SamlAssertionWrapper)results.get(0).get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
- assertTrue(assertion != null);
+ assertNotNull(assertion);
assertTrue(assertion.isSigned());
List<String> methods = assertion.getConfirmationMethods();
@@ -568,7 +568,7 @@ public class IssueUnitTest extends AbstractBusClientServerTestBase {
providerParameters.setRealm("A");
}
TokenProviderResponse providerResponse = samlTokenProvider.createToken(providerParameters);
- assertTrue(providerResponse != null);
+ assertNotNull(providerResponse);
assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null);
return (Element)providerResponse.getToken();
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 4f11cd0..9e1e99a 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
@@ -137,7 +137,7 @@ public class STSRESTTest extends AbstractBusClientServerTestBase {
assertTrue(results != null && results.size() == 1);
SamlAssertionWrapper assertion =
(SamlAssertionWrapper)results.get(0).get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
- assertTrue(assertion != null);
+ assertNotNull(assertion);
assertTrue(assertion.getSaml2() != null && assertion.getSaml1() == null);
assertTrue(assertion.isSigned());
@@ -169,7 +169,7 @@ public class STSRESTTest extends AbstractBusClientServerTestBase {
assertTrue(results != null && results.size() == 1);
SamlAssertionWrapper assertion =
(SamlAssertionWrapper)results.get(0).get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
- assertTrue(assertion != null);
+ assertNotNull(assertion);
assertTrue(assertion.getSaml2() == null && assertion.getSaml1() != null);
assertTrue(assertion.isSigned());
@@ -202,7 +202,7 @@ public class STSRESTTest extends AbstractBusClientServerTestBase {
assertTrue(results != null && results.size() == 1);
SamlAssertionWrapper assertion =
(SamlAssertionWrapper)results.get(0).get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
- assertTrue(assertion != null);
+ assertNotNull(assertion);
assertTrue(assertion.getSaml2() == null && assertion.getSaml1() != null);
assertTrue(assertion.isSigned());
@@ -213,7 +213,7 @@ public class STSRESTTest extends AbstractBusClientServerTestBase {
}
assertTrue(OpenSAMLUtil.isMethodHolderOfKey(confirmMethod));
SAMLKeyInfo subjectKeyInfo = assertion.getSubjectKeyInfo();
- assertTrue(subjectKeyInfo.getSecret() != null);
+ assertNotNull(subjectKeyInfo.getSecret());
bus.shutdown(true);
}
@@ -244,7 +244,7 @@ public class STSRESTTest extends AbstractBusClientServerTestBase {
assertTrue(results != null && results.size() == 1);
SamlAssertionWrapper assertion =
(SamlAssertionWrapper)results.get(0).get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
- assertTrue(assertion != null);
+ assertNotNull(assertion);
assertTrue(assertion.getSaml2() == null && assertion.getSaml1() != null);
assertTrue(assertion.isSigned());
@@ -255,7 +255,7 @@ public class STSRESTTest extends AbstractBusClientServerTestBase {
}
assertTrue(OpenSAMLUtil.isMethodHolderOfKey(confirmMethod));
SAMLKeyInfo subjectKeyInfo = assertion.getSubjectKeyInfo();
- assertTrue(subjectKeyInfo.getSecret() != null);
+ assertNotNull(subjectKeyInfo.getSecret());
bus.shutdown(true);
}
@@ -286,7 +286,7 @@ public class STSRESTTest extends AbstractBusClientServerTestBase {
assertTrue(results != null && results.size() == 1);
SamlAssertionWrapper assertion =
(SamlAssertionWrapper)results.get(0).get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
- assertTrue(assertion != null);
+ assertNotNull(assertion);
assertTrue(assertion.getSaml2() != null && assertion.getSaml1() == null);
assertTrue(assertion.isSigned());
@@ -297,7 +297,7 @@ public class STSRESTTest extends AbstractBusClientServerTestBase {
}
assertTrue(OpenSAMLUtil.isMethodHolderOfKey(confirmMethod));
SAMLKeyInfo subjectKeyInfo = assertion.getSubjectKeyInfo();
- assertTrue(subjectKeyInfo.getCerts() != null);
+ assertNotNull(subjectKeyInfo.getCerts());
bus.shutdown(true);
}
@@ -328,7 +328,7 @@ public class STSRESTTest extends AbstractBusClientServerTestBase {
assertTrue(results != null && results.size() == 1);
SamlAssertionWrapper assertion =
(SamlAssertionWrapper)results.get(0).get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
- assertTrue(assertion != null);
+ assertNotNull(assertion);
assertTrue(assertion.getSaml2() != null && assertion.getSaml1() == null);
assertTrue(assertion.isSigned());
@@ -339,7 +339,7 @@ public class STSRESTTest extends AbstractBusClientServerTestBase {
}
assertTrue(OpenSAMLUtil.isMethodHolderOfKey(confirmMethod));
SAMLKeyInfo subjectKeyInfo = assertion.getSubjectKeyInfo();
- assertTrue(subjectKeyInfo.getCerts() != null);
+ assertNotNull(subjectKeyInfo.getCerts());
bus.shutdown(true);
}
@@ -370,7 +370,7 @@ public class STSRESTTest extends AbstractBusClientServerTestBase {
assertTrue(results != null && results.size() == 1);
SamlAssertionWrapper assertion =
(SamlAssertionWrapper)results.get(0).get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
- assertTrue(assertion != null);
+ assertNotNull(assertion);
assertTrue(assertion.getSaml2() == null && assertion.getSaml1() != null);
assertTrue(assertion.isSigned());
@@ -410,7 +410,7 @@ public class STSRESTTest extends AbstractBusClientServerTestBase {
assertTrue(results != null && results.size() == 1);
SamlAssertionWrapper assertion =
(SamlAssertionWrapper)results.get(0).get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
- assertTrue(assertion != null);
+ assertNotNull(assertion);
assertTrue(assertion.getSaml2() == null && assertion.getSaml1() != null);
assertTrue(assertion.isSigned());
@@ -450,7 +450,7 @@ public class STSRESTTest extends AbstractBusClientServerTestBase {
assertTrue(results != null && results.size() == 1);
SamlAssertionWrapper assertion =
(SamlAssertionWrapper)results.get(0).get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
- assertTrue(assertion != null);
+ assertNotNull(assertion);
assertTrue(assertion.getSaml2() != null && assertion.getSaml1() == null);
assertTrue(assertion.isSigned());
@@ -511,7 +511,7 @@ public class STSRESTTest extends AbstractBusClientServerTestBase {
assertTrue(results != null && results.size() == 1);
SamlAssertionWrapper assertion =
(SamlAssertionWrapper)results.get(0).get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
- assertTrue(assertion != null);
+ assertNotNull(assertion);
assertTrue(assertion.getSaml2() != null && assertion.getSaml1() == null);
assertTrue(assertion.isSigned());
@@ -533,7 +533,7 @@ public class STSRESTTest extends AbstractBusClientServerTestBase {
assertTrue(results != null && results.size() == 1);
assertion =
(SamlAssertionWrapper)results.get(0).get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
- assertTrue(assertion != null);
+ assertNotNull(assertion);
assertTrue(assertion.getSaml2() != null && assertion.getSaml1() == null);
assertTrue(assertion.isSigned());
@@ -863,7 +863,7 @@ public class STSRESTTest extends AbstractBusClientServerTestBase {
assertTrue(results != null && results.size() == 1);
SamlAssertionWrapper assertion =
(SamlAssertionWrapper)results.get(0).get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
- assertTrue(assertion != null);
+ assertNotNull(assertion);
assertTrue(assertion.getSaml2() != null && assertion.getSaml1() == null);
assertTrue(assertion.isSigned());
@@ -939,7 +939,7 @@ public class STSRESTTest extends AbstractBusClientServerTestBase {
JwsJwtCompactConsumer jwtConsumer = new JwsJwtCompactConsumer(token);
JwtToken jwt = jwtConsumer.getJwtToken();
- assertTrue(jwt.getClaim("roles") == null);
+ assertNull(jwt.getClaim("roles"));
// Now get another token specifying the role
client.query("claim", "roles");
@@ -1280,7 +1280,7 @@ public class STSRESTTest extends AbstractBusClientServerTestBase {
assertTrue(results != null && results.size() == 1);
SamlAssertionWrapper assertion =
(SamlAssertionWrapper)results.get(0).get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
- assertTrue(assertion != null);
+ assertNotNull(assertion);
if (saml2) {
assertTrue(assertion.getSaml2() != null && assertion.getSaml1() == null);
} else {
diff --git a/services/sts/systests/sts-itests/src/test/java/org/apache/cxf/systest/sts/itests/unit/STSUnitTest.java b/services/sts/systests/sts-itests/src/test/java/org/apache/cxf/systest/sts/itests/unit/STSUnitTest.java
index dd27b04..ee7a27b 100644
--- a/services/sts/systests/sts-itests/src/test/java/org/apache/cxf/systest/sts/itests/unit/STSUnitTest.java
+++ b/services/sts/systests/sts-itests/src/test/java/org/apache/cxf/systest/sts/itests/unit/STSUnitTest.java
@@ -83,7 +83,7 @@ public class STSUnitTest extends BasicSTSIntegrationTest {
SecurityToken token =
requestSecurityToken(SAML2_TOKEN_TYPE, BEARER_KEYTYPE, bus, stsEndpoint);
Assert.assertTrue(SAML2_TOKEN_TYPE.equals(token.getTokenType()));
- Assert.assertTrue(token.getToken() != null);
+ Assert.assertNotNull(token.getToken());
// Process the token
List<WSSecurityEngineResult> results = processToken(token);
@@ -91,7 +91,7 @@ public class STSUnitTest extends BasicSTSIntegrationTest {
Assert.assertTrue(results != null && results.size() == 1);
SamlAssertionWrapper assertion =
(SamlAssertionWrapper)results.get(0).get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
- Assert.assertTrue(assertion != null);
+ Assert.assertNotNull(assertion);
Assert.assertTrue(assertion.getSaml1() == null && assertion.getSaml2() != null);
Assert.assertTrue(assertion.isSigned());
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSSoapBookTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSSoapBookTest.java
index 5e75b7f..08a175e 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSSoapBookTest.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSSoapBookTest.java
@@ -1004,7 +1004,7 @@ public class JAXRSSoapBookTest extends AbstractBusClientServerTestBase {
try {
// input stream will be closed by readBytesFromStream()
payload = IOUtils.readBytesFromStream(is);
- assertTrue("payload was null", payload != null);
+ assertNotNull("payload was null", payload);
assertTrue("payload was EMPTY", payload.length > 0);
message.setContent(InputStream.class, new ByteArrayInputStream(payload));
} catch (Exception e) {
diff --git a/systests/ldap/src/test/java/org/apache/cxf/systest/ldap/sts/LDAPClaimsTest.java b/systests/ldap/src/test/java/org/apache/cxf/systest/ldap/sts/LDAPClaimsTest.java
index 30dca90..23765c9 100644
--- a/systests/ldap/src/test/java/org/apache/cxf/systest/ldap/sts/LDAPClaimsTest.java
+++ b/systests/ldap/src/test/java/org/apache/cxf/systest/ldap/sts/LDAPClaimsTest.java
@@ -390,7 +390,7 @@ public class LDAPClaimsTest extends AbstractLdapTestUnit {
CertificateFactory certFactory = CertificateFactory.getInstance("X.509");
InputStream in = new ByteArrayInputStream((byte[])c.getValues().get(0));
X509Certificate cert = (X509Certificate)certFactory.generateCertificate(in);
- Assert.assertTrue(cert != null);
+ Assert.assertNotNull(cert);
}
}
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/coloc/AbstractColocTest.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/coloc/AbstractColocTest.java
index 0b63788..9629122 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/coloc/AbstractColocTest.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/coloc/AbstractColocTest.java
@@ -62,7 +62,7 @@ public abstract class AbstractColocTest extends Assert {
if (cxfConfig == null) {
throw new Exception("Make sure " + getCxfConfig() + " is in the CLASSPATH");
}
- assertTrue(cxfConfig.toExternalForm() != null);
+ assertNotNull(cxfConfig.toExternalForm());
}
//Bus is shared by client, router and server.
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/CorbaBindingFactoryConfigurerTest.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/CorbaBindingFactoryConfigurerTest.java
index a7f50ca..b7cd1e3 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/CorbaBindingFactoryConfigurerTest.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/CorbaBindingFactoryConfigurerTest.java
@@ -57,9 +57,9 @@ public class CorbaBindingFactoryConfigurerTest extends AbstractBusClientServerTe
CorbaBindingFactory factory =
(CorbaBindingFactory)bfm.getBindingFactory("http://cxf.apache.org/bindings/corba");
OrbConfig orbConfig = factory.getOrbConfig();
- assertTrue("CorbaBindingFactoryConfigurer is null", orbConfig != null);
+ assertNotNull("CorbaBindingFactoryConfigurer is null", orbConfig);
Properties props = orbConfig.getOrbProperties();
- assertTrue("probs is null", props != null);
+ assertNotNull("probs is null", props);
assertTrue("prob1 is not equal to value1",
"value1".equals(props.get("prop1")));
assertTrue("prob2 is not equal to value2",
@@ -69,7 +69,7 @@ public class CorbaBindingFactoryConfigurerTest extends AbstractBusClientServerTe
assertTrue("ORBSingletonClass is not equal to MyORBSingleton",
"com.orbimplco.MyORBSingleton".equals(props.get("org.omg.CORBA.ORBSingletonClass")));
List <String> orbArgs = orbConfig.getOrbArgs();
- assertTrue("orbArgs is null", orbArgs != null);
+ assertNotNull("orbArgs is null", orbArgs);
String domainNameId = orbArgs.get(0);
assertTrue("domainNameId is not equal to -ORBdomain_name",
"-ORBdomain_name".equals(domainNameId));
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient2.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient2.java
index 71eb3d9..ed5d244 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient2.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient2.java
@@ -555,8 +555,8 @@ public abstract class AbstractTypeTestClient2 extends AbstractTypeTestClient {
//org.apache.type_test.types1.StructWithList
protected void assertEquals(String msg, StructWithList x, StructWithList y) throws Exception {
- assertTrue(msg, x != null);
- assertTrue(msg, y != null);
+ assertNotNull(msg, x);
+ assertNotNull(msg, y);
List<String> xVar = x.getVarList();
List<String> yVar = y.getVarList();
@@ -568,7 +568,7 @@ public abstract class AbstractTypeTestClient2 extends AbstractTypeTestClient {
List<Integer> xAttr = x.getAttribList();
List<Integer> yAttr = y.getAttribList();
if (xAttr == null) {
- assertTrue(msg, yAttr == null);
+ assertNull(msg, yAttr);
} else {
assertTrue(xAttr.size() == yAttr.size());
for (int i = 0; i < xAttr.size(); ++i) {
@@ -645,8 +645,8 @@ public abstract class AbstractTypeTestClient2 extends AbstractTypeTestClient {
//org.apache.type_test.types1.StructWithUnion
protected void assertEquals(String msg, StructWithUnion x, StructWithUnion y) throws Exception {
- assertTrue(msg, x != null);
- assertTrue(msg, y != null);
+ assertNotNull(msg, x);
+ assertNotNull(msg, y);
assertEquals(msg, x.getVarUnion(), y.getVarUnion());
assertEquals(msg, x.getAttribUnion(), y.getAttribUnion());
}
@@ -2169,8 +2169,8 @@ public abstract class AbstractTypeTestClient2 extends AbstractTypeTestClient {
}
protected void assertEquals(String msg, UnionSimpleContent x, UnionSimpleContent y) throws Exception {
- assertTrue(msg, x != null);
- assertTrue(msg, y != null);
+ assertNotNull(msg, x);
+ assertNotNull(msg, y);
assertEquals(msg, x.getValue(), y.getValue());
}
@Test
diff --git a/tools/common/src/test/java/org/apache/cxf/tools/common/dom/ExtendedDocumentBuilderTest.java b/tools/common/src/test/java/org/apache/cxf/tools/common/dom/ExtendedDocumentBuilderTest.java
index d190051..a66dabb 100644
--- a/tools/common/src/test/java/org/apache/cxf/tools/common/dom/ExtendedDocumentBuilderTest.java
+++ b/tools/common/src/test/java/org/apache/cxf/tools/common/dom/ExtendedDocumentBuilderTest.java
@@ -30,7 +30,7 @@ public class ExtendedDocumentBuilderTest extends Assert {
ExtendedDocumentBuilder builder = new ExtendedDocumentBuilder();
builder.setValidating(false);
String tsSource = "/org/apache/cxf/tools/common/toolspec/parser/resources/testtool.xml";
- assertTrue(builder.parse(getClass().getResourceAsStream(tsSource)) != null);
+ assertNotNull(builder.parse(getClass().getResourceAsStream(tsSource)));
}
@Test
diff --git a/tools/common/src/test/java/org/apache/cxf/tools/common/toolspec/ToolExceptionTest.java b/tools/common/src/test/java/org/apache/cxf/tools/common/toolspec/ToolExceptionTest.java
index 0b0a820..1459a4b 100644
--- a/tools/common/src/test/java/org/apache/cxf/tools/common/toolspec/ToolExceptionTest.java
+++ b/tools/common/src/test/java/org/apache/cxf/tools/common/toolspec/ToolExceptionTest.java
@@ -28,9 +28,9 @@ public class ToolExceptionTest extends Assert {
@Test
public void testMassMethod() {
ToolException e = new ToolException("e");
- assertTrue(e.getCause() == null);
+ assertNull(e.getCause());
e = new ToolException("run time exception", new RuntimeException("test run time exception"));
assertTrue(e.getCause() instanceof RuntimeException);
- assertTrue(e.toString() != null);
+ assertNotNull(e.toString());
}
}
diff --git a/tools/common/src/test/java/org/apache/cxf/tools/common/toolspec/ToolSpecTest.java b/tools/common/src/test/java/org/apache/cxf/tools/common/toolspec/ToolSpecTest.java
index c5f2d71..fcbc875 100644
--- a/tools/common/src/test/java/org/apache/cxf/tools/common/toolspec/ToolSpecTest.java
+++ b/tools/common/src/test/java/org/apache/cxf/tools/common/toolspec/ToolSpecTest.java
@@ -31,7 +31,7 @@ public class ToolSpecTest extends Assert {
public void testConstruct() {
toolSpec = null;
toolSpec = new ToolSpec();
- assertTrue(toolSpec != null);
+ assertNotNull(toolSpec);
}
@Test
@@ -42,7 +42,7 @@ public class ToolSpecTest extends Assert {
} catch (ToolException e) {
throw new RuntimeException(e);
}
- assertTrue(toolSpec.getAnnotation() == null);
+ assertNull(toolSpec.getAnnotation());
}
@Test
@@ -51,9 +51,9 @@ public class ToolSpecTest extends Assert {
toolSpec = new ToolSpec(getClass().getResourceAsStream(tsSource), false);
- assertTrue(toolSpec.getAnnotation() == null);
- assertTrue(toolSpec.getParameterDefault("namespace") == null);
- assertTrue(toolSpec.getParameterDefault("wsdlurl") == null);
+ assertNull(toolSpec.getAnnotation());
+ assertNull(toolSpec.getParameterDefault("namespace"));
+ assertNull(toolSpec.getParameterDefault("wsdlurl"));
}
@Test
diff --git a/tools/common/src/test/java/org/apache/cxf/tools/common/toolspec/parser/CommandLineParserTest.java b/tools/common/src/test/java/org/apache/cxf/tools/common/toolspec/parser/CommandLineParserTest.java
index 4b6cfaf..b25a252 100644
--- a/tools/common/src/test/java/org/apache/cxf/tools/common/toolspec/parser/CommandLineParserTest.java
+++ b/tools/common/src/test/java/org/apache/cxf/tools/common/toolspec/parser/CommandLineParserTest.java
@@ -303,7 +303,7 @@ public class CommandLineParserTest extends Assert {
CommandLineParser commandLineParser = new CommandLineParser(null);
commandLineParser.setToolSpec(toolspec);
CommandDocument commandDocument = commandLineParser.parseArguments("-r unknown");
- assertTrue(commandDocument != null);
+ assertNotNull(commandDocument);
}
@Test
diff --git a/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java b/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java
index 8866ee3..28803c3 100644
--- a/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java
+++ b/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java
@@ -1635,7 +1635,7 @@ public class CodeGenTest extends AbstractCodeGenTest {
Method method = interfaceClass.getMethod("greetMe", new Class[] {
Holder.class, Holder.class, Holder.class, Holder.class, Holder.class
});
- assertTrue("greetMe operation is NOT generated correctly as excepted", method != null);
+ assertNotNull("greetMe operation is NOT generated correctly as excepted", method);
RequestWrapper reqWrapper = method.getAnnotation(RequestWrapper.class);
assertNotNull("@RequestWrapper is expected", reqWrapper);
}