diff --git a/tck/app-custom-authentication-mechanism-handler/src/test/java/ee/jakarta/tck/security/test/AppCustomAuthenticationMechanismHandlerIT.java b/tck/app-custom-authentication-mechanism-handler/src/test/java/ee/jakarta/tck/security/test/AppCustomAuthenticationMechanismHandlerIT.java index 31a395f0..854e1f4c 100644 --- a/tck/app-custom-authentication-mechanism-handler/src/test/java/ee/jakarta/tck/security/test/AppCustomAuthenticationMechanismHandlerIT.java +++ b/tck/app-custom-authentication-mechanism-handler/src/test/java/ee/jakarta/tck/security/test/AppCustomAuthenticationMechanismHandlerIT.java @@ -22,10 +22,10 @@ import jakarta.security.enterprise.authentication.mechanism.http.HttpAuthenticationMechanismHandler; import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.shrinkwrap.api.Archive; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; /** @@ -37,7 +37,7 @@ * {@code secret} to take the credentials from, while for all other paths {@code name} and * {@code password} is used. */ -@RunWith(Arquillian.class) +@ExtendWith(ArquillianExtension.class) public class AppCustomAuthenticationMechanismHandlerIT extends ArquillianBase { @Deployment(testable = false) diff --git a/tck/app-custom-authentication-mechanism-handler2/src/test/java/ee/jakarta/tck/security/test/AppCustomAuthenticationMechanismHandler2IT.java b/tck/app-custom-authentication-mechanism-handler2/src/test/java/ee/jakarta/tck/security/test/AppCustomAuthenticationMechanismHandler2IT.java index 9b343256..44294909 100644 --- a/tck/app-custom-authentication-mechanism-handler2/src/test/java/ee/jakarta/tck/security/test/AppCustomAuthenticationMechanismHandler2IT.java +++ b/tck/app-custom-authentication-mechanism-handler2/src/test/java/ee/jakarta/tck/security/test/AppCustomAuthenticationMechanismHandler2IT.java @@ -18,17 +18,17 @@ import static ee.jakarta.tck.security.test.Assert.assertDefaultAuthenticated; import static ee.jakarta.tck.security.test.ShrinkWrap.mavenWar; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import org.htmlunit.DefaultCredentialsProvider; import org.htmlunit.WebResponse; import jakarta.security.enterprise.authentication.mechanism.http.HttpAuthenticationMechanismHandler; import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.shrinkwrap.api.Archive; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; /** @@ -39,7 +39,7 @@ * In this test, three instances of the build-in Basic HTTP authentication mechanism are used. The custom * handler invokes each one depending on the request URI that was used. */ -@RunWith(Arquillian.class) +@ExtendWith(ArquillianExtension.class) public class AppCustomAuthenticationMechanismHandler2IT extends ArquillianBase { @Deployment(testable = false) @@ -57,15 +57,15 @@ public void testAuthenticated1() { assertEquals(401, response.getStatusCode()); assertTrue( - "Response did not contain the \"WWW-Authenticate\" header, but should have", - response.getResponseHeaderValue("WWW-Authenticate") != null); + response.getResponseHeaderValue("WWW-Authenticate") != null, + "Response did not contain the \"WWW-Authenticate\" header, but should have"); // Most important part of the test: check that we have the correct authentication mechanism instance used assertTrue( - "Response did not contain \"realm1\" in the \"WWW-Authenticate\" header value, but should have", - response.getResponseHeaderValue("WWW-Authenticate").contains("realm1")); + response.getResponseHeaderValue("WWW-Authenticate").contains("realm1"), + "Response did not contain \"realm1\" in the \"WWW-Authenticate\" header value, but should have"); // For completion, check that authentication mechanism also actually authenticates @@ -89,15 +89,15 @@ public void testAuthenticated2() { assertEquals(401, response.getStatusCode()); assertTrue( - "Response did not contain the \"WWW-Authenticate\" header, but should have", - response.getResponseHeaderValue("WWW-Authenticate") != null); + response.getResponseHeaderValue("WWW-Authenticate") != null, + "Response did not contain the \"WWW-Authenticate\" header, but should have"); // Most important part of the test: check that we have the correct authentication mechanism instance used assertTrue( - "Response did not contain \"realm1\" in the \"WWW-Authenticate\" header value, but should have", - response.getResponseHeaderValue("WWW-Authenticate").contains("realm2")); + response.getResponseHeaderValue("WWW-Authenticate").contains("realm2"), + "Response did not contain \"realm1\" in the \"WWW-Authenticate\" header value, but should have"); // For completion, check that authentication mechanism also actually authenticates @@ -121,15 +121,15 @@ public void testAuthenticated3() { assertEquals(401, response.getStatusCode()); assertTrue( - "Response did not contain the \"WWW-Authenticate\" header, but should have", - response.getResponseHeaderValue("WWW-Authenticate") != null); + response.getResponseHeaderValue("WWW-Authenticate") != null, + "Response did not contain the \"WWW-Authenticate\" header, but should have"); // Most important part of the test: check that we have the correct authentication mechanism instance used assertTrue( - "Response did not contain \"realm3\" in the \"WWW-Authenticate\" header value, but should have", - response.getResponseHeaderValue("WWW-Authenticate").contains("realm3")); + response.getResponseHeaderValue("WWW-Authenticate").contains("realm3"), + "Response did not contain \"realm3\" in the \"WWW-Authenticate\" header value, but should have"); // For completion, check that authentication mechanism also actually authenticates diff --git a/tck/app-custom-identity-store-handler/src/test/java/ee/jakarta/tck/security/test/AppCustomIdentityStoreHandlerIT.java b/tck/app-custom-identity-store-handler/src/test/java/ee/jakarta/tck/security/test/AppCustomIdentityStoreHandlerIT.java index bd8bd4e1..9838d344 100644 --- a/tck/app-custom-identity-store-handler/src/test/java/ee/jakarta/tck/security/test/AppCustomIdentityStoreHandlerIT.java +++ b/tck/app-custom-identity-store-handler/src/test/java/ee/jakarta/tck/security/test/AppCustomIdentityStoreHandlerIT.java @@ -22,13 +22,13 @@ import static ee.jakarta.tck.security.test.ShrinkWrap.mavenWar; import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.shrinkwrap.api.Archive; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; -@RunWith(Arquillian.class) +@ExtendWith(ArquillianExtension.class) public class AppCustomIdentityStoreHandlerIT extends ArquillianBase { @Deployment(testable = false) diff --git a/tck/app-custom-rememberme/src/test/java/ee/jakarta/tck/security/test/AppCustomRememberMeHttpOnlyIT.java b/tck/app-custom-rememberme/src/test/java/ee/jakarta/tck/security/test/AppCustomRememberMeHttpOnlyIT.java index 3fea2a9a..ef88212f 100644 --- a/tck/app-custom-rememberme/src/test/java/ee/jakarta/tck/security/test/AppCustomRememberMeHttpOnlyIT.java +++ b/tck/app-custom-rememberme/src/test/java/ee/jakarta/tck/security/test/AppCustomRememberMeHttpOnlyIT.java @@ -20,20 +20,20 @@ import static ee.jakarta.tck.security.test.Assert.assertDefaultAuthenticated; import static ee.jakarta.tck.security.test.Assert.assertDefaultNotAuthenticated; import static ee.jakarta.tck.security.test.ShrinkWrap.mavenWar; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; import ee.jakarta.tck.security.test.alternatives.TestAuthenticationMechanismHttpOnlyFalse; import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.shrinkwrap.api.Archive; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.htmlunit.util.Cookie; -@RunWith(Arquillian.class) +@ExtendWith(ArquillianExtension.class) public class AppCustomRememberMeHttpOnlyIT extends ArquillianBase { @Deployment(testable = false) @@ -92,8 +92,8 @@ public void testAuthenticatedRememberMe() { // For the initial authentication, the mechanism should be called assertTrue( - "Authentication mechanism should have been called, but wasn't", - response.contains("authentication mechanism called: true")); + response.contains("authentication mechanism called: true"), + "Authentication mechanism should have been called, but wasn't"); // 3. Request same page again within same http session, without remember me @@ -115,8 +115,8 @@ public void testAuthenticatedRememberMe() { // For the initial authentication, the mechanism should be called again assertTrue( - "Authentication mechanism should have been called, but wasn't", - response.contains("authentication mechanism called: true")); + response.contains("authentication mechanism called: true"), + "Authentication mechanism should have been called, but wasn't"); // 5. Request same page again within same http session, with remember me @@ -131,8 +131,8 @@ public void testAuthenticatedRememberMe() { // (the remember me interceptor takes care of this) assertTrue( - "Authentication mechanism should not have been called, but was", - response.contains("authentication mechanism called: false")); + response.contains("authentication mechanism called: false"), + "Authentication mechanism should not have been called, but was"); // 6. "Expire" the session by removing all cookies except the @@ -157,8 +157,8 @@ public void testAuthenticatedRememberMe() { // (the remember me interceptor takes care of this) assertTrue( - "Authentication mechanism should not have been called, but was", - response.contains("authentication mechanism called: false")); + response.contains("authentication mechanism called: false"), + "Authentication mechanism should not have been called, but was"); // 7. Logout. Should not be authenticated anymore diff --git a/tck/app-custom-rememberme/src/test/java/ee/jakarta/tck/security/test/AppCustomRememberMeHttpOnlyImmediateIT.java b/tck/app-custom-rememberme/src/test/java/ee/jakarta/tck/security/test/AppCustomRememberMeHttpOnlyImmediateIT.java index 3dcc00d7..c110d7d5 100644 --- a/tck/app-custom-rememberme/src/test/java/ee/jakarta/tck/security/test/AppCustomRememberMeHttpOnlyImmediateIT.java +++ b/tck/app-custom-rememberme/src/test/java/ee/jakarta/tck/security/test/AppCustomRememberMeHttpOnlyImmediateIT.java @@ -20,21 +20,21 @@ import static ee.jakarta.tck.security.test.Assert.assertDefaultAuthenticated; import static ee.jakarta.tck.security.test.Assert.assertDefaultNotAuthenticated; import static ee.jakarta.tck.security.test.ShrinkWrap.mavenWar; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.shrinkwrap.api.Archive; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.htmlunit.util.Cookie; import ee.jakarta.tck.security.test.alternatives.TestAuthenticationMechanismHttpOnlyFalseImmediate; -@RunWith(Arquillian.class) +@ExtendWith(ArquillianExtension.class) public class AppCustomRememberMeHttpOnlyImmediateIT extends ArquillianBase { @Deployment(testable = false) @@ -93,8 +93,8 @@ public void testAuthenticatedRememberMe() { // For the initial authentication, the mechanism should be called assertTrue( - "Authentication mechanism should have been called, but wasn't", - response.contains("authentication mechanism called: true")); + response.contains("authentication mechanism called: true"), + "Authentication mechanism should have been called, but wasn't"); // 3. Request same page again within same http session, without remember me @@ -116,8 +116,8 @@ public void testAuthenticatedRememberMe() { // For the initial authentication, the mechanism should be called again assertTrue( - "Authentication mechanism should have been called, but wasn't", - response.contains("authentication mechanism called: true")); + response.contains("authentication mechanism called: true"), + "Authentication mechanism should have been called, but wasn't"); // 5. Request same page again within same http session, with remember me @@ -132,8 +132,8 @@ public void testAuthenticatedRememberMe() { // (the remember me interceptor takes care of this) assertTrue( - "Authentication mechanism should not have been called, but was", - response.contains("authentication mechanism called: false")); + response.contains("authentication mechanism called: false"), + "Authentication mechanism should not have been called, but was"); // 6. "Expire" the session by removing all cookies except the @@ -158,8 +158,8 @@ public void testAuthenticatedRememberMe() { // (the remember me interceptor takes care of this) assertTrue( - "Authentication mechanism should not have been called, but was", - response.contains("authentication mechanism called: false")); + response.contains("authentication mechanism called: false"), + "Authentication mechanism should not have been called, but was"); // 7. Logout. Should not be authenticated anymore diff --git a/tck/app-custom-rememberme/src/test/java/ee/jakarta/tck/security/test/AppCustomRememberMeIT.java b/tck/app-custom-rememberme/src/test/java/ee/jakarta/tck/security/test/AppCustomRememberMeIT.java index cd733193..fbb25fea 100644 --- a/tck/app-custom-rememberme/src/test/java/ee/jakarta/tck/security/test/AppCustomRememberMeIT.java +++ b/tck/app-custom-rememberme/src/test/java/ee/jakarta/tck/security/test/AppCustomRememberMeIT.java @@ -20,19 +20,19 @@ import static ee.jakarta.tck.security.test.Assert.assertDefaultAuthenticated; import static ee.jakarta.tck.security.test.Assert.assertDefaultNotAuthenticated; import static ee.jakarta.tck.security.test.ShrinkWrap.mavenWar; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.shrinkwrap.api.Archive; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.htmlunit.util.Cookie; -@RunWith(Arquillian.class) +@ExtendWith(ArquillianExtension.class) public class AppCustomRememberMeIT extends ArquillianBase { @Deployment(testable = false) @@ -97,8 +97,8 @@ public void testAuthenticatedRememberMe() { // For the initial authentication, the mechanism should be called assertTrue( - "Authentication mechanism should have been called, but wasn't", - response.contains("authentication mechanism called: true")); + response.contains("authentication mechanism called: true"), + "Authentication mechanism should have been called, but wasn't"); // 3. Request same page again within same http session, without remember me @@ -120,8 +120,8 @@ public void testAuthenticatedRememberMe() { // For the initial authentication, the mechanism should be called again assertTrue( - "Authentication mechanism should have been called, but wasn't", - response.contains("authentication mechanism called: true")); + response.contains("authentication mechanism called: true"), + "Authentication mechanism should have been called, but wasn't"); // 5. Request same page again within same http session, with remember me @@ -136,8 +136,8 @@ public void testAuthenticatedRememberMe() { // (the remember me interceptor takes care of this) assertTrue( - "Authentication mechanism should not have been called, but was", - response.contains("authentication mechanism called: false")); + response.contains("authentication mechanism called: false"), + "Authentication mechanism should not have been called, but was"); // 6. "Expire" the session by removing all cookies except the @@ -162,8 +162,8 @@ public void testAuthenticatedRememberMe() { // (the remember me interceptor takes care of this) assertTrue( - "Authentication mechanism should not have been called, but was", - response.contains("authentication mechanism called: false")); + response.contains("authentication mechanism called: false"), + "Authentication mechanism should not have been called, but was"); // 7. Logout. Should not be authenticated anymore diff --git a/tck/app-custom-rememberme/src/test/java/ee/jakarta/tck/security/test/AppCustomRememberMeSecureOnlyIT.java b/tck/app-custom-rememberme/src/test/java/ee/jakarta/tck/security/test/AppCustomRememberMeSecureOnlyIT.java index 223af2e0..1966364c 100644 --- a/tck/app-custom-rememberme/src/test/java/ee/jakarta/tck/security/test/AppCustomRememberMeSecureOnlyIT.java +++ b/tck/app-custom-rememberme/src/test/java/ee/jakarta/tck/security/test/AppCustomRememberMeSecureOnlyIT.java @@ -19,17 +19,17 @@ import static ee.jakarta.tck.security.test.Assert.assertDefaultAuthenticated; import static ee.jakarta.tck.security.test.Assert.assertDefaultNotAuthenticated; import static ee.jakarta.tck.security.test.ShrinkWrap.mavenWar; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import ee.jakarta.tck.security.test.alternatives.TestAuthenticationMechanismSecureOnly; import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.shrinkwrap.api.Archive; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; -@RunWith(Arquillian.class) +@ExtendWith(ArquillianExtension.class) public class AppCustomRememberMeSecureOnlyIT extends ArquillianBase { @Deployment(testable = false) diff --git a/tck/app-custom-session/src/test/java/ee/jakarta/tck/security/test/AppCustomSessionIT.java b/tck/app-custom-session/src/test/java/ee/jakarta/tck/security/test/AppCustomSessionIT.java index 60b46bb1..b1f53083 100644 --- a/tck/app-custom-session/src/test/java/ee/jakarta/tck/security/test/AppCustomSessionIT.java +++ b/tck/app-custom-session/src/test/java/ee/jakarta/tck/security/test/AppCustomSessionIT.java @@ -19,16 +19,16 @@ import static ee.jakarta.tck.security.test.Assert.assertDefaultAuthenticated; import static ee.jakarta.tck.security.test.Assert.assertDefaultNotAuthenticated; import static ee.jakarta.tck.security.test.ShrinkWrap.mavenWar; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.shrinkwrap.api.Archive; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; -@RunWith(Arquillian.class) +@ExtendWith(ArquillianExtension.class) public class AppCustomSessionIT extends ArquillianBase { @Deployment(testable = false) @@ -79,8 +79,8 @@ public void testAuthenticatedSession() { // For the initial authentication, the mechanism should be called assertTrue( - "Authentication mechanism should have been called, but wasn't", - response.contains("authentication mechanism called: true")); + response.contains("authentication mechanism called: true"), + "Authentication mechanism should have been called, but wasn't"); // 3. Request same page again within same http session, should still @@ -95,8 +95,8 @@ public void testAuthenticatedSession() { // (the session interceptor takes care of authentication now) assertTrue( - "Authentication mechanism should have been called, but wasn't", - response.contains("authentication mechanism called: false")); + response.contains("authentication mechanism called: false"), + "Authentication mechanism should have been called, but wasn't"); // 4. Logout. Should not be authenticated anymore diff --git a/tck/app-custom/src/test/java/ee/jakarta/tck/security/test/AppCustomIT.java b/tck/app-custom/src/test/java/ee/jakarta/tck/security/test/AppCustomIT.java index 83e8d2df..02b13721 100644 --- a/tck/app-custom/src/test/java/ee/jakarta/tck/security/test/AppCustomIT.java +++ b/tck/app-custom/src/test/java/ee/jakarta/tck/security/test/AppCustomIT.java @@ -21,13 +21,13 @@ import static ee.jakarta.tck.security.test.ShrinkWrap.mavenWar; import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.shrinkwrap.api.Archive; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; -@RunWith(Arquillian.class) +@ExtendWith(ArquillianExtension.class) public class AppCustomIT extends ArquillianBase { @Deployment(testable = false) diff --git a/tck/app-db-basic/src/test/java/ee/jakarta/tck/security/test/AppDbBasicIT.java b/tck/app-db-basic/src/test/java/ee/jakarta/tck/security/test/AppDbBasicIT.java index d789a1ac..ca95c7a8 100644 --- a/tck/app-db-basic/src/test/java/ee/jakarta/tck/security/test/AppDbBasicIT.java +++ b/tck/app-db-basic/src/test/java/ee/jakarta/tck/security/test/AppDbBasicIT.java @@ -18,15 +18,15 @@ package ee.jakarta.tck.security.test; import static ee.jakarta.tck.security.test.ShrinkWrap.mavenWar; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.shrinkwrap.api.Archive; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; -@RunWith(Arquillian.class) +@ExtendWith(ArquillianExtension.class) public class AppDbBasicIT extends ArquillianBase { @Deployment(testable = false) @@ -50,32 +50,32 @@ public static Archive createDeployment() { public void testAnnotationDBIDStore_Basic_valid() { String response = readFromServer("/ServletForDatabaseIDStore?user=tom&pwd=secret1"); - assertTrue("Expected VALID status.\n" + response, - response.contains("ValidateResultStatus=VALID")); - assertTrue("Expected Administrator group.\n" + response, response.contains("Administrator")); - assertTrue("Expected Manager group.\n" + response, response.contains("Manager")); - assertTrue("Expected ValidateCallerDN=null.\n" + response, response.contains("ValidateCallerDN=null")); - assertTrue("Expected web username tom.\n" + response, response.contains("web username: tom")); + assertTrue( + response.contains("ValidateResultStatus=VALID"), "Expected VALID status.\n" + response); + assertTrue(response.contains("Administrator"), "Expected Administrator group.\n" + response); + assertTrue(response.contains("Manager"), "Expected Manager group.\n" + response); + assertTrue(response.contains("ValidateCallerDN=null"), "Expected ValidateCallerDN=null.\n" + response); + assertTrue(response.contains("web username: tom"), "Expected web username tom.\n" + response); } @Test public void testAnnotationDBIDStore_Basic_pwdInvalid() { String response = readFromServer("/ServletForDatabaseIDStore?user=tom&pwd=invalid_pwd"); - assertTrue("Expected INVALID status.\n" + response, - response.contains("ValidateResultStatus=INVALID")); - assertTrue("Expected empty group set.\n" + response, - response.contains("ValidateResultGroups=[]")); + assertTrue( + response.contains("ValidateResultStatus=INVALID"), "Expected INVALID status.\n" + response); + assertTrue( + response.contains("ValidateResultGroups=[]"), "Expected empty group set.\n" + response); } @Test public void testAnnotationDBIDStore_Basic_userInvalid() { String response = readFromServer("/ServletForDatabaseIDStore?user=invalid_user&pwd=secret1"); - assertTrue("Expected INVALID status.\n" + response, - response.contains("ValidateResultStatus=INVALID")); - assertTrue("Expected empty group set.\n" + response, - response.contains("ValidateResultGroups=[]")); + assertTrue( + response.contains("ValidateResultStatus=INVALID"), "Expected INVALID status.\n" + response); + assertTrue( + response.contains("ValidateResultGroups=[]"), "Expected empty group set.\n" + response); } } diff --git a/tck/app-db-hashalgorithm/src/test/java/ee/jakarta/tck/security/test/AppDbHashAlgorithmIT.java b/tck/app-db-hashalgorithm/src/test/java/ee/jakarta/tck/security/test/AppDbHashAlgorithmIT.java index c8167477..3e3afb01 100644 --- a/tck/app-db-hashalgorithm/src/test/java/ee/jakarta/tck/security/test/AppDbHashAlgorithmIT.java +++ b/tck/app-db-hashalgorithm/src/test/java/ee/jakarta/tck/security/test/AppDbHashAlgorithmIT.java @@ -18,15 +18,15 @@ package ee.jakarta.tck.security.test; import static ee.jakarta.tck.security.test.ShrinkWrap.mavenWar; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.shrinkwrap.api.Archive; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; -@RunWith(Arquillian.class) +@ExtendWith(ArquillianExtension.class) public class AppDbHashAlgorithmIT extends ArquillianBase { @Deployment(testable = false) @@ -47,36 +47,36 @@ public static Archive createDeployment() { public void testHashAlgorithmDefault_with_tom_hash256_saltsize32() { String response = readFromServer("/ServletForDatabaseIDStore?user=tom_hash256_saltsize32&pwd=secret1"); - assertTrue("Expected VALID status.\n" + response, - response.contains("ValidateResultStatus=VALID")); - assertTrue("Expected web username tom_hash256_saltsize32.\n" + response, - response.contains("web username: tom_hash256_saltsize32")); - assertTrue("Expected Administrator+Manager groups.\n" + response, - response.contains("Administrator") && response.contains("Manager")); + assertTrue( + response.contains("ValidateResultStatus=VALID"), "Expected VALID status.\n" + response); + assertTrue( + response.contains("web username: tom_hash256_saltsize32"), "Expected web username tom_hash256_saltsize32.\n" + response); + assertTrue( + response.contains("Administrator") && response.contains("Manager"), "Expected Administrator+Manager groups.\n" + response); } @Test public void testHashAlgorithmDefault_with_tom_hash512_saltsize16() { String response = readFromServer("/ServletForDatabaseIDStore?user=tom_hash512_saltsize16&pwd=secret1"); - assertTrue("Expected VALID status.\n" + response, - response.contains("ValidateResultStatus=VALID")); - assertTrue("Expected web username tom_hash512_saltsize16.\n" + response, - response.contains("web username: tom_hash512_saltsize16")); - assertTrue("Expected Administrator+Manager groups.\n" + response, - response.contains("Administrator") && response.contains("Manager")); + assertTrue( + response.contains("ValidateResultStatus=VALID"), "Expected VALID status.\n" + response); + assertTrue( + response.contains("web username: tom_hash512_saltsize16"), "Expected web username tom_hash512_saltsize16.\n" + response); + assertTrue( + response.contains("Administrator") && response.contains("Manager"), "Expected Administrator+Manager groups.\n" + response); } @Test public void testHashAlgorithmDefault_with_tom_hash512_saltsize32() { String response = readFromServer("/ServletForDatabaseIDStore?user=tom_hash512_saltsize32&pwd=secret1"); - assertTrue("Expected VALID status.\n" + response, - response.contains("ValidateResultStatus=VALID")); - assertTrue("Expected web username tom_hash512_saltsize32.\n" + response, - response.contains("web username: tom_hash512_saltsize32")); - assertTrue("Expected Administrator+Manager groups.\n" + response, - response.contains("Administrator") && response.contains("Manager")); + assertTrue( + response.contains("ValidateResultStatus=VALID"), "Expected VALID status.\n" + response); + assertTrue( + response.contains("web username: tom_hash512_saltsize32"), "Expected web username tom_hash512_saltsize32.\n" + response); + assertTrue( + response.contains("Administrator") && response.contains("Manager"), "Expected Administrator+Manager groups.\n" + response); } } diff --git a/tck/app-db-hashalgorithmparam/src/test/java/ee/jakarta/tck/security/test/AppDbHashAlgorithmParamIT.java b/tck/app-db-hashalgorithmparam/src/test/java/ee/jakarta/tck/security/test/AppDbHashAlgorithmParamIT.java index 99648f11..5ec63725 100644 --- a/tck/app-db-hashalgorithmparam/src/test/java/ee/jakarta/tck/security/test/AppDbHashAlgorithmParamIT.java +++ b/tck/app-db-hashalgorithmparam/src/test/java/ee/jakarta/tck/security/test/AppDbHashAlgorithmParamIT.java @@ -18,15 +18,15 @@ package ee.jakarta.tck.security.test; import static ee.jakarta.tck.security.test.ShrinkWrap.mavenWar; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.shrinkwrap.api.Archive; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; -@RunWith(Arquillian.class) +@ExtendWith(ArquillianExtension.class) public class AppDbHashAlgorithmParamIT extends ArquillianBase { @Deployment(testable = false) @@ -46,36 +46,36 @@ public static Archive createDeployment() { public void testHashAlgorithmParam_with_tom_hash256_saltsize32() { String response = readFromServer("/ServletForDatabaseIDStore?user=tom_hash256_saltsize32&pwd=secret1"); - assertTrue("Expected VALID status.\n" + response, - response.contains("ValidateResultStatus=VALID")); - assertTrue("Expected web username tom_hash256_saltsize32.\n" + response, - response.contains("web username: tom_hash256_saltsize32")); - assertTrue("Expected Administrator+Manager groups.\n" + response, - response.contains("Administrator") && response.contains("Manager")); + assertTrue( + response.contains("ValidateResultStatus=VALID"), "Expected VALID status.\n" + response); + assertTrue( + response.contains("web username: tom_hash256_saltsize32"), "Expected web username tom_hash256_saltsize32.\n" + response); + assertTrue( + response.contains("Administrator") && response.contains("Manager"), "Expected Administrator+Manager groups.\n" + response); } @Test public void testHashAlgorithmParam_with_tom_hash512_saltsize16() { String response = readFromServer("/ServletForDatabaseIDStore?user=tom_hash512_saltsize16&pwd=secret1"); - assertTrue("Expected VALID status.\n" + response, - response.contains("ValidateResultStatus=VALID")); - assertTrue("Expected web username tom_hash512_saltsize16.\n" + response, - response.contains("web username: tom_hash512_saltsize16")); - assertTrue("Expected Administrator+Manager groups.\n" + response, - response.contains("Administrator") && response.contains("Manager")); + assertTrue( + response.contains("ValidateResultStatus=VALID"), "Expected VALID status.\n" + response); + assertTrue( + response.contains("web username: tom_hash512_saltsize16"), "Expected web username tom_hash512_saltsize16.\n" + response); + assertTrue( + response.contains("Administrator") && response.contains("Manager"), "Expected Administrator+Manager groups.\n" + response); } @Test public void testHashAlgorithmParam_with_tom_hash512_saltsize32() { String response = readFromServer("/ServletForDatabaseIDStore?user=tom_hash512_saltsize32&pwd=secret1"); - assertTrue("Expected VALID status.\n" + response, - response.contains("ValidateResultStatus=VALID")); - assertTrue("Expected web username tom_hash512_saltsize32.\n" + response, - response.contains("web username: tom_hash512_saltsize32")); - assertTrue("Expected Administrator+Manager groups.\n" + response, - response.contains("Administrator") && response.contains("Manager")); + assertTrue( + response.contains("ValidateResultStatus=VALID"), "Expected VALID status.\n" + response); + assertTrue( + response.contains("web username: tom_hash512_saltsize32"), "Expected web username tom_hash512_saltsize32.\n" + response); + assertTrue( + response.contains("Administrator") && response.contains("Manager"), "Expected Administrator+Manager groups.\n" + response); } } diff --git a/tck/app-db-invalidcallerquery/src/test/java/ee/jakarta/tck/security/test/AppDbInvalidCallerQueryIT.java b/tck/app-db-invalidcallerquery/src/test/java/ee/jakarta/tck/security/test/AppDbInvalidCallerQueryIT.java index cc859219..01bf2843 100644 --- a/tck/app-db-invalidcallerquery/src/test/java/ee/jakarta/tck/security/test/AppDbInvalidCallerQueryIT.java +++ b/tck/app-db-invalidcallerquery/src/test/java/ee/jakarta/tck/security/test/AppDbInvalidCallerQueryIT.java @@ -18,15 +18,15 @@ package ee.jakarta.tck.security.test; import static ee.jakarta.tck.security.test.ShrinkWrap.mavenWar; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.shrinkwrap.api.Archive; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; -@RunWith(Arquillian.class) +@ExtendWith(ArquillianExtension.class) public class AppDbInvalidCallerQueryIT extends ArquillianBase { @Deployment(testable = false) @@ -46,8 +46,8 @@ public static Archive createDeployment() { public void testAnnotationDBIDStore_Invalidcallerquery() { String response = readFromServer("/ServletForDatabaseIDStore?user=tom&pwd=secret1"); - assertTrue("Expected 'Exception received.' due to invalid callerQuery.\n" + response, - response.contains("Exception received.")); + assertTrue( + response.contains("Exception received."), "Expected 'Exception received.' due to invalid callerQuery.\n" + response); } } diff --git a/tck/app-db-invaliddatasource/src/test/java/ee/jakarta/tck/security/test/AppDbInvalidDataSourceIT.java b/tck/app-db-invaliddatasource/src/test/java/ee/jakarta/tck/security/test/AppDbInvalidDataSourceIT.java index 7fc68818..f2f7ff45 100644 --- a/tck/app-db-invaliddatasource/src/test/java/ee/jakarta/tck/security/test/AppDbInvalidDataSourceIT.java +++ b/tck/app-db-invaliddatasource/src/test/java/ee/jakarta/tck/security/test/AppDbInvalidDataSourceIT.java @@ -18,15 +18,15 @@ package ee.jakarta.tck.security.test; import static ee.jakarta.tck.security.test.ShrinkWrap.mavenWar; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.shrinkwrap.api.Archive; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; -@RunWith(Arquillian.class) +@ExtendWith(ArquillianExtension.class) public class AppDbInvalidDataSourceIT extends ArquillianBase { @Deployment(testable = false) @@ -45,8 +45,8 @@ public static Archive createDeployment() { public void testAnnotationDBIDStore_Invaliddatasource() { String response = readFromServer("/ServletForDatabaseIDStore?user=tom&pwd=secret1"); - assertTrue("Expected 'Exception received.' due to invalid dataSourceLookup.\n" + response, - response.contains("Exception received.")); + assertTrue( + response.contains("Exception received."), "Expected 'Exception received.' due to invalid dataSourceLookup.\n" + response); } } diff --git a/tck/app-db-invalidgroupsquery/src/test/java/ee/jakarta/tck/security/test/AppDbInvalidGroupsQueryIT.java b/tck/app-db-invalidgroupsquery/src/test/java/ee/jakarta/tck/security/test/AppDbInvalidGroupsQueryIT.java index 373aee00..9732e062 100644 --- a/tck/app-db-invalidgroupsquery/src/test/java/ee/jakarta/tck/security/test/AppDbInvalidGroupsQueryIT.java +++ b/tck/app-db-invalidgroupsquery/src/test/java/ee/jakarta/tck/security/test/AppDbInvalidGroupsQueryIT.java @@ -18,15 +18,15 @@ package ee.jakarta.tck.security.test; import static ee.jakarta.tck.security.test.ShrinkWrap.mavenWar; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.shrinkwrap.api.Archive; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; -@RunWith(Arquillian.class) +@ExtendWith(ArquillianExtension.class) public class AppDbInvalidGroupsQueryIT extends ArquillianBase { @Deployment(testable = false) @@ -45,8 +45,8 @@ public static Archive createDeployment() { public void testAnnotationDBIDStore_Invalidgroupsquery() { String response = readFromServer("/ServletForDatabaseIDStore?user=tom&pwd=secret1"); - assertTrue("Expected 'Exception received.' due to invalid groupsQuery.\n" + response, - response.contains("Exception received.")); + assertTrue( + response.contains("Exception received."), "Expected 'Exception received.' due to invalid groupsQuery.\n" + response); } } diff --git a/tck/app-db-invalidhashalgorithmparam/src/test/java/ee/jakarta/tck/security/test/AppDbInvalidHashAlgorithmParamIT.java b/tck/app-db-invalidhashalgorithmparam/src/test/java/ee/jakarta/tck/security/test/AppDbInvalidHashAlgorithmParamIT.java index 51ba6c8a..19d914d1 100644 --- a/tck/app-db-invalidhashalgorithmparam/src/test/java/ee/jakarta/tck/security/test/AppDbInvalidHashAlgorithmParamIT.java +++ b/tck/app-db-invalidhashalgorithmparam/src/test/java/ee/jakarta/tck/security/test/AppDbInvalidHashAlgorithmParamIT.java @@ -18,15 +18,15 @@ package ee.jakarta.tck.security.test; import static ee.jakarta.tck.security.test.ShrinkWrap.mavenWar; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.shrinkwrap.api.Archive; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; -@RunWith(Arquillian.class) +@ExtendWith(ArquillianExtension.class) public class AppDbInvalidHashAlgorithmParamIT extends ArquillianBase { @Deployment(testable = false) @@ -46,36 +46,36 @@ public static Archive createDeployment() { public void testInvalidHashAlgorithmParam_with_tom_hash256_saltsize32() { String response = readFromServer("/ServletForDatabaseIDStore?user=tom_hash256_saltsize32&pwd=secret1"); - assertTrue("Expected VALID status.\n" + response, - response.contains("ValidateResultStatus=VALID")); - assertTrue("Expected web username tom_hash256_saltsize32.\n" + response, - response.contains("web username: tom_hash256_saltsize32")); - assertTrue("Expected Administrator+Manager groups.\n" + response, - response.contains("Administrator") && response.contains("Manager")); + assertTrue( + response.contains("ValidateResultStatus=VALID"), "Expected VALID status.\n" + response); + assertTrue( + response.contains("web username: tom_hash256_saltsize32"), "Expected web username tom_hash256_saltsize32.\n" + response); + assertTrue( + response.contains("Administrator") && response.contains("Manager"), "Expected Administrator+Manager groups.\n" + response); } @Test public void testInvalidHashAlgorithmParam_with_tom_hash512_saltsize16() { String response = readFromServer("/ServletForDatabaseIDStore?user=tom_hash512_saltsize16&pwd=secret1"); - assertTrue("Expected VALID status.\n" + response, - response.contains("ValidateResultStatus=VALID")); - assertTrue("Expected web username tom_hash512_saltsize16.\n" + response, - response.contains("web username: tom_hash512_saltsize16")); - assertTrue("Expected Administrator+Manager groups.\n" + response, - response.contains("Administrator") && response.contains("Manager")); + assertTrue( + response.contains("ValidateResultStatus=VALID"), "Expected VALID status.\n" + response); + assertTrue( + response.contains("web username: tom_hash512_saltsize16"), "Expected web username tom_hash512_saltsize16.\n" + response); + assertTrue( + response.contains("Administrator") && response.contains("Manager"), "Expected Administrator+Manager groups.\n" + response); } @Test public void testInvalidHashAlgorithmParam_with_tom_hash512_saltsize32() { String response = readFromServer("/ServletForDatabaseIDStore?user=tom_hash512_saltsize32&pwd=secret1"); - assertTrue("Expected VALID status.\n" + response, - response.contains("ValidateResultStatus=VALID")); - assertTrue("Expected web username tom_hash512_saltsize32.\n" + response, - response.contains("web username: tom_hash512_saltsize32")); - assertTrue("Expected Administrator+Manager groups.\n" + response, - response.contains("Administrator") && response.contains("Manager")); + assertTrue( + response.contains("ValidateResultStatus=VALID"), "Expected VALID status.\n" + response); + assertTrue( + response.contains("web username: tom_hash512_saltsize32"), "Expected web username tom_hash512_saltsize32.\n" + response); + assertTrue( + response.contains("Administrator") && response.contains("Manager"), "Expected Administrator+Manager groups.\n" + response); } } diff --git a/tck/app-db-invalidpriorityuseforexpr/src/test/java/ee/jakarta/tck/security/test/AppDbInvalidPriorityUseForExprIT.java b/tck/app-db-invalidpriorityuseforexpr/src/test/java/ee/jakarta/tck/security/test/AppDbInvalidPriorityUseForExprIT.java index f381cac6..8994bc4e 100644 --- a/tck/app-db-invalidpriorityuseforexpr/src/test/java/ee/jakarta/tck/security/test/AppDbInvalidPriorityUseForExprIT.java +++ b/tck/app-db-invalidpriorityuseforexpr/src/test/java/ee/jakarta/tck/security/test/AppDbInvalidPriorityUseForExprIT.java @@ -18,15 +18,15 @@ package ee.jakarta.tck.security.test; import static ee.jakarta.tck.security.test.ShrinkWrap.mavenWar; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.shrinkwrap.api.Archive; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; -@RunWith(Arquillian.class) +@ExtendWith(ArquillianExtension.class) public class AppDbInvalidPriorityUseForExprIT extends ArquillianBase { @Deployment(testable = false) @@ -45,16 +45,16 @@ public static Archive createDeployment() { public void testAnnotationDBIDStore_invalidpriorityuseforexpr_tom() { String response = readFromServer("/ServletForDatabaseIDStore?user=tom&pwd=secret1"); - assertTrue("Expected 'Exception received.' due to invalid priorityExpression.\n" + response, - response.contains("Exception received.")); + assertTrue( + response.contains("Exception received."), "Expected 'Exception received.' due to invalid priorityExpression.\n" + response); } @Test public void testAnnotationDBIDStore_invalidpriorityuseforexpr_emma() { String response = readFromServer("/ServletForDatabaseIDStore?user=emma&pwd=secret2"); - assertTrue("Expected 'Exception received.' due to invalid priorityExpression.\n" + response, - response.contains("Exception received.")); + assertTrue( + response.contains("Exception received."), "Expected 'Exception received.' due to invalid priorityExpression.\n" + response); } } diff --git a/tck/app-db-multi/src/test/java/ee/jakarta/tck/security/test/AppDbMultiIT.java b/tck/app-db-multi/src/test/java/ee/jakarta/tck/security/test/AppDbMultiIT.java index 3b98befc..b0f263b7 100644 --- a/tck/app-db-multi/src/test/java/ee/jakarta/tck/security/test/AppDbMultiIT.java +++ b/tck/app-db-multi/src/test/java/ee/jakarta/tck/security/test/AppDbMultiIT.java @@ -18,15 +18,15 @@ package ee.jakarta.tck.security.test; import static ee.jakarta.tck.security.test.ShrinkWrap.mavenWar; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.shrinkwrap.api.Archive; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; -@RunWith(Arquillian.class) +@ExtendWith(ArquillianExtension.class) public class AppDbMultiIT extends ArquillianBase { @Deployment(testable = false) @@ -46,28 +46,28 @@ public static Archive createDeployment() { public void testAnnotationDBIDStore_multi_tom() { String response = readFromServer("/ServletForDatabaseIDStore?user=tom&pwd=secret1"); - assertTrue("Expected VALID status.\n" + response, - response.contains("ValidateResultStatus=VALID")); - assertTrue("Expected web username tom.\n" + response, - response.contains("web username: tom")); - assertTrue("Expected Administrator from DB store.\n" + response, - response.contains("Administrator")); - assertTrue("Expected Manager from DB store.\n" + response, - response.contains("Manager")); + assertTrue( + response.contains("ValidateResultStatus=VALID"), "Expected VALID status.\n" + response); + assertTrue( + response.contains("web username: tom"), "Expected web username tom.\n" + response); + assertTrue( + response.contains("Administrator"), "Expected Administrator from DB store.\n" + response); + assertTrue( + response.contains("Manager"), "Expected Manager from DB store.\n" + response); } @Test public void testAnnotationDBIDStore_multi_tomx() { String response = readFromServer("/ServletForDatabaseIDStore?user=tomx&pwd=secret1"); - assertTrue("Expected VALID status.\n" + response, - response.contains("ValidateResultStatus=VALID")); - assertTrue("Expected web username tomx.\n" + response, - response.contains("web username: tomx")); - assertTrue("Expected Administratorx from in-mem store.\n" + response, - response.contains("Administratorx")); - assertTrue("Expected Managerx from in-mem store.\n" + response, - response.contains("Managerx")); + assertTrue( + response.contains("ValidateResultStatus=VALID"), "Expected VALID status.\n" + response); + assertTrue( + response.contains("web username: tomx"), "Expected web username tomx.\n" + response); + assertTrue( + response.contains("Administratorx"), "Expected Administratorx from in-mem store.\n" + response); + assertTrue( + response.contains("Managerx"), "Expected Managerx from in-mem store.\n" + response); } } diff --git a/tck/app-db-notvalidated/src/test/java/ee/jakarta/tck/security/test/AppDbNotValidatedIT.java b/tck/app-db-notvalidated/src/test/java/ee/jakarta/tck/security/test/AppDbNotValidatedIT.java index 7bf15320..29f60a26 100644 --- a/tck/app-db-notvalidated/src/test/java/ee/jakarta/tck/security/test/AppDbNotValidatedIT.java +++ b/tck/app-db-notvalidated/src/test/java/ee/jakarta/tck/security/test/AppDbNotValidatedIT.java @@ -18,15 +18,15 @@ package ee.jakarta.tck.security.test; import static ee.jakarta.tck.security.test.ShrinkWrap.mavenWar; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.shrinkwrap.api.Archive; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; -@RunWith(Arquillian.class) +@ExtendWith(ArquillianExtension.class) public class AppDbNotValidatedIT extends ArquillianBase { @Deployment(testable = false) @@ -45,10 +45,10 @@ public static Archive createDeployment() { public void testAnnotationDBIDStore_notValidated() { String response = readFromServer("/ServletForDatabaseIDStore?user=tom&pwd=secret1"); - assertTrue("Expected NOT_VALIDATED status (PROVIDE_GROUPS-only store).\n" + response, - response.contains("ValidateResultStatus=NOT_VALIDATED")); - assertTrue("Expected empty group set.\n" + response, - response.contains("ValidateResultGroups=[]")); + assertTrue( + response.contains("ValidateResultStatus=NOT_VALIDATED"), "Expected NOT_VALIDATED status (PROVIDE_GROUPS-only store).\n" + response); + assertTrue( + response.contains("ValidateResultGroups=[]"), "Expected empty group set.\n" + response); } } diff --git a/tck/app-db-priorityuseforexpr/src/test/java/ee/jakarta/tck/security/test/AppDbPriorityUseForExprIT.java b/tck/app-db-priorityuseforexpr/src/test/java/ee/jakarta/tck/security/test/AppDbPriorityUseForExprIT.java index 684c8a7e..cc2a43a5 100644 --- a/tck/app-db-priorityuseforexpr/src/test/java/ee/jakarta/tck/security/test/AppDbPriorityUseForExprIT.java +++ b/tck/app-db-priorityuseforexpr/src/test/java/ee/jakarta/tck/security/test/AppDbPriorityUseForExprIT.java @@ -18,15 +18,15 @@ package ee.jakarta.tck.security.test; import static ee.jakarta.tck.security.test.ShrinkWrap.mavenWar; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.shrinkwrap.api.Archive; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; -@RunWith(Arquillian.class) +@ExtendWith(ArquillianExtension.class) public class AppDbPriorityUseForExprIT extends ArquillianBase { @Deployment(testable = false) @@ -47,14 +47,14 @@ public static Archive createDeployment() { public void testAnnotationDBIDStore_priorityuseforexpr_tom() { String response = readFromServer("/ServletForDatabaseIDStore?user=tom&pwd=secret1"); - assertTrue("Expected VALID status from in-mem store.\n" + response, - response.contains("ValidateResultStatus=VALID")); - assertTrue("Expected web username tom.\n" + response, - response.contains("web username: tom")); - assertTrue("Expected groups from IdentityStore1.\n" + response, - response.contains("Administrator1") && response.contains("Manager1")); - assertTrue("Expected groups from DB store.\n" + response, - response.contains("Administrator") && response.contains("Manager")); + assertTrue( + response.contains("ValidateResultStatus=VALID"), "Expected VALID status from in-mem store.\n" + response); + assertTrue( + response.contains("web username: tom"), "Expected web username tom.\n" + response); + assertTrue( + response.contains("Administrator1") && response.contains("Manager1"), "Expected groups from IdentityStore1.\n" + response); + assertTrue( + response.contains("Administrator") && response.contains("Manager"), "Expected groups from DB store.\n" + response); } @Test @@ -64,10 +64,10 @@ public void testAnnotationDBIDStore_priorityuseforexpr_emma() { // overall result is INVALID with no groups. String response = readFromServer("/ServletForDatabaseIDStore?user=emma&pwd=secret2"); - assertTrue("Expected INVALID status (DB is PROVIDE_GROUPS only, in-mem rejects pwd).\n" + response, - response.contains("ValidateResultStatus=INVALID")); - assertTrue("Expected empty group set.\n" + response, - response.contains("ValidateResultGroups=[]")); + assertTrue( + response.contains("ValidateResultStatus=INVALID"), "Expected INVALID status (DB is PROVIDE_GROUPS only, in-mem rejects pwd).\n" + response); + assertTrue( + response.contains("ValidateResultGroups=[]"), "Expected empty group set.\n" + response); } } diff --git a/tck/app-db-priorityuseforexprbean/src/test/java/ee/jakarta/tck/security/test/AppDbPriorityUseForExprBeanIT.java b/tck/app-db-priorityuseforexprbean/src/test/java/ee/jakarta/tck/security/test/AppDbPriorityUseForExprBeanIT.java index 5cc374ba..78a1589a 100644 --- a/tck/app-db-priorityuseforexprbean/src/test/java/ee/jakarta/tck/security/test/AppDbPriorityUseForExprBeanIT.java +++ b/tck/app-db-priorityuseforexprbean/src/test/java/ee/jakarta/tck/security/test/AppDbPriorityUseForExprBeanIT.java @@ -18,15 +18,15 @@ package ee.jakarta.tck.security.test; import static ee.jakarta.tck.security.test.ShrinkWrap.mavenWar; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.shrinkwrap.api.Archive; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; -@RunWith(Arquillian.class) +@ExtendWith(ArquillianExtension.class) public class AppDbPriorityUseForExprBeanIT extends ArquillianBase { @Deployment(testable = false) @@ -47,12 +47,12 @@ public static Archive createDeployment() { public void testAnnotationDBIDStore_priorityuseforexprbean_tom() { String response = readFromServer("/ServletForDatabaseIDStore?user=tom&pwd=secret1"); - assertTrue("Expected VALID status.\n" + response, - response.contains("ValidateResultStatus=VALID")); - assertTrue("Expected web username tom.\n" + response, - response.contains("web username: tom")); - assertTrue("Expected groups from IdentityStore1.\n" + response, - response.contains("Administrator1") && response.contains("Manager1")); + assertTrue( + response.contains("ValidateResultStatus=VALID"), "Expected VALID status.\n" + response); + assertTrue( + response.contains("web username: tom"), "Expected web username tom.\n" + response); + assertTrue( + response.contains("Administrator1") && response.contains("Manager1"), "Expected groups from IdentityStore1.\n" + response); } @Test @@ -61,12 +61,12 @@ public void testAnnotationDBIDStore_priorityuseforexprbean_emma() { // including VALIDATE, the DB store can validate her credentials. String response = readFromServer("/ServletForDatabaseIDStore?user=emma&pwd=secret2"); - assertTrue("Expected VALID status from DB store.\n" + response, - response.contains("ValidateResultStatus=VALID")); - assertTrue("Expected web username emma.\n" + response, - response.contains("web username: emma")); - assertTrue("Expected groups from DB store.\n" + response, - response.contains("Administrator") && response.contains("Employee")); + assertTrue( + response.contains("ValidateResultStatus=VALID"), "Expected VALID status from DB store.\n" + response); + assertTrue( + response.contains("web username: emma"), "Expected web username emma.\n" + response); + assertTrue( + response.contains("Administrator") && response.contains("Employee"), "Expected groups from DB store.\n" + response); } } diff --git a/tck/app-db-useforgroup/src/test/java/ee/jakarta/tck/security/test/AppDbUseForGroupIT.java b/tck/app-db-useforgroup/src/test/java/ee/jakarta/tck/security/test/AppDbUseForGroupIT.java index 625b1dfe..3f7a765a 100644 --- a/tck/app-db-useforgroup/src/test/java/ee/jakarta/tck/security/test/AppDbUseForGroupIT.java +++ b/tck/app-db-useforgroup/src/test/java/ee/jakarta/tck/security/test/AppDbUseForGroupIT.java @@ -18,15 +18,15 @@ package ee.jakarta.tck.security.test; import static ee.jakarta.tck.security.test.ShrinkWrap.mavenWar; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.shrinkwrap.api.Archive; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; -@RunWith(Arquillian.class) +@ExtendWith(ArquillianExtension.class) public class AppDbUseForGroupIT extends ArquillianBase { @Deployment(testable = false) @@ -46,30 +46,30 @@ public static Archive createDeployment() { public void testAnnotationDBIDStore_useforgroup_tom() { String response = readFromServer("/ServletForDatabaseIDStore?user=tom&pwd=secret1"); - assertTrue("Expected VALID status.\n" + response, - response.contains("ValidateResultStatus=VALID")); - assertTrue("Expected web username tom.\n" + response, - response.contains("web username: tom")); - assertTrue("Expected groups from IdentityStore1.\n" + response, - response.contains("Administrator1") && response.contains("Manager1")); - assertTrue("Expected groups from DB store.\n" + response, - response.contains("Administrator") && response.contains("Manager")); - assertTrue("Expected groups from IdentityStore2.\n" + response, - response.contains("Administrator2") && response.contains("Manager2")); + assertTrue( + response.contains("ValidateResultStatus=VALID"), "Expected VALID status.\n" + response); + assertTrue( + response.contains("web username: tom"), "Expected web username tom.\n" + response); + assertTrue( + response.contains("Administrator1") && response.contains("Manager1"), "Expected groups from IdentityStore1.\n" + response); + assertTrue( + response.contains("Administrator") && response.contains("Manager"), "Expected groups from DB store.\n" + response); + assertTrue( + response.contains("Administrator2") && response.contains("Manager2"), "Expected groups from IdentityStore2.\n" + response); } @Test public void testAnnotationDBIDStore_useforgroup_emma() { String response = readFromServer("/ServletForDatabaseIDStore?user=emma&pwd=secret12"); - assertTrue("Expected VALID status.\n" + response, - response.contains("ValidateResultStatus=VALID")); - assertTrue("Expected web username emma.\n" + response, - response.contains("web username: emma")); - assertTrue("Expected groups from IdentityStore1.\n" + response, - response.contains("Administrator1") && response.contains("Employee1")); - assertTrue("Expected groups from IdentityStore2.\n" + response, - response.contains("Administrator2") && response.contains("Employee2")); + assertTrue( + response.contains("ValidateResultStatus=VALID"), "Expected VALID status.\n" + response); + assertTrue( + response.contains("web username: emma"), "Expected web username emma.\n" + response); + assertTrue( + response.contains("Administrator1") && response.contains("Employee1"), "Expected groups from IdentityStore1.\n" + response); + assertTrue( + response.contains("Administrator2") && response.contains("Employee2"), "Expected groups from IdentityStore2.\n" + response); } } diff --git a/tck/app-db-useforvalidation/src/test/java/ee/jakarta/tck/security/test/AppDbUseForValidationIT.java b/tck/app-db-useforvalidation/src/test/java/ee/jakarta/tck/security/test/AppDbUseForValidationIT.java index 50053207..bbf22f25 100644 --- a/tck/app-db-useforvalidation/src/test/java/ee/jakarta/tck/security/test/AppDbUseForValidationIT.java +++ b/tck/app-db-useforvalidation/src/test/java/ee/jakarta/tck/security/test/AppDbUseForValidationIT.java @@ -18,15 +18,15 @@ package ee.jakarta.tck.security.test; import static ee.jakarta.tck.security.test.ShrinkWrap.mavenWar; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.shrinkwrap.api.Archive; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; -@RunWith(Arquillian.class) +@ExtendWith(ArquillianExtension.class) public class AppDbUseForValidationIT extends ArquillianBase { @Deployment(testable = false) @@ -48,34 +48,34 @@ public static Archive createDeployment() { public void testValid_inMem_higherPriority() { String response = readFromServer("/ServletForDatabaseIDStore?user=tom&pwd=secret1"); - assertTrue("Expected VALID status.\n" + response, - response.contains("ValidateResultStatus=VALID")); - assertTrue("Expected web username tom.\n" + response, - response.contains("web username: tom")); - assertTrue("Expected at least one group from the in-mem store.\n" + response, - response.contains("Administrator1") || response.contains("Manager1")); + assertTrue( + response.contains("ValidateResultStatus=VALID"), "Expected VALID status.\n" + response); + assertTrue( + response.contains("web username: tom"), "Expected web username tom.\n" + response); + assertTrue( + response.contains("Administrator1") || response.contains("Manager1"), "Expected at least one group from the in-mem store.\n" + response); } @Test public void testValid_db_validateOnly() { String response = readFromServer("/ServletForDatabaseIDStore?user=emma&pwd=secret2"); - assertTrue("Expected VALID status.\n" + response, - response.contains("ValidateResultStatus=VALID")); - assertTrue("Expected empty group set (DB store is VALIDATE-only and in-mem rejects).\n" + response, - response.contains("ValidateResultGroups=[]")); - assertTrue("Expected web username emma.\n" + response, - response.contains("web username: emma")); + assertTrue( + response.contains("ValidateResultStatus=VALID"), "Expected VALID status.\n" + response); + assertTrue( + response.contains("ValidateResultGroups=[]"), "Expected empty group set (DB store is VALIDATE-only and in-mem rejects).\n" + response); + assertTrue( + response.contains("web username: emma"), "Expected web username emma.\n" + response); } @Test public void testInvalid_unknownUser() { String response = readFromServer("/ServletForDatabaseIDStore?user=invalid_user&pwd=secret2"); - assertTrue("Expected INVALID status.\n" + response, - response.contains("ValidateResultStatus=INVALID")); - assertTrue("Expected empty group set.\n" + response, - response.contains("ValidateResultGroups=[]")); + assertTrue( + response.contains("ValidateResultStatus=INVALID"), "Expected INVALID status.\n" + response); + assertTrue( + response.contains("ValidateResultGroups=[]"), "Expected empty group set.\n" + response); } } diff --git a/tck/app-db/src/test/java/ee/jakarta/tck/security/test/AppDBIT.java b/tck/app-db/src/test/java/ee/jakarta/tck/security/test/AppDBIT.java index 37a3f6e7..46b3b7d1 100644 --- a/tck/app-db/src/test/java/ee/jakarta/tck/security/test/AppDBIT.java +++ b/tck/app-db/src/test/java/ee/jakarta/tck/security/test/AppDBIT.java @@ -20,20 +20,20 @@ import static ee.jakarta.tck.security.test.Assert.assertDefaultNotAuthenticated; import static ee.jakarta.tck.security.test.ShrinkWrap.mavenWar; import static java.lang.System.getProperty; -import static org.junit.Assume.assumeFalse; +import static org.junit.jupiter.api.Assumptions.assumeFalse; import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.shrinkwrap.api.Archive; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.EmptyAsset; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; -@RunWith(Arquillian.class) +@ExtendWith(ArquillianExtension.class) public class AppDBIT extends ArquillianBase { // Disabled for Liberty since as of version 16.0.0.3 / 2016.9 it doesn't @@ -47,7 +47,7 @@ public static Archive createDeployment() { return mavenWar(); } - @Before + @BeforeEach public void checkEnabled() { assumeFalse("liberty".equals(getProperty("arquillian.server"))); } diff --git a/tck/app-ham-autoapplysession/src/test/java/ee/jakarta/tck/security/test/AppHamAutoApplySessionIT.java b/tck/app-ham-autoapplysession/src/test/java/ee/jakarta/tck/security/test/AppHamAutoApplySessionIT.java index 2375de0d..b67bfe6e 100644 --- a/tck/app-ham-autoapplysession/src/test/java/ee/jakarta/tck/security/test/AppHamAutoApplySessionIT.java +++ b/tck/app-ham-autoapplysession/src/test/java/ee/jakarta/tck/security/test/AppHamAutoApplySessionIT.java @@ -18,17 +18,17 @@ package ee.jakarta.tck.security.test; import static ee.jakarta.tck.security.test.ShrinkWrap.mavenWar; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import org.htmlunit.WebResponse; import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.shrinkwrap.api.Archive; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; -@RunWith(Arquillian.class) +@ExtendWith(ArquillianExtension.class) public class AppHamAutoApplySessionIT extends ArquillianBase { @Deployment(testable = false) @@ -73,8 +73,8 @@ public void testAutoApplySession() { } private void assertExpectedAuthenticatedContent(String response) { - assertTrue("Expected user principal to be reza.\n" + response, - response.contains("The user principal is: reza")); + assertTrue( + response.contains("The user principal is: reza"), "Expected user principal to be reza.\n" + response); assertTrue(response.contains("isUserInRole(\"foo\"): !true!")); assertTrue(response.contains("isUserInRole(\"bar\"): !true!")); assertTrue(response.contains("isUserInRole(\"kaz\"): !false!")); diff --git a/tck/app-ham-basic/src/test/java/ee/jakarta/tck/security/test/AppHamBasicIT.java b/tck/app-ham-basic/src/test/java/ee/jakarta/tck/security/test/AppHamBasicIT.java index a8c30540..e26369f6 100644 --- a/tck/app-ham-basic/src/test/java/ee/jakarta/tck/security/test/AppHamBasicIT.java +++ b/tck/app-ham-basic/src/test/java/ee/jakarta/tck/security/test/AppHamBasicIT.java @@ -18,18 +18,18 @@ package ee.jakarta.tck.security.test; import static ee.jakarta.tck.security.test.ShrinkWrap.mavenWar; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import org.htmlunit.DefaultCredentialsProvider; import org.htmlunit.WebResponse; import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.shrinkwrap.api.Archive; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; -@RunWith(Arquillian.class) +@ExtendWith(ArquillianExtension.class) public class AppHamBasicIT extends ArquillianBase { @Deployment(testable = false) @@ -80,12 +80,12 @@ public void testBasicHAMHasCorrectQualifier() { String response = readFromServer("/servlet2"); assertTrue( - "Response should report the BASIC HAM bean has @BasicAuthenticationMechanism qualifier.\n" + response, - response.contains("Have qualifier @BasicAuthenticationMechanism: true")); + response.contains("Have qualifier @BasicAuthenticationMechanism: true"), + "Response should report the BASIC HAM bean has @BasicAuthenticationMechanism qualifier.\n" + response); assertTrue( - "Response should report the BASIC HAM bean has @ApplicationScoped scope.\n" + response, - response.contains("Have scope @ApplicationScoped: true")); + response.contains("Have scope @ApplicationScoped: true"), + "Response should report the BASIC HAM bean has @ApplicationScoped scope.\n" + response); } private void authenticate(String username, String password) { diff --git a/tck/app-ham-customform-base/src/test/java/ee/jakarta/tck/security/test/AppHamCustomFormBaseIT.java b/tck/app-ham-customform-base/src/test/java/ee/jakarta/tck/security/test/AppHamCustomFormBaseIT.java index 9d3b2bcc..5409d494 100644 --- a/tck/app-ham-customform-base/src/test/java/ee/jakarta/tck/security/test/AppHamCustomFormBaseIT.java +++ b/tck/app-ham-customform-base/src/test/java/ee/jakarta/tck/security/test/AppHamCustomFormBaseIT.java @@ -18,19 +18,19 @@ package ee.jakarta.tck.security.test; import static ee.jakarta.tck.security.test.ShrinkWrap.mavenWar; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.IOException; import org.htmlunit.html.HtmlForm; import org.htmlunit.html.HtmlPage; import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.shrinkwrap.api.Archive; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; -@RunWith(Arquillian.class) +@ExtendWith(ArquillianExtension.class) public class AppHamCustomFormBaseIT extends ArquillianBase { @Deployment(testable = false) @@ -45,8 +45,8 @@ public static Archive createDeployment() { public void testCustomFormHAMValidateRequest() throws IOException { HtmlPage loginPage = pageFromServer("/servlet"); - assertTrue("Expected to receive the login page.\n" + loginPage.getWebResponse().getContentAsString(), - loginPage.getWebResponse().getContentAsString().contains("Login")); + assertTrue( + loginPage.getWebResponse().getContentAsString().contains("Login"), "Expected to receive the login page.\n" + loginPage.getWebResponse().getContentAsString()); HtmlForm form = loginPage.getForms().get(0); form.getInputByName("form:username").setValueAttribute("reza"); @@ -55,18 +55,18 @@ public void testCustomFormHAMValidateRequest() throws IOException { HtmlPage page = form.getInputByValue("Login").click(); String response = page.getWebResponse().getContentAsString(); - assertTrue("Expected the protected resource to identify the caller as reza.\n" + response, - response.contains("The user principal is: reza")); - assertTrue("Expected getRemoteUser() to return reza.\n" + response, - response.contains("getRemoteUser(): reza")); + assertTrue( + response.contains("The user principal is: reza"), "Expected the protected resource to identify the caller as reza.\n" + response); + assertTrue( + response.contains("getRemoteUser(): reza"), "Expected getRemoteUser() to return reza.\n" + response); assertTrue(response.contains("isUserInRole(\"foo\"): !true!")); assertTrue(response.contains("isUserInRole(\"bar\"): !true!")); assertTrue(response.contains("isUserInRole(\"kaz\"): !false!")); // Re-access the protected resource — the FORM session keeps the caller authenticated. String reaccess = readFromServer("/servlet"); - assertTrue("Expected to remain authenticated as reza on subsequent request.\n" + reaccess, - reaccess.contains("The user principal is: reza")); + assertTrue( + reaccess.contains("The user principal is: reza"), "Expected to remain authenticated as reza on subsequent request.\n" + reaccess); } /** @@ -78,11 +78,11 @@ public void testCustomFormHAMValidateRequest() throws IOException { public void testLoginToContinueUseRedirectToLogin() { HtmlPage loginPage = pageFromServer("/servlet"); - assertTrue("Expected the URL to be redirected to /login.jsf.\n" - + loginPage.getUrl().toString(), - loginPage.getUrl().toString().contains("/login.jsf")); - assertTrue("Expected the login page content.\n" + loginPage.getWebResponse().getContentAsString(), - loginPage.getWebResponse().getContentAsString().contains("Login")); + assertTrue( + loginPage.getUrl().toString().contains("/login.jsf"), "Expected the URL to be redirected to /login.jsf.\n" + + loginPage.getUrl().toString()); + assertTrue( + loginPage.getWebResponse().getContentAsString().contains("Login"), "Expected the login page content.\n" + loginPage.getWebResponse().getContentAsString()); } /** @@ -99,10 +99,10 @@ public void testCustomFormLoginToContinueErrorPage() throws IOException { HtmlPage page = form.getInputByValue("Login").click(); String response = page.getWebResponse().getContentAsString(); - assertTrue("Expected an unauthenticated error page (caller principal null).\n" + response, - response.contains("The user principal is: null")); - assertTrue("Expected to land on /login-error-servlet.\n" + page.getUrl().toString(), - page.getUrl().toString().contains("/login-error-servlet")); + assertTrue( + response.contains("The user principal is: null"), "Expected an unauthenticated error page (caller principal null).\n" + response); + assertTrue( + page.getUrl().toString().contains("/login-error-servlet"), "Expected to land on /login-error-servlet.\n" + page.getUrl().toString()); } /** @@ -119,10 +119,10 @@ public void testCustomFormHAMHasCorrectQualifier() throws IOException { HtmlPage page = form.getInputByValue("Login").click(); String response = page.getWebResponse().getContentAsString(); - assertTrue("Expected the Custom-FORM HAM bean to carry @CustomFormAuthenticationMechanism.\n" + response, - response.contains("Have qualifier @CustomFormAuthenticationMechanism: true")); - assertTrue("Expected the Custom-FORM HAM bean to be @ApplicationScoped.\n" + response, - response.contains("Have scope @ApplicationScoped: true")); + assertTrue( + response.contains("Have qualifier @CustomFormAuthenticationMechanism: true"), "Expected the Custom-FORM HAM bean to carry @CustomFormAuthenticationMechanism.\n" + response); + assertTrue( + response.contains("Have scope @ApplicationScoped: true"), "Expected the Custom-FORM HAM bean to be @ApplicationScoped.\n" + response); } } diff --git a/tck/app-ham-customform-expression/src/test/java/ee/jakarta/tck/security/test/AppHamCustomFormExpressionIT.java b/tck/app-ham-customform-expression/src/test/java/ee/jakarta/tck/security/test/AppHamCustomFormExpressionIT.java index 80daf54f..3d81e683 100644 --- a/tck/app-ham-customform-expression/src/test/java/ee/jakarta/tck/security/test/AppHamCustomFormExpressionIT.java +++ b/tck/app-ham-customform-expression/src/test/java/ee/jakarta/tck/security/test/AppHamCustomFormExpressionIT.java @@ -18,16 +18,16 @@ package ee.jakarta.tck.security.test; import static ee.jakarta.tck.security.test.ShrinkWrap.mavenWar; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import org.htmlunit.html.HtmlPage; import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.shrinkwrap.api.Archive; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; -@RunWith(Arquillian.class) +@ExtendWith(ArquillianExtension.class) public class AppHamCustomFormExpressionIT extends ArquillianBase { @Deployment(testable = false) @@ -47,12 +47,12 @@ public static Archive createDeployment() { public void testLoginToContinueUseForwardToLoginExpression() { HtmlPage loginPage = pageFromServer("/servlet"); - assertTrue("Expected the login page content.\n" + loginPage.getWebResponse().getContentAsString(), - loginPage.getWebResponse().getContentAsString().contains("Login")); + assertTrue( + loginPage.getWebResponse().getContentAsString().contains("Login"), "Expected the login page content.\n" + loginPage.getWebResponse().getContentAsString()); - assertTrue("Expected the URL to reflect a redirect to /login.jsf (EL expression must override the static useForwardToLogin = true).\n" - + loginPage.getUrl().toString(), - loginPage.getUrl().toString().contains("/login.jsf")); + assertTrue( + loginPage.getUrl().toString().contains("/login.jsf"), "Expected the URL to reflect a redirect to /login.jsf (EL expression must override the static useForwardToLogin = true).\n" + + loginPage.getUrl().toString()); } } diff --git a/tck/app-ham-form/src/test/java/ee/jakarta/tck/security/test/AppHamFormIT.java b/tck/app-ham-form/src/test/java/ee/jakarta/tck/security/test/AppHamFormIT.java index c277f57d..c4d57050 100644 --- a/tck/app-ham-form/src/test/java/ee/jakarta/tck/security/test/AppHamFormIT.java +++ b/tck/app-ham-form/src/test/java/ee/jakarta/tck/security/test/AppHamFormIT.java @@ -18,19 +18,19 @@ package ee.jakarta.tck.security.test; import static ee.jakarta.tck.security.test.ShrinkWrap.mavenWar; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.IOException; import org.htmlunit.html.HtmlForm; import org.htmlunit.html.HtmlPage; import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.shrinkwrap.api.Archive; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; -@RunWith(Arquillian.class) +@ExtendWith(ArquillianExtension.class) public class AppHamFormIT extends ArquillianBase { @Deployment(testable = false) @@ -52,18 +52,18 @@ public void testFormHAMValidateRequest() throws IOException { HtmlPage page = form.getInputByValue("Submit").click(); String response = page.getWebResponse().getContentAsString(); - assertTrue("Expected user principal to be reza.\n" + response, - response.contains("The user principal is: reza")); - assertTrue("Expected getRemoteUser() to return reza.\n" + response, - response.contains("getRemoteUser(): reza")); + assertTrue( + response.contains("The user principal is: reza"), "Expected user principal to be reza.\n" + response); + assertTrue( + response.contains("getRemoteUser(): reza"), "Expected getRemoteUser() to return reza.\n" + response); assertTrue(response.contains("isUserInRole(\"foo\"): !true!")); assertTrue(response.contains("isUserInRole(\"bar\"): !true!")); assertTrue(response.contains("isUserInRole(\"kaz\"): !false!")); // Re-access the protected resource — the FORM session remembers the caller. String reaccess = readFromServer("/servlet"); - assertTrue("Expected to remain authenticated as reza on subsequent request.\n" + reaccess, - reaccess.contains("The user principal is: reza")); + assertTrue( + reaccess.contains("The user principal is: reza"), "Expected to remain authenticated as reza on subsequent request.\n" + reaccess); } /** @@ -75,9 +75,9 @@ public void testLoginToContinueLoginPage() { String fromProtected = readFromServer("/servlet"); String fromLogin = readFromServer("/form-login-servlet"); - assertTrue("Login page rendered on protected access should match the login page rendered directly.\n" - + "from /servlet:\n" + fromProtected + "\n\nfrom /form-login-servlet:\n" + fromLogin, - fromProtected.equals(fromLogin)); + assertTrue( + fromProtected.equals(fromLogin), "Login page rendered on protected access should match the login page rendered directly.\n" + + "from /servlet:\n" + fromProtected + "\n\nfrom /form-login-servlet:\n" + fromLogin); } /** @@ -96,8 +96,8 @@ public void testLoginToContinueErrorPage() throws IOException { HtmlPage page = form.getInputByValue("Submit").click(); String response = page.getWebResponse().getContentAsString(); - assertTrue("Expected the user principal to be null on the error page.\n" + response, - response.contains("The user principal is: null")); + assertTrue( + response.contains("The user principal is: null"), "Expected the user principal to be null on the error page.\n" + response); } /** @@ -117,10 +117,10 @@ public void testFormHAMHasCorrectQualifier() throws IOException { HtmlPage page = form.getInputByValue("Submit").click(); String response = page.getWebResponse().getContentAsString(); - assertTrue("Expected the FORM HAM bean to carry @FormAuthenticationMechanism.\n" + response, - response.contains("Have qualifier @FormAuthenticationMechanism: true")); - assertTrue("Expected the FORM HAM bean to be @ApplicationScoped.\n" + response, - response.contains("Have scope @ApplicationScoped: true")); + assertTrue( + response.contains("Have qualifier @FormAuthenticationMechanism: true"), "Expected the FORM HAM bean to carry @FormAuthenticationMechanism.\n" + response); + assertTrue( + response.contains("Have scope @ApplicationScoped: true"), "Expected the FORM HAM bean to be @ApplicationScoped.\n" + response); } } diff --git a/tck/app-ham-rememberme-test1/src/test/java/ee/jakarta/tck/security/test/AppHamRememberMeTest1IT.java b/tck/app-ham-rememberme-test1/src/test/java/ee/jakarta/tck/security/test/AppHamRememberMeTest1IT.java index cdb2a76d..74dcb2dc 100644 --- a/tck/app-ham-rememberme-test1/src/test/java/ee/jakarta/tck/security/test/AppHamRememberMeTest1IT.java +++ b/tck/app-ham-rememberme-test1/src/test/java/ee/jakarta/tck/security/test/AppHamRememberMeTest1IT.java @@ -18,19 +18,19 @@ package ee.jakarta.tck.security.test; import static ee.jakarta.tck.security.test.ShrinkWrap.mavenWar; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; import org.htmlunit.WebResponse; import org.htmlunit.util.NameValuePair; import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.shrinkwrap.api.Archive; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; -@RunWith(Arquillian.class) +@ExtendWith(ArquillianExtension.class) public class AppHamRememberMeTest1IT extends ArquillianBase { @Deployment(testable = false) @@ -53,8 +53,8 @@ public void testRememberMeCookieNameandisRememberMeExpression() { // 2. Authenticate without rememberme -> HAM is invoked String authedNoRemember = readFromServer("/servlet?name=reza&password=secret1"); assertExpectedAuthenticatedContent(authedNoRemember); - assertTrue("Expected HAM to have been invoked.\n" + authedNoRemember, - authedNoRemember.contains("HAM authentication mechanism called: true")); + assertTrue( + authedNoRemember.contains("HAM authentication mechanism called: true"), "Expected HAM to have been invoked.\n" + authedNoRemember); // 3. Without remember-me cookie, anonymous request -> 401 assertEquals(401, responseFromServer("/servlet").getStatusCode()); @@ -64,14 +64,14 @@ public void testRememberMeCookieNameandisRememberMeExpression() { String rememberContent = rememberResponse.getContentAsString(); assertExpectedAuthenticatedContent(rememberContent); assertCookieIsSetWithName(rememberResponse, "JSR375COOKIENAME"); - assertTrue("Expected HAM to have been invoked on the rememberme login.\n" + rememberContent, - rememberContent.contains("HAM authentication mechanism called: true")); + assertTrue( + rememberContent.contains("HAM authentication mechanism called: true"), "Expected HAM to have been invoked on the rememberme login.\n" + rememberContent); // 5. Subsequent request with no credentials -> served by RememberMe, HAM not invoked String reaccess = readFromServer("/servlet"); assertExpectedAuthenticatedContent(reaccess); - assertTrue("Expected HAM to NOT have been invoked when remember-me cookie is honoured.\n" + reaccess, - reaccess.contains("HAM authentication mechanism called: false")); + assertTrue( + reaccess.contains("HAM authentication mechanism called: false"), "Expected HAM to NOT have been invoked when remember-me cookie is honoured.\n" + reaccess); // 6. Logout readFromServer("/servlet?logout=true"); @@ -120,8 +120,8 @@ public void testRememberMecookieHttpOnly() { } private void assertExpectedAuthenticatedContent(String response) { - assertTrue("Expected user principal to be reza.\n" + response, - response.contains("The user principal is: reza")); + assertTrue( + response.contains("The user principal is: reza"), "Expected user principal to be reza.\n" + response); assertTrue(response.contains("isUserInRole(\"foo\"): !true!")); assertTrue(response.contains("isUserInRole(\"bar\"): !true!")); assertTrue(response.contains("isUserInRole(\"kaz\"): !false!")); @@ -136,7 +136,7 @@ private static void assertCookieIsSetWithName(WebResponse response, String cooki break; } } - assertTrue("Expected Set-Cookie header for " + cookieName, found); + assertTrue(found, "Expected Set-Cookie header for " + cookieName); } private static void assertCookieHasAttribute(WebResponse response, String cookieName, String attribute, boolean expectPresent) { @@ -150,9 +150,9 @@ private static void assertCookieHasAttribute(WebResponse response, String cookie } } if (expectPresent) { - assertTrue("Expected " + cookieName + " cookie to carry " + attribute + " attribute.", found); + assertTrue(found, "Expected " + cookieName + " cookie to carry " + attribute + " attribute."); } else { - assertFalse("Did not expect " + cookieName + " cookie to carry " + attribute + " attribute.", found); + assertFalse(found, "Did not expect " + cookieName + " cookie to carry " + attribute + " attribute."); } } diff --git a/tck/app-ham-rememberme-test2/src/test/java/ee/jakarta/tck/security/test/AppHamRememberMeTest2IT.java b/tck/app-ham-rememberme-test2/src/test/java/ee/jakarta/tck/security/test/AppHamRememberMeTest2IT.java index d85713c3..31836e6f 100644 --- a/tck/app-ham-rememberme-test2/src/test/java/ee/jakarta/tck/security/test/AppHamRememberMeTest2IT.java +++ b/tck/app-ham-rememberme-test2/src/test/java/ee/jakarta/tck/security/test/AppHamRememberMeTest2IT.java @@ -18,18 +18,18 @@ package ee.jakarta.tck.security.test; import static ee.jakarta.tck.security.test.ShrinkWrap.mavenWar; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; import org.htmlunit.WebResponse; import org.htmlunit.util.NameValuePair; import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.shrinkwrap.api.Archive; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; -@RunWith(Arquillian.class) +@ExtendWith(ArquillianExtension.class) public class AppHamRememberMeTest2IT extends ArquillianBase { @Deployment(testable = false) @@ -60,8 +60,8 @@ public void testRememberMecookieSecureOnly() { } private void assertExpectedAuthenticatedContent(String response) { - assertTrue("Expected user principal to be reza.\n" + response, - response.contains("The user principal is: reza")); + assertTrue( + response.contains("The user principal is: reza"), "Expected user principal to be reza.\n" + response); assertTrue(response.contains("isUserInRole(\"foo\"): !true!")); assertTrue(response.contains("isUserInRole(\"bar\"): !true!")); assertTrue(response.contains("isUserInRole(\"kaz\"): !false!")); @@ -78,9 +78,9 @@ private static void assertCookieHasAttribute(WebResponse response, String cookie } } if (expectPresent) { - assertTrue("Expected " + cookieName + " cookie to carry " + attribute + " attribute.", found); + assertTrue(found, "Expected " + cookieName + " cookie to carry " + attribute + " attribute."); } else { - assertFalse("Did not expect " + cookieName + " cookie to carry " + attribute + " attribute.", found); + assertFalse(found, "Did not expect " + cookieName + " cookie to carry " + attribute + " attribute."); } } diff --git a/tck/app-ham-rememberme-test3/src/test/java/ee/jakarta/tck/security/test/AppHamRememberMeTest3IT.java b/tck/app-ham-rememberme-test3/src/test/java/ee/jakarta/tck/security/test/AppHamRememberMeTest3IT.java index 7b14828b..54ff199b 100644 --- a/tck/app-ham-rememberme-test3/src/test/java/ee/jakarta/tck/security/test/AppHamRememberMeTest3IT.java +++ b/tck/app-ham-rememberme-test3/src/test/java/ee/jakarta/tck/security/test/AppHamRememberMeTest3IT.java @@ -18,19 +18,19 @@ package ee.jakarta.tck.security.test; import static ee.jakarta.tck.security.test.ShrinkWrap.mavenWar; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; import org.htmlunit.WebResponse; import org.htmlunit.util.NameValuePair; import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.shrinkwrap.api.Archive; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; -@RunWith(Arquillian.class) +@ExtendWith(ArquillianExtension.class) public class AppHamRememberMeTest3IT extends ArquillianBase { @Deployment(testable = false) @@ -103,8 +103,8 @@ public void testRememberMecookieSecureOnlyExpression() { } private void assertExpectedAuthenticatedContent(String response) { - assertTrue("Expected user principal to be reza.\n" + response, - response.contains("The user principal is: reza")); + assertTrue( + response.contains("The user principal is: reza"), "Expected user principal to be reza.\n" + response); assertTrue(response.contains("isUserInRole(\"foo\"): !true!")); assertTrue(response.contains("isUserInRole(\"bar\"): !true!")); assertTrue(response.contains("isUserInRole(\"kaz\"): !false!")); @@ -121,9 +121,9 @@ private static void assertCookieHasAttribute(WebResponse response, String cookie } } if (expectPresent) { - assertTrue("Expected " + cookieName + " cookie to carry " + attribute + " attribute.", found); + assertTrue(found, "Expected " + cookieName + " cookie to carry " + attribute + " attribute."); } else { - assertFalse("Did not expect " + cookieName + " cookie to carry " + attribute + " attribute.", found); + assertFalse(found, "Did not expect " + cookieName + " cookie to carry " + attribute + " attribute."); } } diff --git a/tck/app-ham-sam-delegation/src/test/java/ee/jakarta/tck/security/test/AppHamSamDelegationIT.java b/tck/app-ham-sam-delegation/src/test/java/ee/jakarta/tck/security/test/AppHamSamDelegationIT.java index 4b8f2042..6457041d 100644 --- a/tck/app-ham-sam-delegation/src/test/java/ee/jakarta/tck/security/test/AppHamSamDelegationIT.java +++ b/tck/app-ham-sam-delegation/src/test/java/ee/jakarta/tck/security/test/AppHamSamDelegationIT.java @@ -18,15 +18,15 @@ package ee.jakarta.tck.security.test; import static ee.jakarta.tck.security.test.ShrinkWrap.mavenWar; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.shrinkwrap.api.Archive; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; -@RunWith(Arquillian.class) +@ExtendWith(ArquillianExtension.class) public class AppHamSamDelegationIT extends ArquillianBase { @Deployment(testable = false) @@ -45,8 +45,8 @@ public static Archive createDeployment() { public void testSAMDelegatesHAM() { String response = readFromServer("/Servlet?name=reza&password=secret1"); - assertTrue("Expected the HAM call stack to contain a ServerAuthModule bridge.\n" + response, - response.contains("The caller class has ServerAuthModule interface")); + assertTrue( + response.contains("The caller class has ServerAuthModule interface"), "Expected the HAM call stack to contain a ServerAuthModule bridge.\n" + response); } } diff --git a/tck/app-ham-sam-obtainbean/src/test/java/ee/jakarta/tck/security/test/AppHamSamObtainBeanIT.java b/tck/app-ham-sam-obtainbean/src/test/java/ee/jakarta/tck/security/test/AppHamSamObtainBeanIT.java index 25047cb4..3ecadd43 100644 --- a/tck/app-ham-sam-obtainbean/src/test/java/ee/jakarta/tck/security/test/AppHamSamObtainBeanIT.java +++ b/tck/app-ham-sam-obtainbean/src/test/java/ee/jakarta/tck/security/test/AppHamSamObtainBeanIT.java @@ -18,15 +18,15 @@ package ee.jakarta.tck.security.test; import static ee.jakarta.tck.security.test.ShrinkWrap.mavenWar; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.shrinkwrap.api.Archive; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; -@RunWith(Arquillian.class) +@ExtendWith(ArquillianExtension.class) public class AppHamSamObtainBeanIT extends ArquillianBase { @Deployment(testable = false) @@ -46,8 +46,8 @@ public static Archive createDeployment() { public void testSAMObtainBean() { String response = readFromServer("/servlet"); - assertTrue("Expected the SAM to retrieve the HAM bean via CDI.\n" + response, - response.contains("The CDI services is fully available, ServerAuthModule method can obtain bean through CDI")); + assertTrue( + response.contains("The CDI services is fully available, ServerAuthModule method can obtain bean through CDI"), "Expected the SAM to retrieve the HAM bean via CDI.\n" + response); } } diff --git a/tck/app-ham-workflow-cleansubject/src/test/java/ee/jakarta/tck/security/test/AppHamWorkflowCleanSubjectIT.java b/tck/app-ham-workflow-cleansubject/src/test/java/ee/jakarta/tck/security/test/AppHamWorkflowCleanSubjectIT.java index 185caa8b..45f46c22 100644 --- a/tck/app-ham-workflow-cleansubject/src/test/java/ee/jakarta/tck/security/test/AppHamWorkflowCleanSubjectIT.java +++ b/tck/app-ham-workflow-cleansubject/src/test/java/ee/jakarta/tck/security/test/AppHamWorkflowCleanSubjectIT.java @@ -18,15 +18,15 @@ package ee.jakarta.tck.security.test; import static ee.jakarta.tck.security.test.ShrinkWrap.mavenWar; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.shrinkwrap.api.Archive; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; -@RunWith(Arquillian.class) +@ExtendWith(ArquillianExtension.class) public class AppHamWorkflowCleanSubjectIT extends ArquillianBase { @Deployment(testable = false) @@ -44,12 +44,12 @@ public static Archive createDeployment() { public void testHAMCleanSubject() { String response = readFromServer("/servlet?name=reza&password=secret1"); - assertTrue("Expected attribute to be present before logout.\n" + response, - response.contains("The attribute FlagforCleanSubject exist before logout : true")); - assertTrue("Expected HAM.cleanSubject() to have fired.\n" + response, - response.contains("This is in HAM cleanSubject mthod.")); - assertTrue("Expected attribute to be cleared after logout.\n" + response, - response.contains("The attribute FlagforCleanSubject exist after logout : false")); + assertTrue( + response.contains("The attribute FlagforCleanSubject exist before logout : true"), "Expected attribute to be present before logout.\n" + response); + assertTrue( + response.contains("This is in HAM cleanSubject mthod."), "Expected HAM.cleanSubject() to have fired.\n" + response); + assertTrue( + response.contains("The attribute FlagforCleanSubject exist after logout : false"), "Expected attribute to be cleared after logout.\n" + response); } } diff --git a/tck/app-ham-workflow-secureresponse/src/test/java/ee/jakarta/tck/security/test/AppHamWorkflowSecureResponseIT.java b/tck/app-ham-workflow-secureresponse/src/test/java/ee/jakarta/tck/security/test/AppHamWorkflowSecureResponseIT.java index a2f6fe29..9c5b873d 100644 --- a/tck/app-ham-workflow-secureresponse/src/test/java/ee/jakarta/tck/security/test/AppHamWorkflowSecureResponseIT.java +++ b/tck/app-ham-workflow-secureresponse/src/test/java/ee/jakarta/tck/security/test/AppHamWorkflowSecureResponseIT.java @@ -18,15 +18,15 @@ package ee.jakarta.tck.security.test; import static ee.jakarta.tck.security.test.ShrinkWrap.mavenWar; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.shrinkwrap.api.Archive; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; -@RunWith(Arquillian.class) +@ExtendWith(ArquillianExtension.class) public class AppHamWorkflowSecureResponseIT extends ArquillianBase { @Deployment(testable = false) @@ -43,13 +43,13 @@ public static Archive createDeployment() { public void testHAMSecureResponse() { String response = readFromServer("/servlet?name=reza&password=secret1"); - assertTrue("Expected the call sequence Filter.doFilter -> Servlet.doGet -> HAM.secureResponse.\n" - + response, + assertTrue( response.contains("Inside Filter doFilter.") && response.contains("Inside Servlet doGet.") && response.contains("This is in HAM secureResponse mthod.") && response.indexOf("Inside Filter doFilter.") < response.indexOf("Inside Servlet doGet.") - && response.indexOf("Inside Servlet doGet.") < response.indexOf("This is in HAM secureResponse mthod.")); + && response.indexOf("Inside Servlet doGet.") < response.indexOf("This is in HAM secureResponse mthod."), "Expected the call sequence Filter.doFilter -> Servlet.doGet -> HAM.secureResponse.\n" + + response); } } diff --git a/tck/app-ham-workflow-validaterequest/src/test/java/ee/jakarta/tck/security/test/AppHamWorkflowValidateRequestIT.java b/tck/app-ham-workflow-validaterequest/src/test/java/ee/jakarta/tck/security/test/AppHamWorkflowValidateRequestIT.java index e1bf2d76..0866cef3 100644 --- a/tck/app-ham-workflow-validaterequest/src/test/java/ee/jakarta/tck/security/test/AppHamWorkflowValidateRequestIT.java +++ b/tck/app-ham-workflow-validaterequest/src/test/java/ee/jakarta/tck/security/test/AppHamWorkflowValidateRequestIT.java @@ -18,15 +18,15 @@ package ee.jakarta.tck.security.test; import static ee.jakarta.tck.security.test.ShrinkWrap.mavenWar; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.shrinkwrap.api.Archive; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; -@RunWith(Arquillian.class) +@ExtendWith(ArquillianExtension.class) public class AppHamWorkflowValidateRequestIT extends ArquillianBase { @Deployment(testable = false) @@ -44,8 +44,8 @@ public void testCallValidateRequestBeforeService() { String response = readFromServer("/ServletForValidateRequest?name=reza&password=secret1"); String expected = "This is in HAM validateRequest method.Inside Servlet doGet.principal name=reza"; - assertTrue("Expected the call sequence HAM.validateRequest -> Servlet.doGet -> principal-name.\n" + response, - response.contains(expected)); + assertTrue( + response.contains(expected), "Expected the call sequence HAM.validateRequest -> Servlet.doGet -> principal-name.\n" + response); } } diff --git a/tck/app-ham-workflow-validaterequestduringauthen/src/test/java/ee/jakarta/tck/security/test/AppHamWorkflowValidateRequestDuringAuthenIT.java b/tck/app-ham-workflow-validaterequestduringauthen/src/test/java/ee/jakarta/tck/security/test/AppHamWorkflowValidateRequestDuringAuthenIT.java index bcd54e92..43dd089e 100644 --- a/tck/app-ham-workflow-validaterequestduringauthen/src/test/java/ee/jakarta/tck/security/test/AppHamWorkflowValidateRequestDuringAuthenIT.java +++ b/tck/app-ham-workflow-validaterequestduringauthen/src/test/java/ee/jakarta/tck/security/test/AppHamWorkflowValidateRequestDuringAuthenIT.java @@ -18,15 +18,15 @@ package ee.jakarta.tck.security.test; import static ee.jakarta.tck.security.test.ShrinkWrap.mavenWar; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.shrinkwrap.api.Archive; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; -@RunWith(Arquillian.class) +@ExtendWith(ArquillianExtension.class) public class AppHamWorkflowValidateRequestDuringAuthenIT extends ArquillianBase { @Deployment(testable = false) @@ -45,11 +45,11 @@ public void testCallValidateRequestDuringAuthenticate() { String response = readFromServer("/servlet?name=reza&password=secret1"); String expected = "In doGet method.In HttpAuthenticationMechanism validateRequest method.Authenticate Successful"; - assertTrue("Expected the call sequence: doGet -> HAM.validateRequest -> Authenticate Successful.\n" + response, - response.contains(expected)); + assertTrue( + response.contains(expected), "Expected the call sequence: doGet -> HAM.validateRequest -> Authenticate Successful.\n" + response); - assertTrue("Expected user principal to be reza.\n" + response, - response.contains("The user principal is: reza")); + assertTrue( + response.contains("The user principal is: reza"), "Expected user principal to be reza.\n" + response); assertTrue(response.contains("isUserInRole(\"foo\"): !true!")); assertTrue(response.contains("isUserInRole(\"bar\"): !true!")); assertTrue(response.contains("isUserInRole(\"kaz\"): !false!")); diff --git a/tck/app-ham-workflow-validaterequestwithfilter/src/test/java/ee/jakarta/tck/security/test/AppHamWorkflowValidateRequestWithFilterIT.java b/tck/app-ham-workflow-validaterequestwithfilter/src/test/java/ee/jakarta/tck/security/test/AppHamWorkflowValidateRequestWithFilterIT.java index 9b31d658..25039803 100644 --- a/tck/app-ham-workflow-validaterequestwithfilter/src/test/java/ee/jakarta/tck/security/test/AppHamWorkflowValidateRequestWithFilterIT.java +++ b/tck/app-ham-workflow-validaterequestwithfilter/src/test/java/ee/jakarta/tck/security/test/AppHamWorkflowValidateRequestWithFilterIT.java @@ -18,15 +18,15 @@ package ee.jakarta.tck.security.test; import static ee.jakarta.tck.security.test.ShrinkWrap.mavenWar; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.shrinkwrap.api.Archive; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; -@RunWith(Arquillian.class) +@ExtendWith(ArquillianExtension.class) public class AppHamWorkflowValidateRequestWithFilterIT extends ArquillianBase { @Deployment(testable = false) @@ -47,8 +47,8 @@ public void testCallValidateRequestBeforeFilter() { String expected = "This is in HAM validateRequest method.Filter: In doFilter()." + "In servletForValidateRequestWithFilter:doGet().principal name=reza"; - assertTrue("Expected the call sequence HAM.validateRequest -> Filter.doFilter -> Servlet.doGet -> principal-name.\n" + response, - response.contains(expected)); + assertTrue( + response.contains(expected), "Expected the call sequence HAM.validateRequest -> Filter.doFilter -> Servlet.doGet -> principal-name.\n" + response); } } diff --git a/tck/app-idstore-basic/src/test/java/ee/jakarta/tck/security/test/AppIdStoreBasicIT.java b/tck/app-idstore-basic/src/test/java/ee/jakarta/tck/security/test/AppIdStoreBasicIT.java index 5f744070..2611bbff 100644 --- a/tck/app-idstore-basic/src/test/java/ee/jakarta/tck/security/test/AppIdStoreBasicIT.java +++ b/tck/app-idstore-basic/src/test/java/ee/jakarta/tck/security/test/AppIdStoreBasicIT.java @@ -18,16 +18,16 @@ package ee.jakarta.tck.security.test; import static ee.jakarta.tck.security.test.ShrinkWrap.mavenWar; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.shrinkwrap.api.Archive; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; -@RunWith(Arquillian.class) +@ExtendWith(ArquillianExtension.class) public class AppIdStoreBasicIT extends ArquillianBase { @Deployment(testable = false) @@ -46,16 +46,16 @@ public static Archive createDeployment() { public void testIdentityStoreInstall() { String response = readFromServer("/ServletForIDStoreBasic?user=reza&pwd=secret1"); - assertTrue("Expected ValidateResultStatus=VALID.\n" + response, - response.contains("ValidateResultStatus=VALID")); - assertTrue("Expected ValidateCallerDN=null (no DN for username/password store).\n" + response, - response.contains("ValidateCallerDN=null")); - assertTrue("Expected the validated groups to contain foo and bar.\n" + response, - response.contains("foo") && response.contains("bar")); - assertFalse("Expected getCallerGroups() NOT to have been invoked (single-store install).\n" + response, - response.contains("getCallerGroups")); - assertTrue("Expected web username reza on the protected resource.\n" + response, - response.contains("web username: reza")); + assertTrue( + response.contains("ValidateResultStatus=VALID"), "Expected ValidateResultStatus=VALID.\n" + response); + assertTrue( + response.contains("ValidateCallerDN=null"), "Expected ValidateCallerDN=null (no DN for username/password store).\n" + response); + assertTrue( + response.contains("foo") && response.contains("bar"), "Expected the validated groups to contain foo and bar.\n" + response); + assertFalse( + response.contains("getCallerGroups"), "Expected getCallerGroups() NOT to have been invoked (single-store install).\n" + response); + assertTrue( + response.contains("web username: reza"), "Expected web username reza on the protected resource.\n" + response); } } diff --git a/tck/app-idstore-customhandler/src/test/java/ee/jakarta/tck/security/test/AppIdStoreCustomHandlerIT.java b/tck/app-idstore-customhandler/src/test/java/ee/jakarta/tck/security/test/AppIdStoreCustomHandlerIT.java index 3415c7dc..88068030 100644 --- a/tck/app-idstore-customhandler/src/test/java/ee/jakarta/tck/security/test/AppIdStoreCustomHandlerIT.java +++ b/tck/app-idstore-customhandler/src/test/java/ee/jakarta/tck/security/test/AppIdStoreCustomHandlerIT.java @@ -18,15 +18,15 @@ package ee.jakarta.tck.security.test; import static ee.jakarta.tck.security.test.ShrinkWrap.mavenWar; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.shrinkwrap.api.Archive; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; -@RunWith(Arquillian.class) +@ExtendWith(ArquillianExtension.class) public class AppIdStoreCustomHandlerIT extends ArquillianBase { @Deployment(testable = false) @@ -54,18 +54,18 @@ public static Archive createDeployment() { public void testIdentityStore_customHandler_validCaller() { String response = readFromServer("/ServletForIDStoreCustomhandler?user=tom&pwd=secret1"); - assertTrue("Expected VALID status.\n" + response, - response.contains("ValidateResultStatus=VALID")); - assertTrue("Expected the custom handler's sentinel marker.\n" + response, - response.contains("customIdentiyStoreHandler")); - assertTrue("Expected the in-mem store's getCallerGroups sentinel.\n" + response, - response.contains("getCallerGroups")); - assertTrue("Expected validated groups to contain Administrator1.\n" + response, - response.contains("Administrator1")); - assertTrue("Expected validated groups to contain Manager1.\n" + response, - response.contains("Manager1")); - assertTrue("Expected web username tom.\n" + response, - response.contains("web username: tom")); + assertTrue( + response.contains("ValidateResultStatus=VALID"), "Expected VALID status.\n" + response); + assertTrue( + response.contains("customIdentiyStoreHandler"), "Expected the custom handler's sentinel marker.\n" + response); + assertTrue( + response.contains("getCallerGroups"), "Expected the in-mem store's getCallerGroups sentinel.\n" + response); + assertTrue( + response.contains("Administrator1"), "Expected validated groups to contain Administrator1.\n" + response); + assertTrue( + response.contains("Manager1"), "Expected validated groups to contain Manager1.\n" + response); + assertTrue( + response.contains("web username: tom"), "Expected web username tom.\n" + response); } /** @@ -77,10 +77,10 @@ public void testIdentityStore_customHandler_validCaller() { public void testIdentityStore_customHandler_invalidCaller() { String response = readFromServer("/ServletForIDStoreCustomhandler?user=emma&pwd=secret2"); - assertTrue("Expected INVALID status when validation fails.\n" + response, - response.contains("ValidateResultStatus=INVALID")); - assertTrue("Expected no groups in the INVALID result.\n" + response, - response.contains("ValidateResultGroups=[]")); + assertTrue( + response.contains("ValidateResultStatus=INVALID"), "Expected INVALID status when validation fails.\n" + response); + assertTrue( + response.contains("ValidateResultGroups=[]"), "Expected no groups in the INVALID result.\n" + response); } } diff --git a/tck/app-idstore-multi/src/test/java/ee/jakarta/tck/security/test/AppIdStoreMultiIT.java b/tck/app-idstore-multi/src/test/java/ee/jakarta/tck/security/test/AppIdStoreMultiIT.java index adda9db0..d412cc8e 100644 --- a/tck/app-idstore-multi/src/test/java/ee/jakarta/tck/security/test/AppIdStoreMultiIT.java +++ b/tck/app-idstore-multi/src/test/java/ee/jakarta/tck/security/test/AppIdStoreMultiIT.java @@ -18,15 +18,15 @@ package ee.jakarta.tck.security.test; import static ee.jakarta.tck.security.test.ShrinkWrap.mavenWar; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.shrinkwrap.api.Archive; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; -@RunWith(Arquillian.class) +@ExtendWith(ArquillianExtension.class) public class AppIdStoreMultiIT extends ArquillianBase { @Deployment(testable = false) @@ -47,19 +47,19 @@ public static Archive createDeployment() { public void testIdentityStoreValidate_multiIDStore() { // tom/secret2 -> IDStore2 validates first VALID match String r1 = readFromServer("/ServletForMultiIDStore?user=tom&pwd=secret2"); - assertTrue("tom/secret2 should result in VALID.\n" + r1, r1.contains("ValidateResultStatus=VALID")); - assertTrue("Expected web username tom.\n" + r1, r1.contains("web username: tom")); + assertTrue(r1.contains("ValidateResultStatus=VALID"), "tom/secret2 should result in VALID.\n" + r1); + assertTrue(r1.contains("web username: tom"), "Expected web username tom.\n" + r1); // tom/secret1 -> IDStore1 validates first String r2 = readFromServer("/ServletForMultiIDStore?user=tom&pwd=secret1"); - assertTrue("tom/secret1 should result in VALID.\n" + r2, r2.contains("ValidateResultStatus=VALID")); - assertTrue("Expected the IDStore1 sentinel group.\n" + r2, r2.contains("IDStore1:validate")); + assertTrue(r2.contains("ValidateResultStatus=VALID"), "tom/secret1 should result in VALID.\n" + r2); + assertTrue(r2.contains("IDStore1:validate"), "Expected the IDStore1 sentinel group.\n" + r2); assertTrue(r2.contains("web username: tom")); // emma/secret2 -> IDStore1 validates first String r3 = readFromServer("/ServletForMultiIDStore?user=emma&pwd=secret2"); - assertTrue("emma/secret2 should result in VALID.\n" + r3, r3.contains("ValidateResultStatus=VALID")); - assertTrue("Expected the IDStore1 sentinel group.\n" + r3, r3.contains("IDStore1:validate")); + assertTrue(r3.contains("ValidateResultStatus=VALID"), "emma/secret2 should result in VALID.\n" + r3); + assertTrue(r3.contains("IDStore1:validate"), "Expected the IDStore1 sentinel group.\n" + r3); assertTrue(r3.contains("web username: emma")); } @@ -70,9 +70,9 @@ public void testIdentityStoreValidate_multiIDStore() { @Test public void testIdentityStoreValidate_multiIDStore_INVALID() { String response = readFromServer("/ServletForMultiIDStore?user=tom&pwd=secret_invalid"); - assertTrue("Expected INVALID with no groups.\n" + response, + assertTrue( response.contains("ValidateResultStatus=INVALID") - && response.contains("ValidateResultGroups=[]")); + && response.contains("ValidateResultGroups=[]"), "Expected INVALID with no groups.\n" + response); } /** @@ -84,8 +84,8 @@ public void testIdentityStoreValidate_multiIDStore_INVALID() { public void testIdentityStoreValidate_multiIDStore_INVALIDWithNOTVALIDATED() { for (String caller : new String[] { "notValidated_invalid1", "notValidated_invalid2", "notValidated_invalid3" }) { String response = readFromServer("/ServletForMultiIDStore?user=" + caller + "&pwd=secret11"); - assertTrue("Expected INVALID for " + caller + ".\n" + response, - response.contains("ValidateResultStatus=INVALID")); + assertTrue( + response.contains("ValidateResultStatus=INVALID"), "Expected INVALID for " + caller + ".\n" + response); } } @@ -96,8 +96,8 @@ public void testIdentityStoreValidate_multiIDStore_INVALIDWithNOTVALIDATED() { @Test public void testIdentityStoreValidate_multiIDStore_NOTVALIDATED() { String response = readFromServer("/ServletForMultiIDStore?user=notValidated&pwd=secret4"); - assertTrue("Expected NOT_VALIDATED.\n" + response, - response.contains("ValidateResultStatus=NOT_VALIDATED")); + assertTrue( + response.contains("ValidateResultStatus=NOT_VALIDATED"), "Expected NOT_VALIDATED.\n" + response); } } diff --git a/tck/app-idstore-multiauthz/src/test/java/ee/jakarta/tck/security/test/AppIdStoreMultiAuthzIT.java b/tck/app-idstore-multiauthz/src/test/java/ee/jakarta/tck/security/test/AppIdStoreMultiAuthzIT.java index f9641ef7..2925c748 100644 --- a/tck/app-idstore-multiauthz/src/test/java/ee/jakarta/tck/security/test/AppIdStoreMultiAuthzIT.java +++ b/tck/app-idstore-multiauthz/src/test/java/ee/jakarta/tck/security/test/AppIdStoreMultiAuthzIT.java @@ -18,15 +18,15 @@ package ee.jakarta.tck.security.test; import static ee.jakarta.tck.security.test.ShrinkWrap.mavenWar; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.shrinkwrap.api.Archive; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; -@RunWith(Arquillian.class) +@ExtendWith(ArquillianExtension.class) public class AppIdStoreMultiAuthzIT extends ArquillianBase { @Deployment(testable = false) @@ -50,13 +50,13 @@ public static Archive createDeployment() { public void testIdentityStore_getGroups_multiGroupStore_highPriority_valid() { String response = readFromServer("/ServletForMultiAuthzIDStore?user=tom&pwd=secret1"); - assertTrue("Expected VALID status.\n" + response, - response.contains("ValidateResultStatus=VALID")); + assertTrue( + response.contains("ValidateResultStatus=VALID"), "Expected VALID status.\n" + response); assertTrue(response.contains("web username: tom")); // Validation comes from one of IDStore1 or IDStore2 depending on priority order. - assertTrue("Expected validation sentinel from one of the validating stores.\n" + response, - response.contains("IDStore1:validate") || response.contains("IDStore2:validate")); + assertTrue( + response.contains("IDStore1:validate") || response.contains("IDStore2:validate"), "Expected validation sentinel from one of the validating stores.\n" + response); // Both PROVIDE_GROUPS stores must contribute their sentinel + groups. assertTrue(response.contains("IDStoreAuthz1:getCallerGroups")); @@ -78,13 +78,13 @@ public void testIdentityStore_getGroups_multiGroupStore_highPriority_valid() { public void testIdentityStore_getGroups_multiGroupStore_lowerPriority_valid() { String response = readFromServer("/ServletForMultiAuthzIDStore?user=emma&pwd=secret2"); - assertTrue("Expected VALID status.\n" + response, - response.contains("ValidateResultStatus=VALID")); + assertTrue( + response.contains("ValidateResultStatus=VALID"), "Expected VALID status.\n" + response); assertTrue(response.contains("web username: emma")); // IDStore1 is the only validating store that accepts emma/secret2. - assertTrue("Expected validation to fall through to IDStore1.\n" + response, - response.contains("IDStore1:validate")); + assertTrue( + response.contains("IDStore1:validate"), "Expected validation to fall through to IDStore1.\n" + response); // Both PROVIDE_GROUPS stores must contribute groups for emma. assertTrue(response.contains("IDStoreAuthz1:getCallerGroups")); diff --git a/tck/app-idstore-noidstore/src/test/java/ee/jakarta/tck/security/test/AppIdStoreNoIdStoreIT.java b/tck/app-idstore-noidstore/src/test/java/ee/jakarta/tck/security/test/AppIdStoreNoIdStoreIT.java index 7c815210..71d7c174 100644 --- a/tck/app-idstore-noidstore/src/test/java/ee/jakarta/tck/security/test/AppIdStoreNoIdStoreIT.java +++ b/tck/app-idstore-noidstore/src/test/java/ee/jakarta/tck/security/test/AppIdStoreNoIdStoreIT.java @@ -18,15 +18,15 @@ package ee.jakarta.tck.security.test; import static ee.jakarta.tck.security.test.ShrinkWrap.mavenWar; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.shrinkwrap.api.Archive; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; -@RunWith(Arquillian.class) +@ExtendWith(ArquillianExtension.class) public class AppIdStoreNoIdStoreIT extends ArquillianBase { @Deployment(testable = false) @@ -45,9 +45,9 @@ public static Archive createDeployment() { public void testIdentityStoreValidate_noIDStore() { String response = readFromServer("/ServletForNoIDStore?user=reza&pwd=secret1"); - assertTrue("Expected an exception to be reported (no IdentityStore registered).\n" + response, + assertTrue( response.contains("Exception received.") - || response.contains("ValidateResultStatus=NOT_VALIDATED")); + || response.contains("ValidateResultStatus=NOT_VALIDATED"), "Expected an exception to be reported (no IdentityStore registered).\n" + response); } } diff --git a/tck/app-idstore-useforgroup/src/test/java/ee/jakarta/tck/security/test/AppIdStoreUseForGroupIT.java b/tck/app-idstore-useforgroup/src/test/java/ee/jakarta/tck/security/test/AppIdStoreUseForGroupIT.java index 6e588c60..cbbf1e16 100644 --- a/tck/app-idstore-useforgroup/src/test/java/ee/jakarta/tck/security/test/AppIdStoreUseForGroupIT.java +++ b/tck/app-idstore-useforgroup/src/test/java/ee/jakarta/tck/security/test/AppIdStoreUseForGroupIT.java @@ -18,15 +18,15 @@ package ee.jakarta.tck.security.test; import static ee.jakarta.tck.security.test.ShrinkWrap.mavenWar; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.shrinkwrap.api.Archive; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; -@RunWith(Arquillian.class) +@ExtendWith(ArquillianExtension.class) public class AppIdStoreUseForGroupIT extends ArquillianBase { @Deployment(testable = false) @@ -46,14 +46,14 @@ public static Archive createDeployment() { public void testIdentityStore_validationType_useforgroup() { String response = readFromServer("/ServletForIDStoreGroupOnly?user=tom&pwd=secret1"); - assertTrue("Expected VALID status.\n" + response, - response.contains("ValidateResultStatus=VALID")); - assertTrue("Expected the groups-only store's sentinel marker.\n" + response, - response.contains("useforgroup:getCallerGroups")); - assertTrue("Expected groups from the dedicated PROVIDE_GROUPS store.\n" + response, - response.contains("Oracle") && response.contains("Oracle_HQ")); - assertTrue("Expected the protected resource to identify the caller as tom.\n" + response, - response.contains("web username: tom")); + assertTrue( + response.contains("ValidateResultStatus=VALID"), "Expected VALID status.\n" + response); + assertTrue( + response.contains("useforgroup:getCallerGroups"), "Expected the groups-only store's sentinel marker.\n" + response); + assertTrue( + response.contains("Oracle") && response.contains("Oracle_HQ"), "Expected groups from the dedicated PROVIDE_GROUPS store.\n" + response); + assertTrue( + response.contains("web username: tom"), "Expected the protected resource to identify the caller as tom.\n" + response); } } diff --git a/tck/app-idstore-useforvalidation/src/test/java/ee/jakarta/tck/security/test/AppIdStoreUseForValidationIT.java b/tck/app-idstore-useforvalidation/src/test/java/ee/jakarta/tck/security/test/AppIdStoreUseForValidationIT.java index ea8ccce7..63bf1fe3 100644 --- a/tck/app-idstore-useforvalidation/src/test/java/ee/jakarta/tck/security/test/AppIdStoreUseForValidationIT.java +++ b/tck/app-idstore-useforvalidation/src/test/java/ee/jakarta/tck/security/test/AppIdStoreUseForValidationIT.java @@ -18,15 +18,15 @@ package ee.jakarta.tck.security.test; import static ee.jakarta.tck.security.test.ShrinkWrap.mavenWar; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.shrinkwrap.api.Archive; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; -@RunWith(Arquillian.class) +@ExtendWith(ArquillianExtension.class) public class AppIdStoreUseForValidationIT extends ArquillianBase { @Deployment(testable = false) @@ -44,12 +44,12 @@ public static Archive createDeployment() { public void testIdentityStore_validationType_useforvalidation() { String response = readFromServer("/ServletForIDStoreUseForValidation?user=tom&pwd=secret1"); - assertTrue("Expected VALID status.\n" + response, - response.contains("ValidateResultStatus=VALID")); - assertTrue("Expected an empty group set (validate-only store, no PROVIDE_GROUPS store).\n" + response, - response.contains("ValidateResultGroups=[]")); - assertTrue("Expected the protected resource to identify the caller as tom.\n" + response, - response.contains("web username: tom")); + assertTrue( + response.contains("ValidateResultStatus=VALID"), "Expected VALID status.\n" + response); + assertTrue( + response.contains("ValidateResultGroups=[]"), "Expected an empty group set (validate-only store, no PROVIDE_GROUPS store).\n" + response); + assertTrue( + response.contains("web username: tom"), "Expected the protected resource to identify the caller as tom.\n" + response); } } diff --git a/tck/app-jaxrs/src/test/java/ee/jakarta/tck/security/test/AppJaxRsIT.java b/tck/app-jaxrs/src/test/java/ee/jakarta/tck/security/test/AppJaxRsIT.java index 4d22acd3..b6ed1112 100644 --- a/tck/app-jaxrs/src/test/java/ee/jakarta/tck/security/test/AppJaxRsIT.java +++ b/tck/app-jaxrs/src/test/java/ee/jakarta/tck/security/test/AppJaxRsIT.java @@ -17,17 +17,17 @@ package ee.jakarta.tck.security.test; import static ee.jakarta.tck.security.test.ShrinkWrap.mavenWar; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.shrinkwrap.api.Archive; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; -@RunWith(Arquillian.class) +@ExtendWith(ArquillianExtension.class) public class AppJaxRsIT extends ArquillianBase { @Deployment(testable = false) @@ -46,8 +46,8 @@ public void testAuthenticated() { String response = readFromServer("/rest/resource/callerName?name=reza&password=secret1"); assertTrue( - "Should be authenticated as user reza but was not", - response.contains("reza")); + response.contains("reza"), + "Should be authenticated as user reza but was not"); } @Test @@ -55,8 +55,8 @@ public void testNotAuthenticated() { String response = readFromServer("/rest/resource/callerName"); assertFalse( - "Should not be authenticated as user reza but was", - response.contains("reza")); + response.contains("reza"), + "Should not be authenticated as user reza but was"); } @Test @@ -64,8 +64,8 @@ public void testHasRoleFoo() { String response = readFromServer("/rest/resource/hasRoleFoo?name=reza&password=secret1"); assertTrue( - "Should be in role foo, but was not", - response.contains("true")); + response.contains("true"), + "Should be in role foo, but was not"); } @Test @@ -73,8 +73,8 @@ public void testNotHasRoleFoo() { String response = readFromServer("/rest/resource/hasRoleFoo"); assertTrue( - "Should not be in role foo, but was", - response.contains("false")); + response.contains("false"), + "Should not be in role foo, but was"); } @Test @@ -82,8 +82,8 @@ public void testNotHasRoleKaz1() { String response = readFromServer("/rest/resource/hasRoleKaz?name=reza&password=secret1"); assertFalse( - "Should not be in role kaz, but was", - response.contains("true")); + response.contains("true"), + "Should not be in role kaz, but was"); } @Test @@ -91,8 +91,8 @@ public void testNotHasRoleKaz2() { String response = readFromServer("/rest/resource/hasRoleKaz"); assertFalse( - "Should not be in role kaz, but was", - response.contains("true")); + response.contains("true"), + "Should not be in role kaz, but was"); } @Test @@ -100,8 +100,8 @@ public void testSayHi() { String response = readFromServer("/rest/protectedResource/sayHi?name=reza&password=secret1"); assertTrue( - "Endpoint should have been called, but was not", - response.contains("saying hi!")); + response.contains("saying hi!"), + "Endpoint should have been called, but was not"); } @Test @@ -109,8 +109,8 @@ public void testNotSayHi() { String response = readFromServer("/rest/protectedResource/sayHi"); assertFalse( - "Endpoint should not have been called, but was", - response.contains("saying hi!")); + response.contains("saying hi!"), + "Endpoint should not have been called, but was"); } } diff --git a/tck/app-jwt1/src/test/java/ee/jakarta/tck/security/test/AppJwt1IT.java b/tck/app-jwt1/src/test/java/ee/jakarta/tck/security/test/AppJwt1IT.java index 809ed304..2c5a212b 100644 --- a/tck/app-jwt1/src/test/java/ee/jakarta/tck/security/test/AppJwt1IT.java +++ b/tck/app-jwt1/src/test/java/ee/jakarta/tck/security/test/AppJwt1IT.java @@ -23,20 +23,20 @@ import org.htmlunit.DefaultCredentialsProvider; import org.htmlunit.WebResponse; import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.shrinkwrap.api.Archive; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import static ee.jakarta.tck.security.test.Assert.assertDefaultAuthenticated; import static ee.jakarta.tck.security.test.Assert.assertDefaultNotAuthenticated; import static ee.jakarta.tck.security.test.ShrinkWrap.mavenWar; import static java.nio.charset.StandardCharsets.UTF_8; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; -@RunWith(Arquillian.class) +@ExtendWith(ArquillianExtension.class) public class AppJwt1IT extends ArquillianBase { @Deployment(testable = false) @@ -62,8 +62,8 @@ public void testNotAuthenticated() { assertEquals(401, response.getStatusCode()); assertTrue( - "Response did not contain the \"WWW-Authenticate\" header, but should have", - response.getResponseHeaderValue("WWW-Authenticate") != null); + response.getResponseHeaderValue("WWW-Authenticate") != null, + "Response did not contain the \"WWW-Authenticate\" header, but should have"); assertDefaultNotAuthenticated( response.getContentAsString()); diff --git a/tck/app-ldap-basic/src/test/java/ee/jakarta/tck/security/test/AppLdapBasicIT.java b/tck/app-ldap-basic/src/test/java/ee/jakarta/tck/security/test/AppLdapBasicIT.java index 9c487304..497d98d2 100644 --- a/tck/app-ldap-basic/src/test/java/ee/jakarta/tck/security/test/AppLdapBasicIT.java +++ b/tck/app-ldap-basic/src/test/java/ee/jakarta/tck/security/test/AppLdapBasicIT.java @@ -18,15 +18,15 @@ package ee.jakarta.tck.security.test; import static ee.jakarta.tck.security.test.ShrinkWrap.mavenWar; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.shrinkwrap.api.Archive; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; -@RunWith(Arquillian.class) +@ExtendWith(ArquillianExtension.class) public class AppLdapBasicIT extends ArquillianBase { @Deployment(testable = false) @@ -50,31 +50,31 @@ public static Archive createDeployment() { public void testAnnotationLdapIDStore_Basic_valid() { String response = readFromServer("/ServletForLDAPIDStore?user=tom&pwd=secret1"); - assertTrue("Expected VALID status.\n" + response, - response.contains("ValidateResultStatus=VALID")); - assertTrue("Expected Administrator group.\n" + response, response.contains("Administrator")); - assertTrue("Expected Manager group.\n" + response, response.contains("Manager")); - assertTrue("Expected caller DN uid=tom,ou=caller,dc=securityapi,dc=net.\n" + response, - response.contains("ValidateCallerDN=uid=tom,ou=caller,dc=securityapi,dc=net")); - assertTrue("Expected web username tom.\n" + response, response.contains("web username: tom")); + assertTrue( + response.contains("ValidateResultStatus=VALID"), "Expected VALID status.\n" + response); + assertTrue(response.contains("Administrator"), "Expected Administrator group.\n" + response); + assertTrue(response.contains("Manager"), "Expected Manager group.\n" + response); + assertTrue( + response.contains("ValidateCallerDN=uid=tom,ou=caller,dc=securityapi,dc=net"), "Expected caller DN uid=tom,ou=caller,dc=securityapi,dc=net.\n" + response); + assertTrue(response.contains("web username: tom"), "Expected web username tom.\n" + response); } @Test public void testAnnotationLdapIDStore_Basic_pwdInvalid() { String response = readFromServer("/ServletForLDAPIDStore?user=tom&pwd=invalid_pwd"); - assertTrue("Expected INVALID status.\n" + response, - response.contains("ValidateResultStatus=INVALID")); - assertTrue("Expected empty group set.\n" + response, response.contains("ValidateResultGroups=[]")); + assertTrue( + response.contains("ValidateResultStatus=INVALID"), "Expected INVALID status.\n" + response); + assertTrue(response.contains("ValidateResultGroups=[]"), "Expected empty group set.\n" + response); } @Test public void testAnnotationLdapIDStore_Basic_userInvalid() { String response = readFromServer("/ServletForLDAPIDStore?user=tom_invalid&pwd=invalid_pwd"); - assertTrue("Expected INVALID status.\n" + response, - response.contains("ValidateResultStatus=INVALID")); - assertTrue("Expected empty group set.\n" + response, response.contains("ValidateResultGroups=[]")); + assertTrue( + response.contains("ValidateResultStatus=INVALID"), "Expected INVALID status.\n" + response); + assertTrue(response.contains("ValidateResultGroups=[]"), "Expected empty group set.\n" + response); } } diff --git a/tck/app-ldap-binddn/src/test/java/ee/jakarta/tck/security/test/AppLdapBinddnIT.java b/tck/app-ldap-binddn/src/test/java/ee/jakarta/tck/security/test/AppLdapBinddnIT.java index 21fe0818..219f190c 100644 --- a/tck/app-ldap-binddn/src/test/java/ee/jakarta/tck/security/test/AppLdapBinddnIT.java +++ b/tck/app-ldap-binddn/src/test/java/ee/jakarta/tck/security/test/AppLdapBinddnIT.java @@ -18,15 +18,15 @@ package ee.jakarta.tck.security.test; import static ee.jakarta.tck.security.test.ShrinkWrap.mavenWar; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.shrinkwrap.api.Archive; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; -@RunWith(Arquillian.class) +@ExtendWith(ArquillianExtension.class) public class AppLdapBinddnIT extends ArquillianBase { @Deployment(testable = false) @@ -43,25 +43,25 @@ public static Archive createDeployment() { @Test public void testAnnotationLdapIDStore_Binddn_validTomx() { String response = readFromServer("/ServletForLDAPIDStore?user=tomx&pwd=secret1"); - assertTrue(response, response.contains("ValidateResultStatus=VALID")); - assertTrue(response, response.contains("Administratorx")); - assertTrue(response, response.contains("Managerx")); - assertTrue(response, response.contains("web username: tomx")); + assertTrue(response.contains("ValidateResultStatus=VALID"), response); + assertTrue(response.contains("Administratorx"), response); + assertTrue(response.contains("Managerx"), response); + assertTrue(response.contains("web username: tomx"), response); } @Test public void testAnnotationLdapIDStore_Binddn_invalidTom() { String response = readFromServer("/ServletForLDAPIDStore?user=tom&pwd=secret1"); - assertTrue(response, response.contains("ValidateResultStatus=INVALID")); - assertTrue(response, response.contains("ValidateResultGroups=[]")); + assertTrue(response.contains("ValidateResultStatus=INVALID"), response); + assertTrue(response.contains("ValidateResultGroups=[]"), response); } @Test public void testAnnotationLdapIDStore_Binddn_validBobx() { String response = readFromServer("/ServletForLDAPIDStore?user=bobx&pwd=secret3"); - assertTrue(response, response.contains("ValidateResultStatus=VALID")); - assertTrue(response, response.contains("Administratorx")); - assertTrue(response, response.contains("web username: bobx")); + assertTrue(response.contains("ValidateResultStatus=VALID"), response); + assertTrue(response.contains("Administratorx"), response); + assertTrue(response.contains("web username: bobx"), response); } } diff --git a/tck/app-ldap-groupmemberof/src/test/java/ee/jakarta/tck/security/test/AppLdapGroupmemberofIT.java b/tck/app-ldap-groupmemberof/src/test/java/ee/jakarta/tck/security/test/AppLdapGroupmemberofIT.java index 8baf869d..5c09a5c6 100644 --- a/tck/app-ldap-groupmemberof/src/test/java/ee/jakarta/tck/security/test/AppLdapGroupmemberofIT.java +++ b/tck/app-ldap-groupmemberof/src/test/java/ee/jakarta/tck/security/test/AppLdapGroupmemberofIT.java @@ -18,15 +18,15 @@ package ee.jakarta.tck.security.test; import static ee.jakarta.tck.security.test.ShrinkWrap.mavenWar; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.shrinkwrap.api.Archive; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; -@RunWith(Arquillian.class) +@ExtendWith(ArquillianExtension.class) public class AppLdapGroupmemberofIT extends ArquillianBase { @Deployment(testable = false) @@ -44,10 +44,10 @@ public static Archive createDeployment() { @Test public void testAnnotationLdapIDStore_groupMemberOf() { String response = readFromServer("/ServletForLDAPIDStore?user=emmax&pwd=secret2"); - assertTrue(response, response.contains("ValidateResultStatus=VALID")); - assertTrue(response, response.contains("Administratorx")); - assertTrue(response, response.contains("Employeex")); - assertTrue(response, response.contains("web username: emmax")); + assertTrue(response.contains("ValidateResultStatus=VALID"), response); + assertTrue(response.contains("Administratorx"), response); + assertTrue(response.contains("Employeex"), response); + assertTrue(response.contains("web username: emmax"), response); } } diff --git a/tck/app-ldap-groupmemberofnotexist/src/test/java/ee/jakarta/tck/security/test/AppLdapGroupmemberofnotexistIT.java b/tck/app-ldap-groupmemberofnotexist/src/test/java/ee/jakarta/tck/security/test/AppLdapGroupmemberofnotexistIT.java index 8bc0b362..d6dc736c 100644 --- a/tck/app-ldap-groupmemberofnotexist/src/test/java/ee/jakarta/tck/security/test/AppLdapGroupmemberofnotexistIT.java +++ b/tck/app-ldap-groupmemberofnotexist/src/test/java/ee/jakarta/tck/security/test/AppLdapGroupmemberofnotexistIT.java @@ -18,15 +18,15 @@ package ee.jakarta.tck.security.test; import static ee.jakarta.tck.security.test.ShrinkWrap.mavenWar; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.shrinkwrap.api.Archive; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; -@RunWith(Arquillian.class) +@ExtendWith(ArquillianExtension.class) public class AppLdapGroupmemberofnotexistIT extends ArquillianBase { @Deployment(testable = false) @@ -43,9 +43,9 @@ public static Archive createDeployment() { @Test public void testAnnotationLdapIDStore_groupMemberOfNotExist() { String response = readFromServer("/ServletForLDAPIDStore?user=bobx&pwd=secret3"); - assertTrue(response, response.contains("ValidateResultStatus=VALID")); - assertTrue(response, response.contains("ValidateResultGroups=[]")); - assertTrue(response, response.contains("web username: bobx")); + assertTrue(response.contains("ValidateResultStatus=VALID"), response); + assertTrue(response.contains("ValidateResultGroups=[]"), response); + assertTrue(response.contains("web username: bobx"), response); } } diff --git a/tck/app-ldap-invalidbinddn/src/test/java/ee/jakarta/tck/security/test/AppLdapInvalidbinddnIT.java b/tck/app-ldap-invalidbinddn/src/test/java/ee/jakarta/tck/security/test/AppLdapInvalidbinddnIT.java index 54c114db..7011f479 100644 --- a/tck/app-ldap-invalidbinddn/src/test/java/ee/jakarta/tck/security/test/AppLdapInvalidbinddnIT.java +++ b/tck/app-ldap-invalidbinddn/src/test/java/ee/jakarta/tck/security/test/AppLdapInvalidbinddnIT.java @@ -18,15 +18,15 @@ package ee.jakarta.tck.security.test; import static ee.jakarta.tck.security.test.ShrinkWrap.mavenWar; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.shrinkwrap.api.Archive; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; -@RunWith(Arquillian.class) +@ExtendWith(ArquillianExtension.class) public class AppLdapInvalidbinddnIT extends ArquillianBase { @Deployment(testable = false) @@ -45,9 +45,9 @@ public static Archive createDeployment() { @Test public void testAnnotationLdapIDStore_invalidBinddn() { String response = readFromServer("/ServletForLDAPIDStore?user=tom&pwd=secret1"); - assertTrue(response, + assertTrue( response.contains("Exception received.") - || response.contains("ValidateResultStatus=INVALID")); + || response.contains("ValidateResultStatus=INVALID"), response); } } diff --git a/tck/app-ldap-invalidbinddnpassword/src/test/java/ee/jakarta/tck/security/test/AppLdapInvalidbinddnpasswordIT.java b/tck/app-ldap-invalidbinddnpassword/src/test/java/ee/jakarta/tck/security/test/AppLdapInvalidbinddnpasswordIT.java index f4a08633..12dd1e53 100644 --- a/tck/app-ldap-invalidbinddnpassword/src/test/java/ee/jakarta/tck/security/test/AppLdapInvalidbinddnpasswordIT.java +++ b/tck/app-ldap-invalidbinddnpassword/src/test/java/ee/jakarta/tck/security/test/AppLdapInvalidbinddnpasswordIT.java @@ -18,15 +18,15 @@ package ee.jakarta.tck.security.test; import static ee.jakarta.tck.security.test.ShrinkWrap.mavenWar; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.shrinkwrap.api.Archive; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; -@RunWith(Arquillian.class) +@ExtendWith(ArquillianExtension.class) public class AppLdapInvalidbinddnpasswordIT extends ArquillianBase { @Deployment(testable = false) @@ -42,9 +42,9 @@ public static Archive createDeployment() { @Test public void testAnnotationLdapIDStore_invalidBinddnPassword() { String response = readFromServer("/ServletForLDAPIDStore?user=tom&pwd=secret1"); - assertTrue(response, + assertTrue( response.contains("Exception received.") - || response.contains("ValidateResultStatus=INVALID")); + || response.contains("ValidateResultStatus=INVALID"), response); } } diff --git a/tck/app-ldap-invalidcallerbasedn/src/test/java/ee/jakarta/tck/security/test/AppLdapInvalidcallerbasednIT.java b/tck/app-ldap-invalidcallerbasedn/src/test/java/ee/jakarta/tck/security/test/AppLdapInvalidcallerbasednIT.java index 9ef77579..a44fb7b3 100644 --- a/tck/app-ldap-invalidcallerbasedn/src/test/java/ee/jakarta/tck/security/test/AppLdapInvalidcallerbasednIT.java +++ b/tck/app-ldap-invalidcallerbasedn/src/test/java/ee/jakarta/tck/security/test/AppLdapInvalidcallerbasednIT.java @@ -18,15 +18,15 @@ package ee.jakarta.tck.security.test; import static ee.jakarta.tck.security.test.ShrinkWrap.mavenWar; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.shrinkwrap.api.Archive; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; -@RunWith(Arquillian.class) +@ExtendWith(ArquillianExtension.class) public class AppLdapInvalidcallerbasednIT extends ArquillianBase { @Deployment(testable = false) @@ -42,8 +42,8 @@ public static Archive createDeployment() { @Test public void testAnnotationLdapIDStore_invalidCallerBasedn() { String response = readFromServer("/ServletForLDAPIDStore?user=tom&pwd=secret1"); - assertTrue(response, response.contains("ValidateResultStatus=INVALID")); - assertTrue(response, response.contains("ValidateResultGroups=[]")); + assertTrue(response.contains("ValidateResultStatus=INVALID"), response); + assertTrue(response.contains("ValidateResultGroups=[]"), response); } } diff --git a/tck/app-ldap-invalidcallernameattr/src/test/java/ee/jakarta/tck/security/test/AppLdapInvalidcallernameattrIT.java b/tck/app-ldap-invalidcallernameattr/src/test/java/ee/jakarta/tck/security/test/AppLdapInvalidcallernameattrIT.java index 4fe9b050..11121929 100644 --- a/tck/app-ldap-invalidcallernameattr/src/test/java/ee/jakarta/tck/security/test/AppLdapInvalidcallernameattrIT.java +++ b/tck/app-ldap-invalidcallernameattr/src/test/java/ee/jakarta/tck/security/test/AppLdapInvalidcallernameattrIT.java @@ -18,15 +18,15 @@ package ee.jakarta.tck.security.test; import static ee.jakarta.tck.security.test.ShrinkWrap.mavenWar; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.shrinkwrap.api.Archive; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; -@RunWith(Arquillian.class) +@ExtendWith(ArquillianExtension.class) public class AppLdapInvalidcallernameattrIT extends ArquillianBase { @Deployment(testable = false) @@ -42,8 +42,8 @@ public static Archive createDeployment() { @Test public void testAnnotationLdapIDStore_invalidCallerNameAttribute() { String response = readFromServer("/ServletForLDAPIDStore?user=tom&pwd=secret1"); - assertTrue(response, response.contains("ValidateResultStatus=INVALID")); - assertTrue(response, response.contains("ValidateResultGroups=[]")); + assertTrue(response.contains("ValidateResultStatus=INVALID"), response); + assertTrue(response.contains("ValidateResultGroups=[]"), response); } } diff --git a/tck/app-ldap-invalidcallersearchbase/src/test/java/ee/jakarta/tck/security/test/AppLdapInvalidcallersearchbaseIT.java b/tck/app-ldap-invalidcallersearchbase/src/test/java/ee/jakarta/tck/security/test/AppLdapInvalidcallersearchbaseIT.java index aa429cdf..11b85b3f 100644 --- a/tck/app-ldap-invalidcallersearchbase/src/test/java/ee/jakarta/tck/security/test/AppLdapInvalidcallersearchbaseIT.java +++ b/tck/app-ldap-invalidcallersearchbase/src/test/java/ee/jakarta/tck/security/test/AppLdapInvalidcallersearchbaseIT.java @@ -18,15 +18,15 @@ package ee.jakarta.tck.security.test; import static ee.jakarta.tck.security.test.ShrinkWrap.mavenWar; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.shrinkwrap.api.Archive; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; -@RunWith(Arquillian.class) +@ExtendWith(ArquillianExtension.class) public class AppLdapInvalidcallersearchbaseIT extends ArquillianBase { @Deployment(testable = false) @@ -43,9 +43,9 @@ public static Archive createDeployment() { @Test public void testAnnotationLdapIDStore_invalidCallerSearchBase() { String response = readFromServer("/ServletForLDAPIDStore?user=tom&pwd=secret1"); - assertTrue(response, + assertTrue( response.contains("Exception received.") - || response.contains("ValidateResultStatus=INVALID")); + || response.contains("ValidateResultStatus=INVALID"), response); } } diff --git a/tck/app-ldap-invalidcallersearchfilter/src/test/java/ee/jakarta/tck/security/test/AppLdapInvalidcallersearchfilterIT.java b/tck/app-ldap-invalidcallersearchfilter/src/test/java/ee/jakarta/tck/security/test/AppLdapInvalidcallersearchfilterIT.java index f3832ce5..79b1877f 100644 --- a/tck/app-ldap-invalidcallersearchfilter/src/test/java/ee/jakarta/tck/security/test/AppLdapInvalidcallersearchfilterIT.java +++ b/tck/app-ldap-invalidcallersearchfilter/src/test/java/ee/jakarta/tck/security/test/AppLdapInvalidcallersearchfilterIT.java @@ -18,15 +18,15 @@ package ee.jakarta.tck.security.test; import static ee.jakarta.tck.security.test.ShrinkWrap.mavenWar; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.shrinkwrap.api.Archive; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; -@RunWith(Arquillian.class) +@ExtendWith(ArquillianExtension.class) public class AppLdapInvalidcallersearchfilterIT extends ArquillianBase { @Deployment(testable = false) @@ -42,8 +42,8 @@ public static Archive createDeployment() { @Test public void testAnnotationLdapIDStore_invalidCallerSearchFilter() { String response = readFromServer("/ServletForLDAPIDStore?user=tom&pwd=secret1"); - assertTrue(response, response.contains("ValidateResultStatus=INVALID")); - assertTrue(response, response.contains("ValidateResultGroups=[]")); + assertTrue(response.contains("ValidateResultStatus=INVALID"), response); + assertTrue(response.contains("ValidateResultGroups=[]"), response); } } diff --git a/tck/app-ldap-invalidgroupmemberattr/src/test/java/ee/jakarta/tck/security/test/AppLdapInvalidgroupmemberattrIT.java b/tck/app-ldap-invalidgroupmemberattr/src/test/java/ee/jakarta/tck/security/test/AppLdapInvalidgroupmemberattrIT.java index 8ef396c4..d3dcbf8b 100644 --- a/tck/app-ldap-invalidgroupmemberattr/src/test/java/ee/jakarta/tck/security/test/AppLdapInvalidgroupmemberattrIT.java +++ b/tck/app-ldap-invalidgroupmemberattr/src/test/java/ee/jakarta/tck/security/test/AppLdapInvalidgroupmemberattrIT.java @@ -18,15 +18,15 @@ package ee.jakarta.tck.security.test; import static ee.jakarta.tck.security.test.ShrinkWrap.mavenWar; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.shrinkwrap.api.Archive; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; -@RunWith(Arquillian.class) +@ExtendWith(ArquillianExtension.class) public class AppLdapInvalidgroupmemberattrIT extends ArquillianBase { @Deployment(testable = false) @@ -43,9 +43,9 @@ public static Archive createDeployment() { @Test public void testAnnotationLdapIDStore_invalidGroupMemberAttribute() { String response = readFromServer("/ServletForLDAPIDStore?user=tom&pwd=secret1"); - assertTrue(response, response.contains("ValidateResultStatus=VALID")); - assertTrue(response, response.contains("ValidateResultGroups=[]")); - assertTrue(response, response.contains("web username: tom")); + assertTrue(response.contains("ValidateResultStatus=VALID"), response); + assertTrue(response.contains("ValidateResultGroups=[]"), response); + assertTrue(response.contains("web username: tom"), response); } } diff --git a/tck/app-ldap-invalidgroupnameattr/src/test/java/ee/jakarta/tck/security/test/AppLdapInvalidgroupnameattrIT.java b/tck/app-ldap-invalidgroupnameattr/src/test/java/ee/jakarta/tck/security/test/AppLdapInvalidgroupnameattrIT.java index 7e90bd6c..803e4258 100644 --- a/tck/app-ldap-invalidgroupnameattr/src/test/java/ee/jakarta/tck/security/test/AppLdapInvalidgroupnameattrIT.java +++ b/tck/app-ldap-invalidgroupnameattr/src/test/java/ee/jakarta/tck/security/test/AppLdapInvalidgroupnameattrIT.java @@ -18,15 +18,15 @@ package ee.jakarta.tck.security.test; import static ee.jakarta.tck.security.test.ShrinkWrap.mavenWar; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.shrinkwrap.api.Archive; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; -@RunWith(Arquillian.class) +@ExtendWith(ArquillianExtension.class) public class AppLdapInvalidgroupnameattrIT extends ArquillianBase { @Deployment(testable = false) @@ -43,9 +43,9 @@ public static Archive createDeployment() { @Test public void testAnnotationLdapIDStore_invalidGroupNameAttribute() { String response = readFromServer("/ServletForLDAPIDStore?user=tom&pwd=secret1"); - assertTrue(response, response.contains("ValidateResultStatus=VALID")); - assertTrue(response, response.contains("ValidateResultGroups=[]")); - assertTrue(response, response.contains("web username: tom")); + assertTrue(response.contains("ValidateResultStatus=VALID"), response); + assertTrue(response.contains("ValidateResultGroups=[]"), response); + assertTrue(response.contains("web username: tom"), response); } } diff --git a/tck/app-ldap-invalidgroupsearchbase/src/test/java/ee/jakarta/tck/security/test/AppLdapInvalidgroupsearchbaseIT.java b/tck/app-ldap-invalidgroupsearchbase/src/test/java/ee/jakarta/tck/security/test/AppLdapInvalidgroupsearchbaseIT.java index 37c7d11a..5937865e 100644 --- a/tck/app-ldap-invalidgroupsearchbase/src/test/java/ee/jakarta/tck/security/test/AppLdapInvalidgroupsearchbaseIT.java +++ b/tck/app-ldap-invalidgroupsearchbase/src/test/java/ee/jakarta/tck/security/test/AppLdapInvalidgroupsearchbaseIT.java @@ -18,15 +18,15 @@ package ee.jakarta.tck.security.test; import static ee.jakarta.tck.security.test.ShrinkWrap.mavenWar; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.shrinkwrap.api.Archive; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; -@RunWith(Arquillian.class) +@ExtendWith(ArquillianExtension.class) public class AppLdapInvalidgroupsearchbaseIT extends ArquillianBase { @Deployment(testable = false) @@ -44,10 +44,10 @@ public static Archive createDeployment() { @Test public void testAnnotationLdapIDStore_invalidGroupSearchBase() { String response = readFromServer("/ServletForLDAPIDStore?user=tom&pwd=secret1"); - assertTrue(response, + assertTrue( response.contains("Exception received.") || (response.contains("ValidateResultStatus=VALID") - && response.contains("ValidateResultGroups=[]"))); + && response.contains("ValidateResultGroups=[]")), response); } } diff --git a/tck/app-ldap-invalidgroupsearchfilter/src/test/java/ee/jakarta/tck/security/test/AppLdapInvalidgroupsearchfilterIT.java b/tck/app-ldap-invalidgroupsearchfilter/src/test/java/ee/jakarta/tck/security/test/AppLdapInvalidgroupsearchfilterIT.java index fd6b8570..a6475a28 100644 --- a/tck/app-ldap-invalidgroupsearchfilter/src/test/java/ee/jakarta/tck/security/test/AppLdapInvalidgroupsearchfilterIT.java +++ b/tck/app-ldap-invalidgroupsearchfilter/src/test/java/ee/jakarta/tck/security/test/AppLdapInvalidgroupsearchfilterIT.java @@ -18,15 +18,15 @@ package ee.jakarta.tck.security.test; import static ee.jakarta.tck.security.test.ShrinkWrap.mavenWar; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.shrinkwrap.api.Archive; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; -@RunWith(Arquillian.class) +@ExtendWith(ArquillianExtension.class) public class AppLdapInvalidgroupsearchfilterIT extends ArquillianBase { @Deployment(testable = false) @@ -43,8 +43,8 @@ public static Archive createDeployment() { @Test public void testAnnotationLdapIDStore_invalidGroupSearchFilter() { String response = readFromServer("/ServletForLDAPIDStore?user=tom&pwd=secret1"); - assertTrue(response, response.contains("ValidateResultStatus=VALID")); - assertTrue(response, response.contains("ValidateResultGroups=[]")); + assertTrue(response.contains("ValidateResultStatus=VALID"), response); + assertTrue(response.contains("ValidateResultGroups=[]"), response); } } diff --git a/tck/app-ldap-invalidsearchscopeexpr/src/test/java/ee/jakarta/tck/security/test/AppLdapInvalidsearchscopeexprIT.java b/tck/app-ldap-invalidsearchscopeexpr/src/test/java/ee/jakarta/tck/security/test/AppLdapInvalidsearchscopeexprIT.java index 5f983a56..9437d7ab 100644 --- a/tck/app-ldap-invalidsearchscopeexpr/src/test/java/ee/jakarta/tck/security/test/AppLdapInvalidsearchscopeexprIT.java +++ b/tck/app-ldap-invalidsearchscopeexpr/src/test/java/ee/jakarta/tck/security/test/AppLdapInvalidsearchscopeexprIT.java @@ -18,15 +18,15 @@ package ee.jakarta.tck.security.test; import static ee.jakarta.tck.security.test.ShrinkWrap.mavenWar; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.shrinkwrap.api.Archive; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; -@RunWith(Arquillian.class) +@ExtendWith(ArquillianExtension.class) public class AppLdapInvalidsearchscopeexprIT extends ArquillianBase { @Deployment(testable = false) @@ -45,17 +45,17 @@ public static Archive createDeployment() { @Test public void testAnnotationLdapIDStore_invalidsearchScopeExpression_tom() { String response = readFromServer("/ServletForLDAPIDStore?user=tom&pwd=secret1"); - assertTrue(response, + assertTrue( response.contains("Exception received.") - || response.contains("ValidateResultStatus=INVALID")); + || response.contains("ValidateResultStatus=INVALID"), response); } @Test public void testAnnotationLdapIDStore_invalidsearchScopeExpression_subtom() { String response = readFromServer("/ServletForLDAPIDStore?user=subtom&pwd=secret1"); - assertTrue(response, + assertTrue( response.contains("Exception received.") - || response.contains("ValidateResultStatus=INVALID")); + || response.contains("ValidateResultStatus=INVALID"), response); } } diff --git a/tck/app-ldap-invalidurl/src/test/java/ee/jakarta/tck/security/test/AppLdapInvalidurlIT.java b/tck/app-ldap-invalidurl/src/test/java/ee/jakarta/tck/security/test/AppLdapInvalidurlIT.java index d4f85d9d..1849d9f4 100644 --- a/tck/app-ldap-invalidurl/src/test/java/ee/jakarta/tck/security/test/AppLdapInvalidurlIT.java +++ b/tck/app-ldap-invalidurl/src/test/java/ee/jakarta/tck/security/test/AppLdapInvalidurlIT.java @@ -18,15 +18,15 @@ package ee.jakarta.tck.security.test; import static ee.jakarta.tck.security.test.ShrinkWrap.mavenWar; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.shrinkwrap.api.Archive; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; -@RunWith(Arquillian.class) +@ExtendWith(ArquillianExtension.class) public class AppLdapInvalidurlIT extends ArquillianBase { @Deployment(testable = false) @@ -44,12 +44,12 @@ public static Archive createDeployment() { @Test public void testAnnotationLdapIDStore_invalidURL() { String response = readFromServer("/ServletForLDAPIDStore?user=tom&pwd=secret1"); - assertTrue(response, + assertTrue( response.contains("ValidateResultStatus=INVALID") - || response.contains("Exception received.")); - assertTrue(response, + || response.contains("Exception received."), response); + assertTrue( response.contains("ValidateResultGroups=[]") - || response.contains("Exception received.")); + || response.contains("Exception received."), response); } } diff --git a/tck/app-ldap-notvalidated/src/test/java/ee/jakarta/tck/security/test/AppLdapNotvalidatedIT.java b/tck/app-ldap-notvalidated/src/test/java/ee/jakarta/tck/security/test/AppLdapNotvalidatedIT.java index b46e7382..fe990aee 100644 --- a/tck/app-ldap-notvalidated/src/test/java/ee/jakarta/tck/security/test/AppLdapNotvalidatedIT.java +++ b/tck/app-ldap-notvalidated/src/test/java/ee/jakarta/tck/security/test/AppLdapNotvalidatedIT.java @@ -18,15 +18,15 @@ package ee.jakarta.tck.security.test; import static ee.jakarta.tck.security.test.ShrinkWrap.mavenWar; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.shrinkwrap.api.Archive; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; -@RunWith(Arquillian.class) +@ExtendWith(ArquillianExtension.class) public class AppLdapNotvalidatedIT extends ArquillianBase { @Deployment(testable = false) @@ -51,10 +51,10 @@ public static Archive createDeployment() { @Test public void testAnnotationLdapIDStore_NotValidated() { String response = readFromServer("/ServletForLDAPIDStore?user=tom&pwd=secret1"); - assertTrue(response, response.contains("ValidateResultStatus=VALID")); - assertTrue(response, - response.contains("ValidateCallerDN=uid=tom,ou=caller,dc=securityapi,dc=net")); - assertTrue(response, response.contains("web username: tom")); + assertTrue(response.contains("ValidateResultStatus=VALID"), response); + assertTrue( + response.contains("ValidateCallerDN=uid=tom,ou=caller,dc=securityapi,dc=net"), response); + assertTrue(response.contains("web username: tom"), response); } } diff --git a/tck/app-ldap-priorityuseforexpr/src/test/java/ee/jakarta/tck/security/test/AppLdapPriorityuseforexprIT.java b/tck/app-ldap-priorityuseforexpr/src/test/java/ee/jakarta/tck/security/test/AppLdapPriorityuseforexprIT.java index 0167a33c..d6517e5a 100644 --- a/tck/app-ldap-priorityuseforexpr/src/test/java/ee/jakarta/tck/security/test/AppLdapPriorityuseforexprIT.java +++ b/tck/app-ldap-priorityuseforexpr/src/test/java/ee/jakarta/tck/security/test/AppLdapPriorityuseforexprIT.java @@ -18,15 +18,15 @@ package ee.jakarta.tck.security.test; import static ee.jakarta.tck.security.test.ShrinkWrap.mavenWar; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.shrinkwrap.api.Archive; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; -@RunWith(Arquillian.class) +@ExtendWith(ArquillianExtension.class) public class AppLdapPriorityuseforexprIT extends ArquillianBase { @Deployment(testable = false) @@ -51,19 +51,19 @@ public static Archive createDeployment() { @Test public void testIdentityStore_ldap_priorityuseforexpr_tom() { String response = readFromServer("/ServletForLDAPIDStore?user=tom&pwd=secret1"); - assertTrue(response, response.contains("ValidateResultStatus=VALID")); - assertTrue(response, response.contains("Administrator")); - assertTrue(response, response.contains("Manager")); - assertTrue(response, response.contains("web username: tom")); + assertTrue(response.contains("ValidateResultStatus=VALID"), response); + assertTrue(response.contains("Administrator"), response); + assertTrue(response.contains("Manager"), response); + assertTrue(response.contains("web username: tom"), response); } @Test public void testIdentityStore_ldap_priorityuseforexpr_emma() { String response = readFromServer("/ServletForLDAPIDStore?user=emma&pwd=secret2"); - assertTrue(response, response.contains("ValidateResultStatus=VALID")); - assertTrue(response, response.contains("Administrator")); - assertTrue(response, response.contains("Employee")); - assertTrue(response, response.contains("web username: emma")); + assertTrue(response.contains("ValidateResultStatus=VALID"), response); + assertTrue(response.contains("Administrator"), response); + assertTrue(response.contains("Employee"), response); + assertTrue(response.contains("web username: emma"), response); } } diff --git a/tck/app-ldap-searchscopebothonelevel/src/test/java/ee/jakarta/tck/security/test/AppLdapSearchscopebothonelevelIT.java b/tck/app-ldap-searchscopebothonelevel/src/test/java/ee/jakarta/tck/security/test/AppLdapSearchscopebothonelevelIT.java index e6b4faa8..1047cfd3 100644 --- a/tck/app-ldap-searchscopebothonelevel/src/test/java/ee/jakarta/tck/security/test/AppLdapSearchscopebothonelevelIT.java +++ b/tck/app-ldap-searchscopebothonelevel/src/test/java/ee/jakarta/tck/security/test/AppLdapSearchscopebothonelevelIT.java @@ -18,15 +18,15 @@ package ee.jakarta.tck.security.test; import static ee.jakarta.tck.security.test.ShrinkWrap.mavenWar; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.shrinkwrap.api.Archive; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; -@RunWith(Arquillian.class) +@ExtendWith(ArquillianExtension.class) public class AppLdapSearchscopebothonelevelIT extends ArquillianBase { @Deployment(testable = false) @@ -44,16 +44,16 @@ public static Archive createDeployment() { @Test public void testAnnotationLdapIDStore_searchScopeBothOneLevel_tom() { String response = readFromServer("/ServletForLDAPIDStore?user=tom&pwd=secret1"); - assertTrue(response, response.contains("ValidateResultStatus=VALID")); - assertTrue(response, response.contains("Administrator")); - assertTrue(response, response.contains("Manager")); + assertTrue(response.contains("ValidateResultStatus=VALID"), response); + assertTrue(response.contains("Administrator"), response); + assertTrue(response.contains("Manager"), response); } @Test public void testAnnotationLdapIDStore_searchScopeBothOneLevel_subtom() { String response = readFromServer("/ServletForLDAPIDStore?user=subtom&pwd=secret1"); - assertTrue(response, response.contains("ValidateResultStatus=INVALID")); - assertTrue(response, response.contains("ValidateResultGroups=[]")); + assertTrue(response.contains("ValidateResultStatus=INVALID"), response); + assertTrue(response.contains("ValidateResultGroups=[]"), response); } } diff --git a/tck/app-ldap-searchscopebothsubtree/src/test/java/ee/jakarta/tck/security/test/AppLdapSearchscopebothsubtreeIT.java b/tck/app-ldap-searchscopebothsubtree/src/test/java/ee/jakarta/tck/security/test/AppLdapSearchscopebothsubtreeIT.java index 788d940c..6681fc73 100644 --- a/tck/app-ldap-searchscopebothsubtree/src/test/java/ee/jakarta/tck/security/test/AppLdapSearchscopebothsubtreeIT.java +++ b/tck/app-ldap-searchscopebothsubtree/src/test/java/ee/jakarta/tck/security/test/AppLdapSearchscopebothsubtreeIT.java @@ -18,15 +18,15 @@ package ee.jakarta.tck.security.test; import static ee.jakarta.tck.security.test.ShrinkWrap.mavenWar; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.shrinkwrap.api.Archive; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; -@RunWith(Arquillian.class) +@ExtendWith(ArquillianExtension.class) public class AppLdapSearchscopebothsubtreeIT extends ArquillianBase { @Deployment(testable = false) @@ -44,20 +44,20 @@ public static Archive createDeployment() { @Test public void testAnnotationLdapIDStore_searchScopeBothSubTree_tom() { String response = readFromServer("/ServletForLDAPIDStore?user=tom&pwd=secret1"); - assertTrue(response, response.contains("ValidateResultStatus=VALID")); - assertTrue(response, response.contains("Administrator")); - assertTrue(response, response.contains("Manager")); - assertTrue(response, response.contains("SubAdministrator")); - assertTrue(response, response.contains("SubManager")); + assertTrue(response.contains("ValidateResultStatus=VALID"), response); + assertTrue(response.contains("Administrator"), response); + assertTrue(response.contains("Manager"), response); + assertTrue(response.contains("SubAdministrator"), response); + assertTrue(response.contains("SubManager"), response); } @Test public void testAnnotationLdapIDStore_searchScopeBothSubTree_subtom() { String response = readFromServer("/ServletForLDAPIDStore?user=subtom&pwd=secret1"); - assertTrue(response, response.contains("ValidateResultStatus=VALID")); - assertTrue(response, response.contains("SubAdministrator")); - assertTrue(response, response.contains("SubManager")); - assertTrue(response, response.contains("web username: subtom")); + assertTrue(response.contains("ValidateResultStatus=VALID"), response); + assertTrue(response.contains("SubAdministrator"), response); + assertTrue(response.contains("SubManager"), response); + assertTrue(response.contains("web username: subtom"), response); } } diff --git a/tck/app-ldap-searchscopecalleronelevelgroupsubtree/src/test/java/ee/jakarta/tck/security/test/AppLdapSearchscopecalleronelevelgroupsubtreeIT.java b/tck/app-ldap-searchscopecalleronelevelgroupsubtree/src/test/java/ee/jakarta/tck/security/test/AppLdapSearchscopecalleronelevelgroupsubtreeIT.java index 3e643930..48972e19 100644 --- a/tck/app-ldap-searchscopecalleronelevelgroupsubtree/src/test/java/ee/jakarta/tck/security/test/AppLdapSearchscopecalleronelevelgroupsubtreeIT.java +++ b/tck/app-ldap-searchscopecalleronelevelgroupsubtree/src/test/java/ee/jakarta/tck/security/test/AppLdapSearchscopecalleronelevelgroupsubtreeIT.java @@ -18,15 +18,15 @@ package ee.jakarta.tck.security.test; import static ee.jakarta.tck.security.test.ShrinkWrap.mavenWar; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.shrinkwrap.api.Archive; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; -@RunWith(Arquillian.class) +@ExtendWith(ArquillianExtension.class) public class AppLdapSearchscopecalleronelevelgroupsubtreeIT extends ArquillianBase { @Deployment(testable = false) @@ -44,18 +44,18 @@ public static Archive createDeployment() { @Test public void testAnnotationLdapIDStore_searchScopeCallerOneLevelGroupSubTree_tom() { String response = readFromServer("/ServletForLDAPIDStore?user=tom&pwd=secret1"); - assertTrue(response, response.contains("ValidateResultStatus=VALID")); - assertTrue(response, response.contains("Administrator")); - assertTrue(response, response.contains("Manager")); - assertTrue(response, response.contains("SubAdministrator")); - assertTrue(response, response.contains("SubManager")); + assertTrue(response.contains("ValidateResultStatus=VALID"), response); + assertTrue(response.contains("Administrator"), response); + assertTrue(response.contains("Manager"), response); + assertTrue(response.contains("SubAdministrator"), response); + assertTrue(response.contains("SubManager"), response); } @Test public void testAnnotationLdapIDStore_searchScopeCallerOneLevelGroupSubTree_subtom() { String response = readFromServer("/ServletForLDAPIDStore?user=subtom&pwd=secret1"); - assertTrue(response, response.contains("ValidateResultStatus=INVALID")); - assertTrue(response, response.contains("ValidateResultGroups=[]")); + assertTrue(response.contains("ValidateResultStatus=INVALID"), response); + assertTrue(response.contains("ValidateResultGroups=[]"), response); } } diff --git a/tck/app-ldap-searchscopecallersubtreegrouponelevel/src/test/java/ee/jakarta/tck/security/test/AppLdapSearchscopecallersubtreegrouponelevelIT.java b/tck/app-ldap-searchscopecallersubtreegrouponelevel/src/test/java/ee/jakarta/tck/security/test/AppLdapSearchscopecallersubtreegrouponelevelIT.java index 297d5b2b..83033e65 100644 --- a/tck/app-ldap-searchscopecallersubtreegrouponelevel/src/test/java/ee/jakarta/tck/security/test/AppLdapSearchscopecallersubtreegrouponelevelIT.java +++ b/tck/app-ldap-searchscopecallersubtreegrouponelevel/src/test/java/ee/jakarta/tck/security/test/AppLdapSearchscopecallersubtreegrouponelevelIT.java @@ -18,15 +18,15 @@ package ee.jakarta.tck.security.test; import static ee.jakarta.tck.security.test.ShrinkWrap.mavenWar; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.shrinkwrap.api.Archive; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; -@RunWith(Arquillian.class) +@ExtendWith(ArquillianExtension.class) public class AppLdapSearchscopecallersubtreegrouponelevelIT extends ArquillianBase { @Deployment(testable = false) @@ -44,17 +44,17 @@ public static Archive createDeployment() { @Test public void testAnnotationLdapIDStore_searchScopeCallerSubTreeGroupOneLevel_tom() { String response = readFromServer("/ServletForLDAPIDStore?user=tom&pwd=secret1"); - assertTrue(response, response.contains("ValidateResultStatus=VALID")); - assertTrue(response, response.contains("Administrator")); - assertTrue(response, response.contains("Manager")); + assertTrue(response.contains("ValidateResultStatus=VALID"), response); + assertTrue(response.contains("Administrator"), response); + assertTrue(response.contains("Manager"), response); } @Test public void testAnnotationLdapIDStore_searchScopeCallerSubTreeGroupOneLevel_subtom() { String response = readFromServer("/ServletForLDAPIDStore?user=subtom&pwd=secret1"); - assertTrue(response, response.contains("ValidateResultStatus=VALID")); - assertTrue(response, response.contains("ValidateResultGroups=[]")); - assertTrue(response, response.contains("web username: subtom")); + assertTrue(response.contains("ValidateResultStatus=VALID"), response); + assertTrue(response.contains("ValidateResultGroups=[]"), response); + assertTrue(response.contains("web username: subtom"), response); } } diff --git a/tck/app-ldap-searchscopeexpr/src/test/java/ee/jakarta/tck/security/test/AppLdapSearchscopeexprIT.java b/tck/app-ldap-searchscopeexpr/src/test/java/ee/jakarta/tck/security/test/AppLdapSearchscopeexprIT.java index 2831a37c..f9d52747 100644 --- a/tck/app-ldap-searchscopeexpr/src/test/java/ee/jakarta/tck/security/test/AppLdapSearchscopeexprIT.java +++ b/tck/app-ldap-searchscopeexpr/src/test/java/ee/jakarta/tck/security/test/AppLdapSearchscopeexprIT.java @@ -18,15 +18,15 @@ package ee.jakarta.tck.security.test; import static ee.jakarta.tck.security.test.ShrinkWrap.mavenWar; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.shrinkwrap.api.Archive; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; -@RunWith(Arquillian.class) +@ExtendWith(ArquillianExtension.class) public class AppLdapSearchscopeexprIT extends ArquillianBase { @Deployment(testable = false) @@ -44,16 +44,16 @@ public static Archive createDeployment() { @Test public void testAnnotationLdapIDStore_searchScopeExpression_tom() { String response = readFromServer("/ServletForLDAPIDStore?user=tom&pwd=secret1"); - assertTrue(response, response.contains("ValidateResultStatus=VALID")); - assertTrue(response, response.contains("Administrator")); - assertTrue(response, response.contains("Manager")); + assertTrue(response.contains("ValidateResultStatus=VALID"), response); + assertTrue(response.contains("Administrator"), response); + assertTrue(response.contains("Manager"), response); } @Test public void testAnnotationLdapIDStore_searchScopeExpression_subtom() { String response = readFromServer("/ServletForLDAPIDStore?user=subtom&pwd=secret1"); - assertTrue(response, response.contains("ValidateResultStatus=INVALID")); - assertTrue(response, response.contains("ValidateResultGroups=[]")); + assertTrue(response.contains("ValidateResultStatus=INVALID"), response); + assertTrue(response.contains("ValidateResultGroups=[]"), response); } } diff --git a/tck/app-ldap-useforgroup/src/test/java/ee/jakarta/tck/security/test/AppLdapUseforgroupIT.java b/tck/app-ldap-useforgroup/src/test/java/ee/jakarta/tck/security/test/AppLdapUseforgroupIT.java index c91014b4..0313eefb 100644 --- a/tck/app-ldap-useforgroup/src/test/java/ee/jakarta/tck/security/test/AppLdapUseforgroupIT.java +++ b/tck/app-ldap-useforgroup/src/test/java/ee/jakarta/tck/security/test/AppLdapUseforgroupIT.java @@ -18,15 +18,15 @@ package ee.jakarta.tck.security.test; import static ee.jakarta.tck.security.test.ShrinkWrap.mavenWar; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.shrinkwrap.api.Archive; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; -@RunWith(Arquillian.class) +@ExtendWith(ArquillianExtension.class) public class AppLdapUseforgroupIT extends ArquillianBase { @Deployment(testable = false) @@ -45,29 +45,29 @@ public static Archive createDeployment() { @Test public void testIdentityStore_ldap_useforgroup_tom() { String response = readFromServer("/ServletForLDAPIDStore?user=tom&pwd=secret1"); - assertTrue(response, response.contains("ValidateResultStatus=VALID")); - assertTrue(response, response.contains("Administrator1")); - assertTrue(response, response.contains("Manager1")); - assertTrue(response, response.contains("Administrator2")); - assertTrue(response, response.contains("Manager2")); - assertTrue(response, response.contains("IDStore2:getCallerGroups")); + assertTrue(response.contains("ValidateResultStatus=VALID"), response); + assertTrue(response.contains("Administrator1"), response); + assertTrue(response.contains("Manager1"), response); + assertTrue(response.contains("Administrator2"), response); + assertTrue(response.contains("Manager2"), response); + assertTrue(response.contains("IDStore2:getCallerGroups"), response); // LDAP-provided groups for top-level tom - assertTrue(response, response.contains("Administrator")); - assertTrue(response, response.contains("Manager")); - assertTrue(response, response.contains("web username: tom")); + assertTrue(response.contains("Administrator"), response); + assertTrue(response.contains("Manager"), response); + assertTrue(response.contains("web username: tom"), response); } @Test public void testIdentityStore_ldap_useforgroup_emma() { String response = readFromServer("/ServletForLDAPIDStore?user=emma&pwd=secret12"); - assertTrue(response, response.contains("ValidateResultStatus=VALID")); - assertTrue(response, response.contains("Administrator1")); - assertTrue(response, response.contains("Employee1")); - assertTrue(response, response.contains("Administrator2")); - assertTrue(response, response.contains("Employee2")); - assertTrue(response, response.contains("Administrator")); - assertTrue(response, response.contains("Employee")); - assertTrue(response, response.contains("web username: emma")); + assertTrue(response.contains("ValidateResultStatus=VALID"), response); + assertTrue(response.contains("Administrator1"), response); + assertTrue(response.contains("Employee1"), response); + assertTrue(response.contains("Administrator2"), response); + assertTrue(response.contains("Employee2"), response); + assertTrue(response.contains("Administrator"), response); + assertTrue(response.contains("Employee"), response); + assertTrue(response.contains("web username: emma"), response); } } diff --git a/tck/app-ldap-useforvalidation/src/test/java/ee/jakarta/tck/security/test/AppLdapUseforvalidationIT.java b/tck/app-ldap-useforvalidation/src/test/java/ee/jakarta/tck/security/test/AppLdapUseforvalidationIT.java index 8068dc56..ab2a8fd8 100644 --- a/tck/app-ldap-useforvalidation/src/test/java/ee/jakarta/tck/security/test/AppLdapUseforvalidationIT.java +++ b/tck/app-ldap-useforvalidation/src/test/java/ee/jakarta/tck/security/test/AppLdapUseforvalidationIT.java @@ -18,15 +18,15 @@ package ee.jakarta.tck.security.test; import static ee.jakarta.tck.security.test.ShrinkWrap.mavenWar; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.shrinkwrap.api.Archive; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; -@RunWith(Arquillian.class) +@ExtendWith(ArquillianExtension.class) public class AppLdapUseforvalidationIT extends ArquillianBase { @Deployment(testable = false) @@ -45,28 +45,28 @@ public static Archive createDeployment() { @Test public void testIdentityStore_ldap_useforvalidation_tom() { String response = readFromServer("/ServletForLDAPIDStore?user=tom&pwd=secret1"); - assertTrue(response, response.contains("ValidateResultStatus=VALID")); - assertTrue(response, response.contains("Administrator1")); - assertTrue(response, response.contains("Manager1")); - assertTrue(response, response.contains("web username: tom")); + assertTrue(response.contains("ValidateResultStatus=VALID"), response); + assertTrue(response.contains("Administrator1"), response); + assertTrue(response.contains("Manager1"), response); + assertTrue(response.contains("web username: tom"), response); } @Test public void testIdentityStore_ldap_useforvalidation_emma() { String response = readFromServer("/ServletForLDAPIDStore?user=emma&pwd=secret2"); - assertTrue(response, response.contains("ValidateResultStatus=VALID")); + assertTrue(response.contains("ValidateResultStatus=VALID"), response); // emma authenticates against LDAP only - in-memory IdentityStore1 has // a different password for emma so it neither validates nor provides // groups via getCallerGroups (LDAP didn't author the result so the // handler does not call into IDS1 for groups in this scenario). - assertTrue(response, response.contains("web username: emma")); + assertTrue(response.contains("web username: emma"), response); } @Test public void testIdentityStore_ldap_useforvalidation_invalid() { String response = readFromServer("/ServletForLDAPIDStore?user=invalid_user&pwd=secret2"); - assertTrue(response, response.contains("ValidateResultStatus=INVALID")); - assertTrue(response, response.contains("ValidateResultGroups=[]")); + assertTrue(response.contains("ValidateResultStatus=INVALID"), response); + assertTrue(response.contains("ValidateResultGroups=[]"), response); } } diff --git a/tck/app-ldap/src/test/java/ee/jakarta/tck/security/test/AppLDAPIT.java b/tck/app-ldap/src/test/java/ee/jakarta/tck/security/test/AppLDAPIT.java index 18f98847..797c971b 100644 --- a/tck/app-ldap/src/test/java/ee/jakarta/tck/security/test/AppLDAPIT.java +++ b/tck/app-ldap/src/test/java/ee/jakarta/tck/security/test/AppLDAPIT.java @@ -21,13 +21,13 @@ import static ee.jakarta.tck.security.test.ShrinkWrap.mavenWar; import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.shrinkwrap.api.Archive; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; -@RunWith(Arquillian.class) +@ExtendWith(ArquillianExtension.class) public class AppLDAPIT extends ArquillianBase { @Deployment(testable = false) diff --git a/tck/app-ldap2/src/test/java/ee/jakarta/tck/security/test/AppLDAP2IT.java b/tck/app-ldap2/src/test/java/ee/jakarta/tck/security/test/AppLDAP2IT.java index 46135ba9..77080519 100644 --- a/tck/app-ldap2/src/test/java/ee/jakarta/tck/security/test/AppLDAP2IT.java +++ b/tck/app-ldap2/src/test/java/ee/jakarta/tck/security/test/AppLDAP2IT.java @@ -21,13 +21,13 @@ import static ee.jakarta.tck.security.test.ShrinkWrap.mavenWar; import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.shrinkwrap.api.Archive; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; -@RunWith(Arquillian.class) +@ExtendWith(ArquillianExtension.class) public class AppLDAP2IT extends ArquillianBase { @Deployment(testable = false) diff --git a/tck/app-ldap3/src/test/java/ee/jakarta/tck/security/test/AppLDAP3IT.java b/tck/app-ldap3/src/test/java/ee/jakarta/tck/security/test/AppLDAP3IT.java index bb547fb9..7c6e80e8 100644 --- a/tck/app-ldap3/src/test/java/ee/jakarta/tck/security/test/AppLDAP3IT.java +++ b/tck/app-ldap3/src/test/java/ee/jakarta/tck/security/test/AppLDAP3IT.java @@ -22,13 +22,13 @@ import static ee.jakarta.tck.security.test.ShrinkWrap.mavenWar; import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.shrinkwrap.api.Archive; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; -@RunWith(Arquillian.class) +@ExtendWith(ArquillianExtension.class) public class AppLDAP3IT extends ArquillianBase { @Deployment(testable = false) diff --git a/tck/app-mem-basic-decorate/src/test/java/ee/jakarta/tck/security/test/AppMemBasicDecorateIT.java b/tck/app-mem-basic-decorate/src/test/java/ee/jakarta/tck/security/test/AppMemBasicDecorateIT.java index 90cdbc00..daf33f46 100644 --- a/tck/app-mem-basic-decorate/src/test/java/ee/jakarta/tck/security/test/AppMemBasicDecorateIT.java +++ b/tck/app-mem-basic-decorate/src/test/java/ee/jakarta/tck/security/test/AppMemBasicDecorateIT.java @@ -20,20 +20,20 @@ import static ee.jakarta.tck.security.test.Assert.assertDefaultAuthenticated; import static ee.jakarta.tck.security.test.Assert.assertDefaultNotAuthenticated; import static ee.jakarta.tck.security.test.ShrinkWrap.mavenWar; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.shrinkwrap.api.Archive; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.htmlunit.DefaultCredentialsProvider; import org.htmlunit.WebResponse; -@RunWith(Arquillian.class) +@ExtendWith(ArquillianExtension.class) public class AppMemBasicDecorateIT extends ArquillianBase { @Deployment(testable = false) @@ -73,8 +73,8 @@ public void testNotAuthenticatedAndDecorated() { assertEquals("bar", response.getResponseHeaderValue("foo")); assertTrue( - "Response did not contain the \"WWW-Authenticate\" header, but should have", - response.getResponseHeaderValue("WWW-Authenticate") != null); + response.getResponseHeaderValue("WWW-Authenticate") != null, + "Response did not contain the \"WWW-Authenticate\" header, but should have"); assertDefaultNotAuthenticated( response.getContentAsString()); diff --git a/tck/app-mem-basic/src/test/java/ee/jakarta/tck/security/test/AppMemBasicIT.java b/tck/app-mem-basic/src/test/java/ee/jakarta/tck/security/test/AppMemBasicIT.java index ecc5709a..d396df01 100644 --- a/tck/app-mem-basic/src/test/java/ee/jakarta/tck/security/test/AppMemBasicIT.java +++ b/tck/app-mem-basic/src/test/java/ee/jakarta/tck/security/test/AppMemBasicIT.java @@ -20,20 +20,20 @@ import static ee.jakarta.tck.security.test.Assert.assertDefaultAuthenticated; import static ee.jakarta.tck.security.test.Assert.assertDefaultNotAuthenticated; import static ee.jakarta.tck.security.test.ShrinkWrap.mavenWar; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.shrinkwrap.api.Archive; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.htmlunit.DefaultCredentialsProvider; import org.htmlunit.WebResponse; -@RunWith(Arquillian.class) +@ExtendWith(ArquillianExtension.class) public class AppMemBasicIT extends ArquillianBase { @Deployment(testable = false) @@ -61,8 +61,8 @@ public void testNotAuthenticated() { assertEquals(401, response.getStatusCode()); assertTrue( - "Response did not contain the \"WWW-Authenticate\" header, but should have", - response.getResponseHeaderValue("WWW-Authenticate") != null); + response.getResponseHeaderValue("WWW-Authenticate") != null, + "Response did not contain the \"WWW-Authenticate\" header, but should have"); assertDefaultNotAuthenticated( response.getContentAsString()); @@ -81,8 +81,8 @@ public void testNotAuthenticatedWrongName() { assertEquals(401, response.getStatusCode()); assertTrue( - "Response did not contain the \"WWW-Authenticate\" header, but should have", - response.getResponseHeaderValue("WWW-Authenticate") != null); + response.getResponseHeaderValue("WWW-Authenticate") != null, + "Response did not contain the \"WWW-Authenticate\" header, but should have"); assertDefaultNotAuthenticated( response.getContentAsString()); @@ -101,8 +101,8 @@ public void testNotAuthenticatedWrongPassword() { assertEquals(401, response.getStatusCode()); assertTrue( - "Response did not contain the \"WWW-Authenticate\" header, but should have", - response.getResponseHeaderValue("WWW-Authenticate") != null); + response.getResponseHeaderValue("WWW-Authenticate") != null, + "Response did not contain the \"WWW-Authenticate\" header, but should have"); assertDefaultNotAuthenticated( response.getContentAsString()); diff --git a/tck/app-mem-customform/src/test/java/ee/jakarta/tck/security/test/AppMemCustomFormIT.java b/tck/app-mem-customform/src/test/java/ee/jakarta/tck/security/test/AppMemCustomFormIT.java index d3db35e6..d505578d 100644 --- a/tck/app-mem-customform/src/test/java/ee/jakarta/tck/security/test/AppMemCustomFormIT.java +++ b/tck/app-mem-customform/src/test/java/ee/jakarta/tck/security/test/AppMemCustomFormIT.java @@ -21,27 +21,27 @@ import static ee.jakarta.tck.security.test.Assert.assertDefaultAuthenticated; import static ee.jakarta.tck.security.test.Assert.assertDefaultNotAuthenticated; import static ee.jakarta.tck.security.test.ShrinkWrap.mavenWar; -import static org.junit.Assert.assertTrue; -import static org.junit.Assume.assumeFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assumptions.assumeFalse; import java.io.IOException; import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.shrinkwrap.api.Archive; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.EmptyAsset; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.htmlunit.Page; import org.htmlunit.html.HtmlForm; import org.htmlunit.html.HtmlPage; -@RunWith(Arquillian.class) +@ExtendWith(ArquillianExtension.class) public class AppMemCustomFormIT extends ArquillianBase { // Disabled for Liberty since as of version 16.0.0.3 / 2016.9 it doesn't @@ -55,7 +55,7 @@ public static Archive createDeployment() { return mavenWar(); } - @Before + @BeforeEach public void checkEnabled() { assumeFalse("liberty".equals(getProperty("arquillian.server"))); } @@ -72,9 +72,9 @@ public void testAuthenticated() throws IOException { // 2. Server should forward to login page assertTrue( - "The login page should have been displayed, but was not", loginPage.getWebResponse().getContentAsString().contains("Login to continue") - ); + , + "The login page should have been displayed, but was not"); // 3. Submit the form on the login page with the correct credentials @@ -141,9 +141,9 @@ public void testNotAuthenticatedWrongName() throws IOException { // 2. Server should forward to login page assertTrue( - "The login page should have been displayed, but was not", loginPage.getWebResponse().getContentAsString().contains("Login to continue") - ); + , + "The login page should have been displayed, but was not"); // 3. Submit the form on the login page with the wrong credentials @@ -160,9 +160,9 @@ public void testNotAuthenticatedWrongName() throws IOException { .click(); assertTrue( - "An error message should be displayed, but was not", page.getWebResponse().getContentAsString().contains("Authentication failed") - ); + , + "An error message should be displayed, but was not"); // Should not be authenticted now assertDefaultNotAuthenticated( @@ -182,9 +182,9 @@ public void testNotAuthenticatedWrongPassword() throws IOException { // 2. Server should forward to login page assertTrue( - "The login page should have been displayed, but was not", loginPage.getWebResponse().getContentAsString().contains("Login to continue") - ); + , + "The login page should have been displayed, but was not"); // 3. Submit the form on the login page with the wrong credentials @@ -201,9 +201,9 @@ public void testNotAuthenticatedWrongPassword() throws IOException { .click(); assertTrue( - "An error message should be displayed, but was not", page.getWebResponse().getContentAsString().contains("Authentication failed") - ); + , + "An error message should be displayed, but was not"); // Should not be authenticted now assertDefaultNotAuthenticated( @@ -223,9 +223,9 @@ public void testNotAuthenticatedInitiallyWrongNameThenCorrect() throws IOExcepti // 2. Server should forward to login page assertTrue( - "The login page should have been displayed, but was not", loginPage.getWebResponse().getContentAsString().contains("Login to continue") - ); + , + "The login page should have been displayed, but was not"); // 3. Submit the form on the login page with the wrong credentials @@ -242,9 +242,9 @@ public void testNotAuthenticatedInitiallyWrongNameThenCorrect() throws IOExcepti .click(); assertTrue( - "An error message should be displayed, but was not", page.getWebResponse().getContentAsString().contains("Authentication failed") - ); + , + "An error message should be displayed, but was not"); // Should not be authenticted now assertDefaultNotAuthenticated( diff --git a/tck/app-mem-form/src/test/java/ee/jakarta/tck/security/test/AppMemFormIT.java b/tck/app-mem-form/src/test/java/ee/jakarta/tck/security/test/AppMemFormIT.java index 1bfebe1b..e5de38e1 100644 --- a/tck/app-mem-form/src/test/java/ee/jakarta/tck/security/test/AppMemFormIT.java +++ b/tck/app-mem-form/src/test/java/ee/jakarta/tck/security/test/AppMemFormIT.java @@ -20,21 +20,21 @@ import static ee.jakarta.tck.security.test.Assert.assertDefaultAuthenticated; import static ee.jakarta.tck.security.test.Assert.assertDefaultNotAuthenticated; import static ee.jakarta.tck.security.test.ShrinkWrap.mavenWar; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.IOException; import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.shrinkwrap.api.Archive; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.htmlunit.html.HtmlForm; import org.htmlunit.html.HtmlPage; -@RunWith(Arquillian.class) +@ExtendWith(ArquillianExtension.class) public class AppMemFormIT extends ArquillianBase { @Deployment(testable = false) @@ -54,9 +54,9 @@ public void testAuthenticated() throws IOException { // 2. Server should forward to login page assertTrue( - "The login page should have been displayed, but was not", loginPage.getWebResponse().getContentAsString().contains("Login to continue") - ); + , + "The login page should have been displayed, but was not"); // 3. Submit the form on the login page with the correct credentials @@ -128,9 +128,9 @@ public void testNotAuthenticatedWrongName() throws IOException { // 2. Server should forward to login page assertTrue( - "The login page should have been displayed, but was not", loginPage.getWebResponse().getContentAsString().contains("Login to continue") - ); + , + "The login page should have been displayed, but was not"); // 3. Submit the form on the login page with the correct credentials @@ -147,9 +147,9 @@ public void testNotAuthenticatedWrongName() throws IOException { .click(); assertTrue( - "The error page should have been displayed, but was not", page.getWebResponse().getContentAsString().contains("Login failed!") - ); + , + "The error page should have been displayed, but was not"); // Should not be authenticted now assertDefaultNotAuthenticated( @@ -169,9 +169,9 @@ public void testNotAuthenticatedWrongPassword() throws IOException { // 2. Server should forward to login page assertTrue( - "The login page should have been displayed, but was not", loginPage.getWebResponse().getContentAsString().contains("Login to continue") - ); + , + "The login page should have been displayed, but was not"); // 3. Submit the form on the login page with the *wrong* credentials @@ -188,9 +188,9 @@ public void testNotAuthenticatedWrongPassword() throws IOException { .click(); assertTrue( - "The error page should have been displayed, but was not", page.getWebResponse().getContentAsString().contains("Login failed!") - ); + , + "The error page should have been displayed, but was not"); // Should not be authenticted now assertDefaultNotAuthenticated( @@ -210,9 +210,9 @@ public void testNotAuthenticatedInitiallyWrongNameThenCorrect() throws IOExcepti // 2. Server should forward to login page assertTrue( - "The login page should have been displayed, but was not", loginPage.getWebResponse().getContentAsString().contains("Login to continue") - ); + , + "The login page should have been displayed, but was not"); // 3. Submit the form on the login page with the correct credentials diff --git a/tck/app-mem-form/src/test/java/ee/jakarta/tck/security/test/AppMemFormImmediateIT.java b/tck/app-mem-form/src/test/java/ee/jakarta/tck/security/test/AppMemFormImmediateIT.java index 26155ceb..a2686db8 100644 --- a/tck/app-mem-form/src/test/java/ee/jakarta/tck/security/test/AppMemFormImmediateIT.java +++ b/tck/app-mem-form/src/test/java/ee/jakarta/tck/security/test/AppMemFormImmediateIT.java @@ -20,23 +20,23 @@ import static ee.jakarta.tck.security.test.Assert.assertDefaultAuthenticated; import static ee.jakarta.tck.security.test.Assert.assertDefaultNotAuthenticated; import static ee.jakarta.tck.security.test.ShrinkWrap.mavenWar; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.IOException; import ee.jakarta.tck.security.test.alternatives.ApplicationConfigImmediate; import ee.jakarta.tck.security.test.alternatives.LoginServletAlt; import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.shrinkwrap.api.Archive; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.htmlunit.html.HtmlForm; import org.htmlunit.html.HtmlPage; -@RunWith(Arquillian.class) +@ExtendWith(ArquillianExtension.class) public class AppMemFormImmediateIT extends ArquillianBase { @Deployment(testable = false) @@ -57,16 +57,16 @@ public void testAuthenticated() throws IOException { // 2. Server should redirect to login page assertTrue( - "The login page should have been displayed, but was not", loginPage.getWebResponse().getContentAsString().contains("Login to continue ALT") - ); + , + "The login page should have been displayed, but was not"); // 2a. If a redirect was used, we should see the actual URL of the Servlet now assertTrue( - "The login page should have been reached via redirect, but was not", loginPage.getUrl().toString().endsWith("/login-servlet-alt") - ); + , + "The login page should have been reached via redirect, but was not"); // 3. Submit the form on the login page with the correct credentials @@ -138,9 +138,9 @@ public void testNotAuthenticatedWrongName() throws IOException { // 2. Server should forward to login page assertTrue( - "The login page should have been displayed, but was not", loginPage.getWebResponse().getContentAsString().contains("Login to continue") - ); + , + "The login page should have been displayed, but was not"); // 3. Submit the form on the login page with the correct credentials @@ -157,9 +157,9 @@ public void testNotAuthenticatedWrongName() throws IOException { .click(); assertTrue( - "The error page should have been displayed, but was not", page.getWebResponse().getContentAsString().contains("Login failed!") - ); + , + "The error page should have been displayed, but was not"); // Should not be authenticted now assertDefaultNotAuthenticated( @@ -179,9 +179,9 @@ public void testNotAuthenticatedWrongPassword() throws IOException { // 2. Server should forward to login page assertTrue( - "The login page should have been displayed, but was not", loginPage.getWebResponse().getContentAsString().contains("Login to continue") - ); + , + "The login page should have been displayed, but was not"); // 3. Submit the form on the login page with the *wrong* credentials @@ -198,9 +198,9 @@ public void testNotAuthenticatedWrongPassword() throws IOException { .click(); assertTrue( - "The error page should have been displayed, but was not", page.getWebResponse().getContentAsString().contains("Login failed!") - ); + , + "The error page should have been displayed, but was not"); // Should not be authenticted now assertDefaultNotAuthenticated( @@ -220,9 +220,9 @@ public void testNotAuthenticatedInitiallyWrongNameThenCorrect() throws IOExcepti // 2. Server should forward to login page assertTrue( - "The login page should have been displayed, but was not", loginPage.getWebResponse().getContentAsString().contains("Login to continue") - ); + , + "The login page should have been displayed, but was not"); // 3. Submit the form on the login page with the correct credentials diff --git a/tck/app-mem-policy/src/test/java/ee/jakarta/tck/security/test/AppMemPolicyIT.java b/tck/app-mem-policy/src/test/java/ee/jakarta/tck/security/test/AppMemPolicyIT.java index 52c6a0e5..2e48dc75 100644 --- a/tck/app-mem-policy/src/test/java/ee/jakarta/tck/security/test/AppMemPolicyIT.java +++ b/tck/app-mem-policy/src/test/java/ee/jakarta/tck/security/test/AppMemPolicyIT.java @@ -23,13 +23,13 @@ import static ee.jakarta.tck.security.test.ShrinkWrap.mavenWar; import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.shrinkwrap.api.Archive; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; -@RunWith(Arquillian.class) +@ExtendWith(ArquillianExtension.class) public class AppMemPolicyIT extends ArquillianBase { @Deployment(testable = false) diff --git a/tck/app-mem-policy2/src/test/java/ee/jakarta/tck/security/test/AppMemPolicy2IT.java b/tck/app-mem-policy2/src/test/java/ee/jakarta/tck/security/test/AppMemPolicy2IT.java index 8cad23df..45ba667b 100644 --- a/tck/app-mem-policy2/src/test/java/ee/jakarta/tck/security/test/AppMemPolicy2IT.java +++ b/tck/app-mem-policy2/src/test/java/ee/jakarta/tck/security/test/AppMemPolicy2IT.java @@ -22,13 +22,13 @@ import static ee.jakarta.tck.security.test.ShrinkWrap.mavenWar; import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.shrinkwrap.api.Archive; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; -@RunWith(Arquillian.class) +@ExtendWith(ArquillianExtension.class) public class AppMemPolicy2IT extends ArquillianBase { @Deployment(testable = false) diff --git a/tck/app-mem/src/test/java/ee/jakarta/tck/security/test/AppMemIT.java b/tck/app-mem/src/test/java/ee/jakarta/tck/security/test/AppMemIT.java index b0c1bcbc..8cc7c66c 100644 --- a/tck/app-mem/src/test/java/ee/jakarta/tck/security/test/AppMemIT.java +++ b/tck/app-mem/src/test/java/ee/jakarta/tck/security/test/AppMemIT.java @@ -21,13 +21,13 @@ import static ee.jakarta.tck.security.test.ShrinkWrap.mavenWar; import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.shrinkwrap.api.Archive; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; -@RunWith(Arquillian.class) +@ExtendWith(ArquillianExtension.class) public class AppMemIT extends ArquillianBase { @Deployment(testable = false) diff --git a/tck/app-multiple-store-backup/app-openid2/src/test/java/org/glassfish/soteria/test/OpenId2DefaultIT.java b/tck/app-multiple-store-backup/app-openid2/src/test/java/org/glassfish/soteria/test/OpenId2DefaultIT.java index 8d7d9090..f31aff1b 100644 --- a/tck/app-multiple-store-backup/app-openid2/src/test/java/org/glassfish/soteria/test/OpenId2DefaultIT.java +++ b/tck/app-multiple-store-backup/app-openid2/src/test/java/org/glassfish/soteria/test/OpenId2DefaultIT.java @@ -25,10 +25,10 @@ import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.RunAsClient; -import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.shrinkwrap.api.Archive; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.htmlunit.TextPage; import org.htmlunit.WebResponse; @@ -42,7 +42,7 @@ * @author Rudy De Busscher * @author Arjan Tijms */ -@RunWith(Arquillian.class) +@ExtendWith(ArquillianExtension.class) public class OpenId2DefaultIT extends ArquillianBase { @Deployment(testable = false) diff --git a/tck/app-multiple-store-backup/src/test/java/ee/jakarta/tck/security/test/AppMultipleStoreBackupIT.java b/tck/app-multiple-store-backup/src/test/java/ee/jakarta/tck/security/test/AppMultipleStoreBackupIT.java index 1dfefe0f..f4c8282e 100644 --- a/tck/app-multiple-store-backup/src/test/java/ee/jakarta/tck/security/test/AppMultipleStoreBackupIT.java +++ b/tck/app-multiple-store-backup/src/test/java/ee/jakarta/tck/security/test/AppMultipleStoreBackupIT.java @@ -21,12 +21,12 @@ import static ee.jakarta.tck.security.test.ShrinkWrap.mavenWar; import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.shrinkwrap.api.Archive; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; -@RunWith(Arquillian.class) +@ExtendWith(ArquillianExtension.class) public class AppMultipleStoreBackupIT extends ArquillianBase { @Deployment(testable = false) diff --git a/tck/app-multiple-store/src/test/java/ee/jakarta/tck/security/test/AppMultipleStoreIT.java b/tck/app-multiple-store/src/test/java/ee/jakarta/tck/security/test/AppMultipleStoreIT.java index 16d26037..9a488ab0 100644 --- a/tck/app-multiple-store/src/test/java/ee/jakarta/tck/security/test/AppMultipleStoreIT.java +++ b/tck/app-multiple-store/src/test/java/ee/jakarta/tck/security/test/AppMultipleStoreIT.java @@ -21,12 +21,12 @@ import static ee.jakarta.tck.security.test.ShrinkWrap.mavenWar; import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.shrinkwrap.api.Archive; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; -@RunWith(Arquillian.class) +@ExtendWith(ArquillianExtension.class) public class AppMultipleStoreIT extends ArquillianBase { @Deployment(testable = false) diff --git a/tck/app-openid/src/test/java/ee/jakarta/tck/security/test/InvalidRedirectURIIT.java b/tck/app-openid/src/test/java/ee/jakarta/tck/security/test/InvalidRedirectURIIT.java index 0604a504..7ad9f4ad 100644 --- a/tck/app-openid/src/test/java/ee/jakarta/tck/security/test/InvalidRedirectURIIT.java +++ b/tck/app-openid/src/test/java/ee/jakarta/tck/security/test/InvalidRedirectURIIT.java @@ -19,8 +19,8 @@ import static ee.jakarta.tck.security.test.client.defaulttests.OpenIdConfig.OPEN_ID_CONFIG_PROPERTIES; import static ee.jakarta.tck.security.test.client.defaulttests.OpenIdConfig.REDIRECT_URI; import static jakarta.ws.rs.core.Response.Status.NOT_FOUND; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.fail; import java.io.IOException; import java.net.URL; @@ -28,14 +28,14 @@ import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.OperateOnDeployment; import org.jboss.arquillian.container.test.api.RunAsClient; -import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.arquillian.test.api.ArquillianResource; import org.jboss.shrinkwrap.api.Archive; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.htmlunit.FailingHttpStatusCodeException; import org.htmlunit.WebClient; @@ -48,7 +48,7 @@ * @author Rudy De Busscher */ -@RunWith(Arquillian.class) +@ExtendWith(ArquillianExtension.class) public class InvalidRedirectURIIT { private WebClient webClient; @@ -57,7 +57,7 @@ public class InvalidRedirectURIIT { @ArquillianResource private URL base; - @Before + @BeforeEach public void init() { webClient = new WebClient(); } diff --git a/tck/app-openid/src/test/java/ee/jakarta/tck/security/test/OpenIdDefaultIT.java b/tck/app-openid/src/test/java/ee/jakarta/tck/security/test/OpenIdDefaultIT.java index 9e75fbde..949c6c1e 100644 --- a/tck/app-openid/src/test/java/ee/jakarta/tck/security/test/OpenIdDefaultIT.java +++ b/tck/app-openid/src/test/java/ee/jakarta/tck/security/test/OpenIdDefaultIT.java @@ -23,12 +23,12 @@ import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.OperateOnDeployment; import org.jboss.arquillian.container.test.api.RunAsClient; -import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.arquillian.test.api.ArquillianResource; import org.jboss.shrinkwrap.api.Archive; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.htmlunit.WebClient; @@ -38,7 +38,7 @@ * @author Rudy De Busscher */ -@RunWith(Arquillian.class) +@ExtendWith(ArquillianExtension.class) public class OpenIdDefaultIT { private WebClient webClient; @@ -47,7 +47,7 @@ public class OpenIdDefaultIT { @ArquillianResource private URL base; - @Before + @BeforeEach public void init() { webClient = new WebClient(); webClient.getOptions().setTimeout(0); diff --git a/tck/app-openid/src/test/java/ee/jakarta/tck/security/test/OpenIdTestUtil.java b/tck/app-openid/src/test/java/ee/jakarta/tck/security/test/OpenIdTestUtil.java index aa6f6e06..43094ef2 100644 --- a/tck/app-openid/src/test/java/ee/jakarta/tck/security/test/OpenIdTestUtil.java +++ b/tck/app-openid/src/test/java/ee/jakarta/tck/security/test/OpenIdTestUtil.java @@ -17,7 +17,7 @@ package ee.jakarta.tck.security.test; import static jakarta.ws.rs.core.Response.Status.OK; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.IOException; import java.net.URL; diff --git a/tck/app-openid/src/test/java/ee/jakarta/tck/security/test/OpenIdWithELIT.java b/tck/app-openid/src/test/java/ee/jakarta/tck/security/test/OpenIdWithELIT.java index efe359a4..bf78b81c 100644 --- a/tck/app-openid/src/test/java/ee/jakarta/tck/security/test/OpenIdWithELIT.java +++ b/tck/app-openid/src/test/java/ee/jakarta/tck/security/test/OpenIdWithELIT.java @@ -22,12 +22,12 @@ import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.OperateOnDeployment; import org.jboss.arquillian.container.test.api.RunAsClient; -import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.arquillian.test.api.ArquillianResource; import org.jboss.shrinkwrap.api.Archive; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.htmlunit.WebClient; @@ -35,7 +35,7 @@ * * @author Rudy De Busscher */ -@RunWith(Arquillian.class) +@ExtendWith(ArquillianExtension.class) public class OpenIdWithELIT { private WebClient webClient; @@ -44,7 +44,7 @@ public class OpenIdWithELIT { @ArquillianResource private URL base; - @Before + @BeforeEach public void init() { webClient = new WebClient(); } diff --git a/tck/app-openid2/src/test/java/ee/jakarta/tck/security/test/OpenId2DefaultIT.java b/tck/app-openid2/src/test/java/ee/jakarta/tck/security/test/OpenId2DefaultIT.java index 9063d24a..24b924b4 100644 --- a/tck/app-openid2/src/test/java/ee/jakarta/tck/security/test/OpenId2DefaultIT.java +++ b/tck/app-openid2/src/test/java/ee/jakarta/tck/security/test/OpenId2DefaultIT.java @@ -19,16 +19,16 @@ import static ee.jakarta.tck.security.test.Assert.assertAuthenticated; import static ee.jakarta.tck.security.test.Assert.assertDefaultNotAuthenticated; import static ee.jakarta.tck.security.test.ShrinkWrap.mavenWar; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.IOException; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.RunAsClient; -import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.shrinkwrap.api.Archive; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.htmlunit.TextPage; import org.htmlunit.WebResponse; @@ -42,7 +42,7 @@ * @author Rudy De Busscher * @author Arjan Tijms */ -@RunWith(Arquillian.class) +@ExtendWith(ArquillianExtension.class) public class OpenId2DefaultIT extends ArquillianBase { @Deployment(testable = false) diff --git a/tck/app-openid3/src/test/java/ee/jakarta/tck/security/test/OpenId3DefaultIT.java b/tck/app-openid3/src/test/java/ee/jakarta/tck/security/test/OpenId3DefaultIT.java index 60bd15d0..924a0012 100644 --- a/tck/app-openid3/src/test/java/ee/jakarta/tck/security/test/OpenId3DefaultIT.java +++ b/tck/app-openid3/src/test/java/ee/jakarta/tck/security/test/OpenId3DefaultIT.java @@ -24,10 +24,10 @@ import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.RunAsClient; -import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.shrinkwrap.api.Archive; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.htmlunit.TextPage; import org.htmlunit.html.HtmlPage; @@ -39,7 +39,7 @@ * @author Rudy De Busscher * @author Arjan Tijms */ -@RunWith(Arquillian.class) +@ExtendWith(ArquillianExtension.class) public class OpenId3DefaultIT extends ArquillianBase { @Deployment(testable = false) diff --git a/tck/app-securitycontext-auth/src/test/java/ee/jakarta/tck/security/test/AppSecurityContextAuthIT.java b/tck/app-securitycontext-auth/src/test/java/ee/jakarta/tck/security/test/AppSecurityContextAuthIT.java index 5c435ead..61f34dfc 100644 --- a/tck/app-securitycontext-auth/src/test/java/ee/jakarta/tck/security/test/AppSecurityContextAuthIT.java +++ b/tck/app-securitycontext-auth/src/test/java/ee/jakarta/tck/security/test/AppSecurityContextAuthIT.java @@ -19,16 +19,16 @@ import static ee.jakarta.tck.security.test.Assert.assertDefaultAuthenticated; import static ee.jakarta.tck.security.test.Assert.assertDefaultNotAuthenticated; import static ee.jakarta.tck.security.test.ShrinkWrap.mavenWar; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.shrinkwrap.api.Archive; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; -@RunWith(Arquillian.class) +@ExtendWith(ArquillianExtension.class) public class AppSecurityContextAuthIT extends ArquillianBase { @Deployment(testable = false) diff --git a/tck/app-securitycontext-authenticate/src/test/java/ee/jakarta/tck/security/test/AppSecurityContextAuthenticateIT.java b/tck/app-securitycontext-authenticate/src/test/java/ee/jakarta/tck/security/test/AppSecurityContextAuthenticateIT.java index 1396f1ad..bc256b4c 100644 --- a/tck/app-securitycontext-authenticate/src/test/java/ee/jakarta/tck/security/test/AppSecurityContextAuthenticateIT.java +++ b/tck/app-securitycontext-authenticate/src/test/java/ee/jakarta/tck/security/test/AppSecurityContextAuthenticateIT.java @@ -19,15 +19,15 @@ import static ee.jakarta.tck.security.test.Assert.assertAuthenticated; import static ee.jakarta.tck.security.test.ShrinkWrap.mavenWar; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.shrinkwrap.api.Archive; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; -@RunWith(Arquillian.class) +@ExtendWith(ArquillianExtension.class) public class AppSecurityContextAuthenticateIT extends ArquillianBase { @Deployment(testable = false) @@ -46,14 +46,14 @@ public void testSecurityContextAuthenticate() { String response = readFromServer("/servlet?name=reza&password=secret1"); assertTrue( - "SecurityContext.authenticate should have succeeded.\n" + response, - response.contains("Authentication successed")); + response.contains("Authentication successed"), + "SecurityContext.authenticate should have succeeded.\n" + response); assertAuthenticated("context", "reza", response, "foo", "bar"); assertTrue( - "Authenticated user should not have role \"kaz\".\n" + response, - response.contains("context user has role \"kaz\": false")); + response.contains("context user has role \"kaz\": false"), + "Authenticated user should not have role \"kaz\".\n" + response); } /** @@ -64,8 +64,8 @@ public void testSecurityContextAuthenticate_wrongCredential() { String response = readFromServer("/servlet?name=reza&password=wrongpwd"); assertTrue( - "SecurityContext.authenticate should have failed for wrong password.\n" + response, - response.contains("Authentication failed")); + response.contains("Authentication failed"), + "SecurityContext.authenticate should have failed for wrong password.\n" + response); } } diff --git a/tck/app-securitycontext-callerdata/src/test/java/ee/jakarta/tck/security/test/AppSecurityContextCallerDataIT.java b/tck/app-securitycontext-callerdata/src/test/java/ee/jakarta/tck/security/test/AppSecurityContextCallerDataIT.java index 4177306a..46943c76 100644 --- a/tck/app-securitycontext-callerdata/src/test/java/ee/jakarta/tck/security/test/AppSecurityContextCallerDataIT.java +++ b/tck/app-securitycontext-callerdata/src/test/java/ee/jakarta/tck/security/test/AppSecurityContextCallerDataIT.java @@ -18,16 +18,16 @@ package ee.jakarta.tck.security.test; import static ee.jakarta.tck.security.test.ShrinkWrap.mavenWar; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import org.htmlunit.DefaultCredentialsProvider; import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.shrinkwrap.api.Archive; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; -@RunWith(Arquillian.class) +@ExtendWith(ArquillianExtension.class) public class AppSecurityContextCallerDataIT extends ArquillianBase { @Deployment(testable = false) @@ -47,8 +47,8 @@ public void testSecurityContextIsCallerInRole() { String response = readFromServer("/servlet"); assertTrue( - "Response should report context username reza.\n" + response, - response.contains("context username: reza")); + response.contains("context username: reza"), + "Response should report context username reza.\n" + response); assertTrue(response.contains("context user has role \"foo\": true")); assertTrue(response.contains("context user has role \"bar\": true")); diff --git a/tck/app-securitycontext-customprincipal/src/test/java/ee/jakarta/tck/security/test/AppSecurityContextCallerPrincipalIT.java b/tck/app-securitycontext-customprincipal/src/test/java/ee/jakarta/tck/security/test/AppSecurityContextCallerPrincipalIT.java index 11678432..8606bc8c 100644 --- a/tck/app-securitycontext-customprincipal/src/test/java/ee/jakarta/tck/security/test/AppSecurityContextCallerPrincipalIT.java +++ b/tck/app-securitycontext-customprincipal/src/test/java/ee/jakarta/tck/security/test/AppSecurityContextCallerPrincipalIT.java @@ -17,15 +17,15 @@ package ee.jakarta.tck.security.test; import static ee.jakarta.tck.security.test.ShrinkWrap.mavenWar; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.shrinkwrap.api.Archive; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; -@RunWith(Arquillian.class) +@ExtendWith(ArquillianExtension.class) public class AppSecurityContextCallerPrincipalIT extends ArquillianBase { @Deployment(testable = false) diff --git a/tck/app-securitycontext-ejb/src/test/java/ee/jakarta/tck/security/test/AppSecurityContextEjbIT.java b/tck/app-securitycontext-ejb/src/test/java/ee/jakarta/tck/security/test/AppSecurityContextEjbIT.java index 39085340..451b048f 100644 --- a/tck/app-securitycontext-ejb/src/test/java/ee/jakarta/tck/security/test/AppSecurityContextEjbIT.java +++ b/tck/app-securitycontext-ejb/src/test/java/ee/jakarta/tck/security/test/AppSecurityContextEjbIT.java @@ -19,15 +19,15 @@ import static ee.jakarta.tck.security.test.Assert.assertAuthenticated; import static ee.jakarta.tck.security.test.ShrinkWrap.mavenWar; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.shrinkwrap.api.Archive; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; -@RunWith(Arquillian.class) +@ExtendWith(ArquillianExtension.class) public class AppSecurityContextEjbIT extends ArquillianBase { @Deployment(testable = false) @@ -46,14 +46,14 @@ public void testSecurityContextAvailableInEJB() { String response = readFromServer("/servlet?name=reza&password=secret1"); assertTrue( - "SecurityContext.authenticate (called from EJB) should have succeeded.\n" + response, - response.contains("Authentication successed")); + response.contains("Authentication successed"), + "SecurityContext.authenticate (called from EJB) should have succeeded.\n" + response); assertAuthenticated("context", "reza", response, "foo", "bar"); assertTrue( - "Authenticated user should not have role \"kaz\".\n" + response, - response.contains("context user has role \"kaz\": false")); + response.contains("context user has role \"kaz\": false"), + "Authenticated user should not have role \"kaz\".\n" + response); } @Test @@ -61,8 +61,8 @@ public void testSecurityContextAvailableInEJB_wrongCredential() { String response = readFromServer("/servlet?name=reza&password=wrongpwd"); assertTrue( - "SecurityContext.authenticate (called from EJB) should have failed for wrong password.\n" + response, - response.contains("Authentication failed")); + response.contains("Authentication failed"), + "SecurityContext.authenticate (called from EJB) should have failed for wrong password.\n" + response); } } diff --git a/tck/app-securitycontext-getprincipalsbytype/src/test/java/ee/jakarta/tck/security/test/AppSecurityContextGetPrincipalsByTypeIT.java b/tck/app-securitycontext-getprincipalsbytype/src/test/java/ee/jakarta/tck/security/test/AppSecurityContextGetPrincipalsByTypeIT.java index 75e02ae1..b1fca02d 100644 --- a/tck/app-securitycontext-getprincipalsbytype/src/test/java/ee/jakarta/tck/security/test/AppSecurityContextGetPrincipalsByTypeIT.java +++ b/tck/app-securitycontext-getprincipalsbytype/src/test/java/ee/jakarta/tck/security/test/AppSecurityContextGetPrincipalsByTypeIT.java @@ -18,15 +18,15 @@ package ee.jakarta.tck.security.test; import static ee.jakarta.tck.security.test.ShrinkWrap.mavenWar; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.shrinkwrap.api.Archive; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; -@RunWith(Arquillian.class) +@ExtendWith(ArquillianExtension.class) public class AppSecurityContextGetPrincipalsByTypeIT extends ArquillianBase { @Deployment(testable = false) @@ -46,16 +46,16 @@ public void testSecurityContextGetPrincipalsByType() { String response = readFromServer("/servlet?name=reza&password=secret1"); assertTrue( - "Response should report context username reza.\n" + response, - response.contains("context username: reza")); + response.contains("context username: reza"), + "Response should report context username reza.\n" + response); assertTrue( - "Response should report exactly one TestPrincipal in the principals set.\n" + response, - response.contains("PrincipalsSet size should be one: true")); + response.contains("PrincipalsSet size should be one: true"), + "Response should report exactly one TestPrincipal in the principals set.\n" + response); assertTrue( - "Response should report that the TestPrincipal in the set has the expected name.\n" + response, - response.contains("PrincipalsSet contains correct principal: true")); + response.contains("PrincipalsSet contains correct principal: true"), + "Response should report that the TestPrincipal in the set has the expected name.\n" + response); } } diff --git a/tck/app-securitycontext/src/test/java/ee/jakarta/tck/security/test/AppSecurityContextIT.java b/tck/app-securitycontext/src/test/java/ee/jakarta/tck/security/test/AppSecurityContextIT.java index 653feff1..3fa38700 100644 --- a/tck/app-securitycontext/src/test/java/ee/jakarta/tck/security/test/AppSecurityContextIT.java +++ b/tck/app-securitycontext/src/test/java/ee/jakarta/tck/security/test/AppSecurityContextIT.java @@ -19,16 +19,16 @@ import static ee.jakarta.tck.security.test.Assert.assertDefaultAuthenticated; import static ee.jakarta.tck.security.test.Assert.assertDefaultNotAuthenticated; import static ee.jakarta.tck.security.test.ShrinkWrap.mavenWar; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.shrinkwrap.api.Archive; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; -@RunWith(Arquillian.class) +@ExtendWith(ArquillianExtension.class) public class AppSecurityContextIT extends ArquillianBase { @Deployment(testable = false) @@ -75,9 +75,9 @@ public void testHasAccessToOtherURLAuthenticated() { String response = readFromServer("/servlet?name=reza&password=secret1"); assertTrue( - "SecurityContext should say authenticated caller has access to /protectedServlet, but says has not.", response.contains("has access to /protectedServlet: true") - ); + , + "SecurityContext should say authenticated caller has access to /protectedServlet, but says has not."); } @Test @@ -85,9 +85,9 @@ public void testHasNoAccessToOtherURLNotAuthenticated() { String response = readFromServer("/servlet"); assertTrue( - "SecurityContext should say authenticated caller has access to /protectedServlet, but says has not.", response.contains("has access to /protectedServlet: false") - ); + , + "SecurityContext should say authenticated caller has access to /protectedServlet, but says has not."); } //has access to /protectedServlet: true diff --git a/tck/common/pom.xml b/tck/common/pom.xml index 8f303a05..3405f3c5 100644 --- a/tck/common/pom.xml +++ b/tck/common/pom.xml @@ -39,15 +39,19 @@ - junit - junit - 4.13.2 + org.junit.jupiter + junit-jupiter provided - org.jboss.arquillian.junit - arquillian-junit-container + org.junit.platform + junit-platform-launcher + + + + org.jboss.arquillian.junit5 + arquillian-junit5-container provided diff --git a/tck/common/src/main/java/ee/jakarta/tck/security/test/ArquillianBase.java b/tck/common/src/main/java/ee/jakarta/tck/security/test/ArquillianBase.java index 8c7a497e..a9c469b3 100644 --- a/tck/common/src/main/java/ee/jakarta/tck/security/test/ArquillianBase.java +++ b/tck/common/src/main/java/ee/jakarta/tck/security/test/ArquillianBase.java @@ -28,11 +28,11 @@ import java.util.logging.Logger; import org.jboss.arquillian.test.api.ArquillianResource; -import org.junit.After; -import org.junit.Before; -import org.junit.Rule; -import org.junit.rules.TestWatcher; -import org.junit.runner.Description; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.extension.ExtendWith; +import org.junit.jupiter.api.extension.ExtensionContext; +import org.junit.jupiter.api.extension.TestWatcher; import org.htmlunit.DefaultCssErrorHandler; import org.htmlunit.FailingHttpStatusCodeException; @@ -40,6 +40,7 @@ import org.htmlunit.WebClient; import org.htmlunit.WebResponse; +@ExtendWith(ArquillianBase.FailedResponseLogger.class) public class ArquillianBase { private static final Logger logger = Logger.getLogger(ArquillianBase.class.getName()); @@ -51,26 +52,7 @@ public class ArquillianBase { @ArquillianResource private URL base; - @Rule - public TestWatcher ruleExample = new TestWatcher() { - @Override - protected void failed(Throwable e, Description description) { - super.failed(e, description); - - logger.log(SEVERE, - "\n\nTest failed: " + - description.getClassName() + "." + description.getMethodName() + - - "\nMessage: " + e.getMessage() + - - "\nLast response: " + - - "\n\n" + formatHTML(response) + "\n\n"); - - } - }; - - @Before + @BeforeEach public void setUp() { Logger logger = Logger.getLogger(DefaultCssErrorHandler.class.getName()); logger.setLevel(SEVERE); @@ -95,7 +77,7 @@ public void printContentIfNecessary(WebResponse webResponse) { } } - @After + @AfterEach public void tearDown() { webClient.getCookieManager().clearCookies(); webClient.close(); @@ -189,4 +171,25 @@ public static String formatHTML(String html) { } } + public static class FailedResponseLogger implements TestWatcher { + @Override + public void testFailed(ExtensionContext context, Throwable cause) { + Object instance = context.getTestInstance().orElse(null); + if (!(instance instanceof ArquillianBase)) { + return; + } + ArquillianBase test = (ArquillianBase) instance; + logger.log(SEVERE, + "\n\nTest failed: " + + context.getTestClass().map(Class::getName).orElse("?") + "." + + context.getTestMethod().map(java.lang.reflect.Method::getName).orElse("?") + + + "\nMessage: " + cause.getMessage() + + + "\nLast response: " + + + "\n\n" + formatHTML(test.response) + "\n\n"); + } + } + } diff --git a/tck/common/src/main/java/ee/jakarta/tck/security/test/Assert.java b/tck/common/src/main/java/ee/jakarta/tck/security/test/Assert.java index b874f1df..a24c5778 100644 --- a/tck/common/src/main/java/ee/jakarta/tck/security/test/Assert.java +++ b/tck/common/src/main/java/ee/jakarta/tck/security/test/Assert.java @@ -17,23 +17,23 @@ package ee.jakarta.tck.security.test; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; public final class Assert { public static void assertDefaultNoAccess(String response) { assertFalse( + response.contains("This is a servlet"), "Should not have access to servlet, but had access.\n" + - response, - response.contains("This is a servlet")); + response); } public static void assertDefaultAccess(String response) { assertTrue( + response.contains("This is a servlet"), "Should have access to servlet, but had no access.\n" + - response, - response.contains("This is a servlet")); + response); } public static void assertDefaultAuthenticated(String response) { @@ -46,29 +46,29 @@ public static void assertDefaultNotAuthenticated(String response) { public static void assertAuthenticated(String userType, String name, String response, String... roles) { assertTrue( + response.contains(userType + " username: " + name), "Should be authenticated as user " + name + " but was not \n Response: \n" + - response + "\n search: " + userType + " username: " + name, - response.contains(userType + " username: " + name)); + response + "\n search: " + userType + " username: " + name); for (String role : roles) { assertTrue( + response.contains(userType + " user has role \"" + role + "\": true"), "Authenticated user should have role \"" + role + "\", but did not \n Response: \n" + - response, - response.contains(userType + " user has role \"" + role + "\": true")); + response); } } public static void assertNotAuthenticated(String userType, String name, String response, String... roles) { assertFalse( + response.contains(userType + " username: " + name), "Should not be authenticated as user " + name + " but was \n Response: \n" + - response + "\n search: " + userType + " username: " + name, - response.contains(userType + " username: " + name)); + response + "\n search: " + userType + " username: " + name); for (String role : roles) { assertFalse( + response.contains(userType + " user has role \"" + role + "\": true"), "Authenticated user should not have role \"" + role + "\", but did \n Response: \n" + - response, - response.contains(userType + " user has role \"" + role + "\": true")); + response); } } diff --git a/tck/common/src/main/java/ee/jakarta/tck/security/test/ProgressListener.java b/tck/common/src/main/java/ee/jakarta/tck/security/test/ProgressListener.java new file mode 100644 index 00000000..874d11b2 --- /dev/null +++ b/tck/common/src/main/java/ee/jakarta/tck/security/test/ProgressListener.java @@ -0,0 +1,128 @@ +/* + * Copyright (c) 2026 Contributors to Eclipse Foundation. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v. 2.0, which is available at + * http://www.eclipse.org/legal/epl-2.0. + * + * This Source Code may also be made available under the following Secondary + * Licenses when the conditions for such availability set forth in the + * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, + * version 2 with the GNU Classpath Exception, which is available at + * https://www.gnu.org/software/classpath/license.html. + * + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 + */ +package ee.jakarta.tck.security.test; + +import java.util.Optional; +import java.util.concurrent.atomic.AtomicInteger; + +import org.junit.platform.engine.TestExecutionResult; +import org.junit.platform.engine.support.descriptor.ClassSource; +import org.junit.platform.engine.support.descriptor.MethodSource; +import org.junit.platform.launcher.TestExecutionListener; +import org.junit.platform.launcher.TestIdentifier; +import org.junit.platform.launcher.TestPlan; + +/** + * One line per test event, tagged with the GlassFish pool slot the + * failsafe-fork JVM is leasing and the per-JVM progress counter (with + * {@code reuseForks=false} that maps 1:1 to "test N of M within this IT + * class"). On failure the full stack trace is printed inline so the build + * log is sufficient even when {@code target/failsafe-reports} is incomplete + * (e.g. build aborted before the surefire writer ran). + * + *

Output format (white brackets, bold colour for the status word, slot, + * module and progress): + * 

+ *   [RUNNING][SLOT1][app-mem-basic][1/3] AppMemBasicIT#testAuthenticated()
+ *   [SKIPPED][SLOT3][app-db][4/9] AppDBIT#test  reason: liberty server
+ *   [FAILED][SLOT3][app-ham-basic][5/12] AppHamBasicIT#test  exception: org.opentest4j.AssertionFailedError: expected: <foo> but was: <bar>
+ *
+ */ +public class ProgressListener implements TestExecutionListener { + + private static final String WHITE = "\u001B[37m"; + private static final String BOLD_GREEN = "\u001B[1;32m"; + private static final String BOLD_YELLOW = "\u001B[1;33m"; + private static final String BOLD_RED = "\u001B[1;31m"; + private static final String RESET = "\u001B[0m"; + + private final AtomicInteger progress = new AtomicInteger(); + private int total; + private String module; + + @Override + public void testPlanExecutionStarted(TestPlan testPlan) { + total = (int) testPlan.countTestIdentifiers(TestIdentifier::isTest); + // The root pom passes ${project.build.finalName} as a system property to + // every failsafe fork (see pom.xml maven-failsafe-plugin config). The + // "test-" prefix is repo convention, not information — strip it so the + // tag stays compact. Vendor distributions that don't pass finalName get + // no module segment (graceful degradation, same as the slot bracket). + var finalName = System.getProperty("finalName"); + if (finalName != null && finalName.startsWith("test-")) { + module = finalName.substring("test-".length()); + } else { + module = finalName; + } + } + + @Override + public void executionStarted(TestIdentifier id) { + if (id.isTest()) { + System.out.println(tag(BOLD_GREEN, "RUNNING", progress.incrementAndGet()) + " " + label(id)); + } + } + + @Override + public void executionSkipped(TestIdentifier id, String reason) { + if (id.isTest()) { + System.out.println(tag(BOLD_YELLOW, "SKIPPED", progress.incrementAndGet()) + " " + label(id) + " reason: " + reason); + } + } + + @Override + public void executionFinished(TestIdentifier id, TestExecutionResult result) { + if (!id.isTest()) { + return; + } + if (result.getStatus() == TestExecutionResult.Status.SUCCESSFUL) { + return; + } + + var out = new StringBuilder(tag(BOLD_RED, "FAILED", progress.get())).append(' ').append(label(id)); + result.getThrowable().ifPresent(t -> out.append(" exception: ").append(t.toString())); + System.out.println(out); + } + + private String tag(String color, String status, int n) { + var slot = System.getProperty("gf.pool.slot"); + var sb = new StringBuilder().append(WHITE).append('[').append(color).append(status).append(WHITE).append(']'); + if (slot != null) { + sb.append('[').append(color).append("SLOT").append(slot).append(WHITE).append(']'); + } + if (module != null) { + sb.append('[').append(color).append(module).append(WHITE).append(']'); + } + if (total > 0) { + sb.append('[').append(color).append(n).append('/').append(total).append(WHITE).append(']'); + } + return sb.append(RESET).toString(); + } + + private static String label(TestIdentifier id) { + var className = id.getSource().flatMap(s -> { + if (s instanceof ClassSource cs) return Optional.of(simple(cs.getClassName())); + if (s instanceof MethodSource ms) return Optional.of(simple(ms.getClassName())); + return Optional.empty(); + }); + return className.map(c -> c + "#" + id.getDisplayName()).orElse(id.getDisplayName()); + } + + private static String simple(String fqn) { + int dot = fqn.lastIndexOf('.'); + return dot < 0 ? fqn : fqn.substring(dot + 1); + } +} diff --git a/tck/common/src/main/resources/META-INF/services/org.junit.platform.launcher.TestExecutionListener b/tck/common/src/main/resources/META-INF/services/org.junit.platform.launcher.TestExecutionListener new file mode 100644 index 00000000..cb107812 --- /dev/null +++ b/tck/common/src/main/resources/META-INF/services/org.junit.platform.launcher.TestExecutionListener @@ -0,0 +1 @@ +ee.jakarta.tck.security.test.ProgressListener diff --git a/tck/pom.xml b/tck/pom.xml index f7d8c976..b5fb56c1 100644 --- a/tck/pom.xml +++ b/tck/pom.xml @@ -192,6 +192,7 @@ ${project.basedir}/LICENSE_EFTL.md 5.0.0-SNAPSHOT 1.10.1.Final + 5.11.4 9.0.0-SNAPSHOT @@ -242,6 +243,13 @@ pom import + + org.junit + junit-bom + ${junit.version} + pom + import + org.jboss.arquillian.container arquillian-container-test-api @@ -365,15 +373,14 @@ - junit - junit - 4.13.2 + org.junit.jupiter + junit-jupiter test - org.jboss.arquillian.junit - arquillian-junit-container + org.jboss.arquillian.junit5 + arquillian-junit5-container test