[cxf-fediz] branch coheigea/ldap updated (797ab897 -> 7832e0f3)

[co...@apache.org]

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

coheigea pushed a change to branch coheigea/ldap
in repository https://gitbox.apache.org/repos/asf/cxf-fediz.git


    omit 797ab897 Re-enablign LDAP tests following Apache DS upgrade
     new 7832e0f3 Re-enablign LDAP tests following Apache DS upgrade

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (797ab897)
            \
             N -- N -- N   refs/heads/coheigea/ldap (7832e0f3)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:

[cxf-fediz] 01/01: Re-enablign LDAP tests following Apache DS upgrade

[co...@apache.org]

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 7832e0f3f721f292eae56cb487503e2c5488df77
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>