Skip to content
Permalink
Browse files
Re-enable OSGi tests (PAX exam does not yet support JUnit 5), fix mis…
…sing imports, add test for PasswordModifyRequest
  • Loading branch information
seelmann committed Mar 18, 2020
1 parent bd9067e commit 053ffce61728fbe0d6eef0742433a88d38d560c3
Showing 8 changed files with 22 additions and 16 deletions.
@@ -92,14 +92,9 @@
</dependency>

<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-runner</artifactId>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13</version>
<scope>test</scope>
</dependency>

@@ -176,13 +171,6 @@
<reuseForks>false</reuseForks>
<forkedProcessExitTimeoutInSeconds>1</forkedProcessExitTimeoutInSeconds>
<rerunFailingTestsCount>1</rerunFailingTestsCount>
<parallel>all</parallel>
<threadCount>10</threadCount>
<properties>
<configurationParameters>
junit.jupiter.execution.parallel.enabled=true
</configurationParameters>
</properties>
</configuration>
</plugin>
<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
@@ -29,6 +29,8 @@
import org.apache.directory.api.ldap.extras.controls.passwordExpired.PasswordExpiredResponse;
import org.apache.directory.api.ldap.extras.controls.ppolicy.PasswordPolicyRequest;
import org.apache.directory.api.ldap.extras.controls.ppolicy.PasswordPolicyResponse;
import org.apache.directory.api.ldap.extras.extended.pwdModify.PasswordModifyRequest;
import org.apache.directory.api.ldap.extras.extended.pwdModify.PasswordModifyResponse;
import org.apache.directory.api.ldap.extras.extended.startTls.StartTlsRequest;
import org.apache.directory.api.ldap.extras.extended.startTls.StartTlsResponse;
import org.apache.directory.api.ldap.extras.intermediate.syncrepl.SyncInfoValue;
@@ -81,6 +83,16 @@ protected void useBundleClasses() throws Exception
assertNotNull( startTlsResponse );
assertTrue( startTlsResponse instanceof StartTlsResponse );

ExtendedRequest modifyPasswordRequest = ldapApiService.getExtendedRequestFactories()
.get( PasswordModifyRequest.EXTENSION_OID ).newRequest();
assertNotNull( modifyPasswordRequest );
assertTrue( modifyPasswordRequest instanceof PasswordModifyRequest );

ExtendedResponse passwordModifyResponse = ldapApiService.getExtendedResponseFactories()
.get( PasswordModifyRequest.EXTENSION_OID ).newResponse();
assertNotNull( passwordModifyResponse );
assertTrue( passwordModifyResponse instanceof PasswordModifyResponse );

ExtendedResponse noticeOfDisconnectResponse = ldapApiService.getExtendedResponseFactories()
.get( NoticeOfDisconnect.EXTENSION_OID ).newResponse();
assertNotNull( noticeOfDisconnectResponse );
@@ -99,6 +99,7 @@
</Export-Package>
<Import-Package>
antlr;version=${antlr.version},
antlr.collections.impl;version=${antlr.version},
org.apache.directory.api.i18n;version=${project.version},
org.apache.directory.api.ldap.model.constants;version=${project.version},
org.apache.directory.api.ldap.model.entry;version=${project.version},
@@ -165,7 +165,6 @@
org.apache.directory.api.ldap.extras.extended.whoAmI;version=${project.version},
org.apache.directory.api.ldap.extras.intermediate.syncrepl;version=${project.version},
org.apache.directory.api.ldap.model.exception;version=${project.version},
org.apache.directory.api.ldap.model.exception;version=${project.version},
org.apache.directory.api.ldap.model.message;version=${project.version},
org.apache.directory.api.ldap.model.message.extended;version=${project.version},
org.apache.directory.api.ldap.model.name;version=${project.version},
@@ -103,6 +103,7 @@
</Export-Package>
<Import-Package>
antlr;version=${antlr.version},
antlr.collections.impl;version=${antlr.version},
javax.naming,
javax.naming.directory,
javax.naming.ldap,
@@ -193,6 +193,7 @@
</Export-Package>
<Import-Package>
antlr;version=${antlr.version},
antlr.collections.impl;version=${antlr.version},
javax.crypto,
javax.crypto.spec,
javax.naming,
@@ -126,6 +126,7 @@
</Export-Package>
<Import-Package>
antlr;version=${antlr.version},
antlr.collections.impl;version=${antlr.version},
org.apache.commons.lang3.exception;version=${commons.lang.version},
org.apache.directory.api.i18n;version=${project.version},
org.apache.directory.api.ldap.model.constants;version=${project.version},
@@ -155,16 +155,19 @@
<Import-Package>
org.apache.directory.api.asn1.util;version=${project.version},
org.apache.directory.api.i18n;version=${project.version},
org.apache.directory.api.ldap.aci;version=${project.version},
org.apache.directory.api.ldap.model.constants;version=${project.version},
org.apache.directory.api.ldap.model.entry;version=${project.version},
org.apache.directory.api.ldap.model.exception;version=${project.version},
org.apache.directory.api.ldap.model.ldif;version=${project.version},
org.apache.directory.api.ldap.model.message;version=${project.version},
org.apache.directory.api.ldap.model.name;version=${project.version},
org.apache.directory.api.ldap.model.schema;version=${project.version},
org.apache.directory.api.ldap.model.schema.comparators;version=${project.version},
org.apache.directory.api.ldap.model.schema.normalizers;version=${project.version},
org.apache.directory.api.ldap.model.schema.parsers;version=${project.version},
org.apache.directory.api.ldap.model.schema.registries;version=${project.version},
org.apache.directory.api.ldap.model.schema.syntaxCheckers;version=${project.version},
org.apache.directory.api.util;version=${project.version},
org.slf4j;version=${slf4j.api.bundleversion}
</Import-Package>

0 comments on commit 053ffce

Please sign in to comment.