You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2023/10/24 02:37:56 UTC
[cxf-fediz] 01/01: Re-enablign LDAP tests following Apache DS upgrade
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch coheigea/ldap
in repository https://gitbox.apache.org/repos/asf/cxf-fediz.git
commit 797ab897a57223f54e371de747f465213ec8b9cf
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Tue Oct 24 03:37:36 2023 +0100
Re-enablign LDAP tests following Apache DS upgrade
---
.../java/org/apache/cxf/fediz/systests/ldap/LDAPTest.java | 12 +++++-------
systests/pom.xml | 2 +-
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/systests/ldap/src/test/java/org/apache/cxf/fediz/systests/ldap/LDAPTest.java b/systests/ldap/src/test/java/org/apache/cxf/fediz/systests/ldap/LDAPTest.java
index 6a4989ba..8a70880b 100644
--- a/systests/ldap/src/test/java/org/apache/cxf/fediz/systests/ldap/LDAPTest.java
+++ b/systests/ldap/src/test/java/org/apache/cxf/fediz/systests/ldap/LDAPTest.java
@@ -41,22 +41,20 @@ import org.apache.directory.server.core.annotations.CreateDS;
import org.apache.directory.server.core.annotations.CreateIndex;
import org.apache.directory.server.core.annotations.CreatePartition;
import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
-import org.apache.directory.server.core.integ.FrameworkRunner;
+import org.apache.directory.server.core.integ.ApacheDSTestExtension;
import org.apache.wss4j.dom.engine.WSSConfig;
-import org.apache.directory.server.core.integ.ApacheDSTestExtension;
-import org.junit.jupiter.api.After;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Before;
+import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.api.extension.ExtendWith;
/**
* A test that configures the STS to authenticate user (and retrieve claims) from an LDAP backend.
*/
-@ExtendWith( { ApacheDSTestExtension.class } )
+@ExtendWith({ ApacheDSTestExtension.class })
//Define the DirectoryService
@CreateDS(name = "LDAPTest-class",
@@ -95,7 +93,7 @@ public class LDAPTest extends AbstractLdapTestUnit {
private static Tomcat rpServer;
private static boolean portUpdated;
- @Before
+ @BeforeEach
public void init() throws Exception {
idpHttpsPort = System.getProperty("idp.https.port");
Assertions.assertNotNull("Property 'idp.https.port' null", idpHttpsPort);
diff --git a/systests/pom.xml b/systests/pom.xml
index beae4672..965f9d6e 100644
--- a/systests/pom.xml
+++ b/systests/pom.xml
@@ -41,7 +41,7 @@
<module>cxf</module>
<module>federation</module>
<module>kerberos</module>
- <!--<module>ldap</module>-->
+ <module>ldap</module>
<module>oidc</module>
<module>samlsso</module>
</modules>