You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by sm...@apache.org on 2025/06/29 00:00:38 UTC
(directory-fortress-core) branch FC-332 updated: Fix broken ApacheDS tests
This is an automated email from the ASF dual-hosted git repository.
smckinney pushed a commit to branch FC-332
in repository https://gitbox.apache.org/repos/asf/directory-fortress-core.git
The following commit(s) were added to refs/heads/FC-332 by this push:
new ebf9ec27 Fix broken ApacheDS tests
ebf9ec27 is described below
commit ebf9ec273e56be2ba74f8cc4c2694df3ebb2b956
Author: Shawn McKinney <sm...@apache.org>
AuthorDate: Sat Jun 28 19:00:26 2025 -0500
Fix broken ApacheDS tests
---
pom.xml | 112 +++++++++++++++++++++
.../fortress/core/impl/AccessMgrImplTest.java | 2 +-
.../core/impl/apacheds/AdminManagerTest.java | 2 +-
.../impl/apacheds/FortressJUnitApachedsTest.java | 16 ++-
4 files changed, 121 insertions(+), 11 deletions(-)
diff --git a/pom.xml b/pom.xml
index 7bd0338e..543adf59 100644
--- a/pom.xml
+++ b/pom.xml
@@ -104,12 +104,31 @@
<groupId>org.apache.directory.api</groupId>
<artifactId>api-all</artifactId>
<version>${version.ldap.api}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.directory.api</groupId>
+ <artifactId>api-ldap-schema-data</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
+ <!--
+ jar:file:/home/smckinn/.m2/repository/org/apache/directory/api/api-all/2.1.7/api-all-2.1.7.jar!/schema/ou%3dschema/cn%3dapachedns/ou%3dobjectclasses/m-oid%3d1.3.6.1.4.1.18060.0.4.2.3.9.ldif
+ jar:file:/home/smckinn/.m2/repository/org/apache/directory/api/api-ldap-schema-data/2.1.5/api-ldap-schema-data-2.1.5.jar!/schema/ou%3dschema/cn%3dapachedns/ou%3dobjectclasses/m-oid%3d1.3.6.1.4.1.18060.0.4.2.3.9.ldif
+ -->
+
<dependency>
<groupId>org.apache.directory.api</groupId>
<artifactId>api-ldap-extras-codec</artifactId>
<version>${version.ldap.api}</version>
+<!--
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.directory.api</groupId>
+ <artifactId>api-ldap-schema-data</artifactId>
+ </exclusion>
+ </exclusions>
+-->
</dependency>
<dependency>
@@ -209,6 +228,12 @@
<artifactId>apacheds-core</artifactId>
<version>${version.apacheds}</version>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.directory.api</groupId>
+ <artifactId>api-ldap-schema-data</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -216,6 +241,12 @@
<artifactId>apacheds-core-annotations</artifactId>
<version>${version.apacheds}</version>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.directory.api</groupId>
+ <artifactId>api-ldap-schema-data</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -223,6 +254,12 @@
<artifactId>apacheds-core-api</artifactId>
<version>${version.apacheds}</version>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.directory.api</groupId>
+ <artifactId>api-ldap-schema-data</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -265,6 +302,12 @@
<artifactId>apacheds-jdbm-partition</artifactId>
<version>${version.apacheds}</version>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.directory.api</groupId>
+ <artifactId>api-ldap-schema-data</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -293,6 +336,12 @@
<artifactId>apacheds-ldif-partition</artifactId>
<version>${version.apacheds}</version>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.directory.api</groupId>
+ <artifactId>api-ldap-schema-data</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -300,6 +349,12 @@
<artifactId>apacheds-protocol-dhcp</artifactId>
<version>${version.apacheds}</version>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.directory.api</groupId>
+ <artifactId>api-ldap-schema-data</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -307,6 +362,12 @@
<artifactId>apacheds-protocol-dns</artifactId>
<version>${version.apacheds}</version>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.directory.api</groupId>
+ <artifactId>api-ldap-schema-data</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -314,6 +375,12 @@
<artifactId>apacheds-protocol-ldap</artifactId>
<version>${version.apacheds}</version>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.directory.api</groupId>
+ <artifactId>api-ldap-schema-data</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -321,6 +388,12 @@
<artifactId>apacheds-protocol-ntp</artifactId>
<version>${version.apacheds}</version>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.directory.api</groupId>
+ <artifactId>api-ldap-schema-data</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -328,6 +401,12 @@
<artifactId>apacheds-protocol-shared</artifactId>
<version>${version.apacheds}</version>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.directory.api</groupId>
+ <artifactId>api-ldap-schema-data</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -335,6 +414,12 @@
<artifactId>apacheds-server-annotations</artifactId>
<version>${version.apacheds}</version>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.directory.api</groupId>
+ <artifactId>api-ldap-schema-data</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -342,6 +427,12 @@
<artifactId>apacheds-server-config</artifactId>
<version>${version.apacheds}</version>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.directory.api</groupId>
+ <artifactId>api-ldap-schema-data</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -349,6 +440,12 @@
<artifactId>apacheds-server-jndi</artifactId>
<version>${version.apacheds}</version>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.directory.api</groupId>
+ <artifactId>api-ldap-schema-data</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -356,6 +453,12 @@
<artifactId>apacheds-test-framework</artifactId>
<version>${version.apacheds}</version>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.directory.api</groupId>
+ <artifactId>api-ldap-schema-data</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -363,6 +466,12 @@
<artifactId>apacheds-xdbm-partition</artifactId>
<version>${version.apacheds}</version>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.directory.api</groupId>
+ <artifactId>api-ldap-schema-data</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -685,6 +794,9 @@
<testResource>
<directory>${project.basedir}/config</directory>
</testResource>
+ <testResource>
+ <directory>${project.basedir}/src/test/resources</directory>
+ </testResource>
</testResources>
</build>
diff --git a/src/test/java/org/apache/directory/fortress/core/impl/AccessMgrImplTest.java b/src/test/java/org/apache/directory/fortress/core/impl/AccessMgrImplTest.java
index a35cb8c3..0aaffa56 100755
--- a/src/test/java/org/apache/directory/fortress/core/impl/AccessMgrImplTest.java
+++ b/src/test/java/org/apache/directory/fortress/core/impl/AccessMgrImplTest.java
@@ -1056,7 +1056,7 @@ public class AccessMgrImplTest extends TestCase
RoleTestData.DSD_T4_B );
addActiveRolesDSD( "ADD-ACT-RLS-USRS_DSDT5B TU10 DSD_T5_B", UserTestData.USERS_TU10_SSD_HIER,
RoleTestData.DSD_T5_B );
- addActiveRolesDSD( "ADD-ACT-RLS-USRS_DSDT6B TU11 DSD_T6_B", UserTestData.USERS_TU11_SSD_HIER,
+ addActiveRolesDSD( "ADD-ACT-RLS-USRS_DSDT6B TU11 DSD_T6_D", UserTestData.USERS_TU11_SSD_HIER,
RoleTestData.DSD_T6_D );
}
diff --git a/src/test/java/org/apache/directory/fortress/core/impl/apacheds/AdminManagerTest.java b/src/test/java/org/apache/directory/fortress/core/impl/apacheds/AdminManagerTest.java
index b37c781c..691678db 100644
--- a/src/test/java/org/apache/directory/fortress/core/impl/apacheds/AdminManagerTest.java
+++ b/src/test/java/org/apache/directory/fortress/core/impl/apacheds/AdminManagerTest.java
@@ -60,7 +60,7 @@ import org.apache.directory.fortress.core.util.cache.CacheMgr;
@CreateTransport(protocol = "LDAP", port = 10389)
})
@ApplyLdifFiles(
- { "apacheds-fortress.ldif", "init-ldap.ldif"/*, "test-data.ldif"*/})
+ { "fortress-schema.ldif", "init-ldap.ldif"/*, "test-data.ldif"*/})
public class AdminManagerTest extends AbstractLdapTestUnit
{
private static final Logger LOG = LoggerFactory.getLogger( AdminManagerTest.class.getName() );
diff --git a/src/test/java/org/apache/directory/fortress/core/impl/apacheds/FortressJUnitApachedsTest.java b/src/test/java/org/apache/directory/fortress/core/impl/apacheds/FortressJUnitApachedsTest.java
index f1d70b72..b3cb167d 100644
--- a/src/test/java/org/apache/directory/fortress/core/impl/apacheds/FortressJUnitApachedsTest.java
+++ b/src/test/java/org/apache/directory/fortress/core/impl/apacheds/FortressJUnitApachedsTest.java
@@ -2126,15 +2126,13 @@ public class FortressJUnitApachedsTest extends AbstractLdapTestUnit
// The test itself
// public boolean checkAccess(String object, String operation, Session session)
- AccessMgrImplTest.checkAccess( "CHCK-ACS TU1_UPD TO1 TOP1 ", UserTestData.USERS_TU1_UPD,
+ AccessMgrImplTest.checkAccess( "CHCK-ACS TU1_UPD TO1 TOP1", UserTestData.USERS_TU1_UPD,
PermTestData.OBJS_TOB1,
PermTestData.OPS_TOP1, PermTestData.OBJS_TOB3, PermTestData.OPS_TOP3 );
- AccessMgrImplTest.checkAccess( "CHCK-ACS TU3 TO3 TOP1 ", UserTestData.USERS_TU3, PermTestData.OBJS_TOB3,
- PermTestData.OPS_TOP3,
- PermTestData.OBJS_TOB2, PermTestData.OPS_TOP1 );
- AccessMgrImplTest.checkAccess( "CHCK-ACS TU4 TO4 TOP1 ", UserTestData.USERS_TU4, PermTestData.OBJS_TOB2,
- PermTestData.OPS_TOP2,
- PermTestData.OBJS_TOB2, PermTestData.OPS_TOP1 );
+ AccessMgrImplTest.checkAccess( "CHCK-ACS TU3 TO3 TOP3", UserTestData.USERS_TU3, PermTestData.OBJS_TOB3, PermTestData.OPS_TOP3,
+ PermTestData.OBJS_TOB2, PermTestData.OPS_TOP2 );
+ AccessMgrImplTest.checkAccess( "CHCK-ACS TU4 TO4 TOP1 ", UserTestData.USERS_TU4, PermTestData.OBJS_TOB2, PermTestData.OPS_TOP2,
+ PermTestData.OBJS_TOB3, PermTestData.OPS_TOP3 );
}
@@ -2203,8 +2201,8 @@ public class FortressJUnitApachedsTest extends AbstractLdapTestUnit
RoleTestData.DSD_T4_B );
AccessMgrImplTest.addActiveRolesDSD( "ADD-ACT-RLS-USRS_DSDT5B TU10 DSD_T5_B", UserTestData.USERS_TU10_SSD_HIER,
RoleTestData.DSD_T5_B );
- AccessMgrImplTest.addActiveRolesDSD( "ADD-ACT-RLS-USRS_DSDT6B TU11 DSD_T6_B", UserTestData.USERS_TU11_SSD_HIER,
- RoleTestData.DSD_T6_B );
+ AccessMgrImplTest.addActiveRolesDSD( "ADD-ACT-RLS-USRS_DSDT6B TU11 DSD_T6_D", UserTestData.USERS_TU11_SSD_HIER,
+ RoleTestData.DSD_T6_D );
}