You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2021/04/26 21:42:51 UTC
[directory-server] branch master updated (d9cc0d0 -> 26f92a1)
This is an automated email from the ASF dual-hosted git repository.
elecharny pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/directory-server.git.
from d9cc0d0 More junit 5 updates
new 08ef62b Migrated to Junit5
new c73020d Switch to Junit 5
new 26f92a1 Switched to junit 5
The 3 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:
core-annotations/pom.xml | 5 +
.../server/core/factory/DSAnnotationProcessor.java | 37 +-
core-integ/pom.xml | 12 +
.../core/admin/AdministrativePointServiceIT.java | 28 +-
.../core/api/LdapCoreSessionConnectionTest.java | 14 +-
.../server/core/authn/SimpleAuthenticationIT.java | 18 +-
.../server/core/authz/AddAuthorizationIT.java | 16 +-
.../server/core/authz/AdministratorsGroupIT.java | 20 +-
.../core/authz/AuthorizationServiceAsAdminIT.java | 37 +-
.../authz/AuthorizationServiceAsNonAdminIT.java | 14 +-
.../directory/server/core/authz/AuthzAuthnIT.java | 22 +-
.../server/core/authz/AutzIntegUtils.java | 2 +-
.../server/core/authz/CompareAuthorizationIT.java | 20 +-
.../server/core/authz/DeleteAuthorizationIT.java | 20 +-
.../server/core/authz/GeneralAuthorizationIT.java | 18 +-
.../server/core/authz/LookupAuthorizationIT.java | 20 +-
.../server/core/authz/ModifyAuthorizationIT.java | 20 +-
.../core/authz/MoveRenameAuthorizationIT.java | 20 +-
.../server/core/authz/SearchAuthorizationIT.java | 32 +-
.../core/authz/support/MaxImmSubFilterIT.java | 19 +-
.../server/core/changelog/DefaultChangeLogIT.java | 20 +-
.../core/changelog/MemoryChangeLogStoreTest.java | 10 +-
.../collective/CollectiveAttributeServiceIT.java | 111 ++---
.../configuration/PartitionConfigurationIT.java | 13 +-
.../server/core/event/EventServiceIT.java | 10 +-
.../server/core/exception/ExceptionServiceIT.java | 107 ++---
.../directory/server/core/jndi/AddJndiIT.java | 16 +-
.../server/core/jndi/CreateContextIT.java | 18 +-
.../directory/server/core/jndi/DIRSERVER169IT.java | 12 +-
.../directory/server/core/jndi/DIRSERVER791IT.java | 22 +-
.../server/core/jndi/DestroyContextIT.java | 149 ++++---
.../server/core/jndi/ExtensibleObjectIT.java | 14 +-
.../apache/directory/server/core/jndi/ListIT.java | 14 +-
.../directory/server/core/jndi/MixedCaseIT.java | 38 +-
.../server/core/jndi/ModifyContextIT.java | 36 +-
.../server/core/jndi/ObjStateFactoryIT.java | 12 +-
.../directory/server/core/jndi/RFC2713IT.java | 14 +-
.../directory/server/core/jndi/ReferralIT.java | 20 +-
.../directory/server/core/jndi/RootDSEJndiIT.java | 16 +-
.../server/core/jndi/SimpleBindJndiIT.java | 41 +-
.../directory/server/core/jndi/UniqueMemberIT.java | 24 +-
.../server/core/jndi/referral/AddReferralIT.java | 20 +-
.../core/jndi/referral/CompareReferralIT.java | 20 +-
.../core/jndi/referral/DeleteReferralIT.java | 18 +-
.../core/jndi/referral/ModifyReferralIT.java | 20 +-
.../jndi/referral/MoveAndRenameReferralIT.java | 20 +-
.../server/core/jndi/referral/MoveReferralIT.java | 20 +-
.../core/jndi/referral/RenameReferralIT.java | 20 +-
.../core/jndi/referral/RenameReferralIgnoreIT.java | 18 +-
.../core/jndi/referral/SearchReferralIT.java | 20 +-
.../core/normalization/NormalizationServiceIT.java | 12 +-
.../operational/OperationalAttributeServiceIT.java | 74 ++--
.../core/operations/add/AddAfterShutdownIT.java | 14 +-
.../server/core/operations/add/AddIT.java | 14 +-
.../server/core/operations/add/AddPerfIT.java | 8 +-
.../core/operations/add/ConcurrentAddSearchIT.java | 12 +-
.../server/core/operations/add/DIRSERVER169IT.java | 77 ++--
.../server/core/operations/add/DIRSERVER783IT.java | 10 +-
.../add/PasswordHashingInterceptorTest.java | 14 +-
.../server/core/operations/bind/SimpleBindIT.java | 75 ++--
.../operations/compare/CompareDirserver1139IT.java | 18 +-
.../core/operations/compare/ComparePerfIT.java | 8 +-
.../core/operations/delete/DeletePerfIT.java | 8 +-
.../server/core/operations/exists/ExistsIT.java | 20 +-
.../core/operations/getRootDse/GetRootDseIT.java | 18 +-
.../operations/getRootDse/GetRootDsePerfIT.java | 10 +-
.../core/operations/hasEntry/hasEntryPerfIT.java | 10 +-
.../server/core/operations/lookup/LookupIT.java | 26 +-
.../core/operations/lookup/LookupPerfIT.java | 14 +-
.../server/core/operations/modify/ModifyAddIT.java | 300 ++++++++------
.../server/core/operations/modify/ModifyDelIT.java | 178 ++++----
.../core/operations/modify/ModifyIncrementIT.java | 10 +-
.../operations/modify/ModifyMVAttributeIT.java | 14 +-
.../core/operations/modify/ModifyMemberIT.java | 12 +-
.../operations/modify/ModifyMultipleChangesIT.java | 14 +-
.../core/operations/modify/ModifyPerfIT.java | 8 +-
.../server/core/operations/move/MoveIT.java | 18 +-
.../server/core/operations/move/MovePerfIT.java | 8 +-
.../operations/moveAndRename/MoveAndRenameIT.java | 24 +-
.../moveAndRename/MoveAndRenamePerfIT.java | 12 +-
.../server/core/operations/rename/RenameIT.java | 22 +-
.../core/operations/rename/RenamePerfIT.java | 8 +-
.../core/operations/search/AliasSearchIT.java | 40 +-
.../core/operations/search/DIRSERVER759IT.java | 14 +-
.../core/operations/search/SearchBinaryIT.java | 14 +-
.../server/core/operations/search/SearchIT.java | 154 ++++---
.../operations/search/SearchMavibotPerfIT.java | 8 +-
.../core/operations/search/SearchPerfIT.java | 10 +-
.../operations/search/SearchWithAddDelete.java | 15 +-
.../search/SearchWithIndexedMVAttributeIT.java | 14 +-
.../operations/search/SearchWithIndicesIT.java | 20 +-
.../search/SearchWithIndicesPersonIT.java | 14 +-
.../core/operations/search/SortedSearchIT.java | 24 +-
.../server/core/partition/PartitionIT.java | 14 +-
.../core/schema/MetaAttributeTypeHandlerIT.java | 119 +++---
.../core/schema/MetaComparatorHandlerIT.java | 124 +++---
.../core/schema/MetaMatchingRuleHandlerIT.java | 124 +++---
.../core/schema/MetaNormalizerHandlerIT.java | 130 +++---
.../core/schema/MetaObjectClassHandlerIT.java | 130 +++---
.../server/core/schema/MetaSchemaHandlerIT.java | 56 +--
.../core/schema/MetaSyntaxCheckerHandlerIT.java | 130 +++---
.../server/core/schema/MetaSyntaxHandlerIT.java | 130 +++---
.../server/core/schema/ObjectClassCreateIT.java | 16 +-
.../core/schema/PartitionSchemaLoaderIT.java | 8 +-
.../server/core/schema/SchemaPersistenceIT.java | 24 +-
.../server/core/schema/SchemaServiceIT.java | 26 +-
.../server/core/schema/SubschemaSubentryIT.java | 77 ++--
.../server/core/sp/LdapClassLoaderIT.java | 12 +-
.../server/core/subtree/BadSubentryServiceIT.java | 26 +-
...SubentryServiceEntryModificationHandlingIT.java | 12 +-
.../server/core/subtree/SubentryServiceIT.java | 374 ++++++++---------
...SubentryServiceObjectClassChangeHandlingIT.java | 12 +-
.../core/trigger/SubentryServiceForTriggersIT.java | 146 +++----
.../server/core/trigger/TriggerInterceptorIT.java | 16 +-
core-shared/pom.xml | 6 +-
core/pom.xml | 9 +-
.../server/core/DefaultDirectoryServiceTest.java | 1 -
.../server/core/security/CertificateUtilTest.java | 1 -
.../server/kerberos/kdc/AbstractKerberosITest.java | 34 +-
.../kerberos/kdc/KerberosKRBProtocolTest.java | 8 +-
.../shared/client/api/BeforeAllInjector.java | 30 ++
.../shared/client/api/LdapConnectionTest.java | 20 +-
pom.xml | 20 +-
.../server/factory/ServerAnnotationProcessor.java | 27 +-
test-framework/pom.xml | 11 +-
.../server/core/integ/AbstractLdapTestUnit.java | 6 +
.../server/core/integ/ApacheDSTestExtension.java | 406 +++++++++++++++++++
.../server/core/integ/CreateDSTestExtension.java | 221 ++++++++++
.../directory/server/core/integ/CreateDsRule.java | 136 -------
.../integ/CreateLdapConnectionPoolExtension.java | 130 ++++++
.../core/integ/CreateLdapConnectionPoolRule.java | 292 --------------
.../server/core/integ/CreateLdapServerRule.java | 136 -------
.../server/core/integ/FrameworkRunner.java | 447 ---------------------
.../directory/server/core/integ/TestClassA.java | 17 +-
.../directory/server/core/integ/TestClassB.java | 24 +-
.../directory/server/core/integ/TestClassC.java | 6 +-
.../server/core/integ/TestClassServer.java | 6 +-
.../server/core/integ/TestCreateDsRule.java | 39 +-
.../integ/TestCreateLdapConnectionPoolRule.java | 4 +-
.../core/integ/TestCreateLdapServerRule.java | 2 +
.../server/core/integ/TestMultiLevelDS.java | 14 +-
.../core/integ/TestWithClassLevelLdapServer.java | 12 +-
142 files changed, 3221 insertions(+), 3234 deletions(-)
create mode 100644 ldap-client-test/src/test/java/org/apache/directory/shared/client/api/BeforeAllInjector.java
create mode 100644 test-framework/src/main/java/org/apache/directory/server/core/integ/ApacheDSTestExtension.java
create mode 100644 test-framework/src/main/java/org/apache/directory/server/core/integ/CreateDSTestExtension.java
delete mode 100755 test-framework/src/main/java/org/apache/directory/server/core/integ/CreateDsRule.java
create mode 100644 test-framework/src/main/java/org/apache/directory/server/core/integ/CreateLdapConnectionPoolExtension.java
delete mode 100755 test-framework/src/main/java/org/apache/directory/server/core/integ/CreateLdapConnectionPoolRule.java
delete mode 100755 test-framework/src/main/java/org/apache/directory/server/core/integ/CreateLdapServerRule.java
delete mode 100644 test-framework/src/main/java/org/apache/directory/server/core/integ/FrameworkRunner.java
[directory-server] 02/03: Switch to Junit 5
Posted by el...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
elecharny pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/directory-server.git
commit c73020d71b2c60477958a2a3e3fac3851a02d872
Merge: 08ef62b d9cc0d0
Author: emmanuel lecharny <el...@apache.org>
AuthorDate: Sat Apr 10 22:26:58 2021 +0200
Switch to Junit 5
core-annotations/pom.xml | 6 +
.../core/annotations/CreateAuthenticator.java | 4 +-
.../server/core/factory/DSAnnotationProcessor.java | 37 +-
.../factory/DirectoryServiceAnnotationTest.java | 2 +-
core-integ/pom.xml | 12 +
.../core/admin/AdministrativePointServiceIT.java | 28 +-
.../core/api/LdapCoreSessionConnectionTest.java | 14 +-
.../server/core/authn/SimpleAuthenticationIT.java | 18 +-
.../server/core/authz/AddAuthorizationIT.java | 16 +-
.../server/core/authz/AdministratorsGroupIT.java | 20 +-
.../core/authz/AuthorizationServiceAsAdminIT.java | 37 +-
.../authz/AuthorizationServiceAsNonAdminIT.java | 14 +-
.../directory/server/core/authz/AuthzAuthnIT.java | 22 +-
.../server/core/authz/AutzIntegUtils.java | 2 +-
.../server/core/authz/CompareAuthorizationIT.java | 20 +-
.../server/core/authz/DeleteAuthorizationIT.java | 20 +-
.../server/core/authz/GeneralAuthorizationIT.java | 18 +-
.../server/core/authz/LookupAuthorizationIT.java | 20 +-
.../server/core/authz/ModifyAuthorizationIT.java | 20 +-
.../core/authz/MoveRenameAuthorizationIT.java | 20 +-
.../server/core/authz/SearchAuthorizationIT.java | 32 +-
.../core/authz/support/MaxImmSubFilterIT.java | 19 +-
.../server/core/changelog/DefaultChangeLogIT.java | 20 +-
.../core/changelog/MemoryChangeLogStoreTest.java | 10 +-
.../collective/CollectiveAttributeServiceIT.java | 111 ++---
.../configuration/PartitionConfigurationIT.java | 13 +-
.../server/core/event/EventServiceIT.java | 10 +-
.../server/core/exception/ExceptionServiceIT.java | 107 ++---
.../directory/server/core/jndi/AddJndiIT.java | 16 +-
.../server/core/jndi/CreateContextIT.java | 18 +-
.../directory/server/core/jndi/DIRSERVER169IT.java | 12 +-
.../directory/server/core/jndi/DIRSERVER791IT.java | 22 +-
.../server/core/jndi/DestroyContextIT.java | 149 ++++---
.../server/core/jndi/ExtensibleObjectIT.java | 14 +-
.../apache/directory/server/core/jndi/ListIT.java | 14 +-
.../directory/server/core/jndi/MixedCaseIT.java | 38 +-
.../server/core/jndi/ModifyContextIT.java | 36 +-
.../server/core/jndi/ObjStateFactoryIT.java | 12 +-
.../directory/server/core/jndi/RFC2713IT.java | 14 +-
.../directory/server/core/jndi/ReferralIT.java | 20 +-
.../directory/server/core/jndi/RootDSEJndiIT.java | 16 +-
.../server/core/jndi/SimpleBindJndiIT.java | 41 +-
.../directory/server/core/jndi/UniqueMemberIT.java | 24 +-
.../server/core/jndi/referral/AddReferralIT.java | 20 +-
.../core/jndi/referral/CompareReferralIT.java | 20 +-
.../core/jndi/referral/DeleteReferralIT.java | 18 +-
.../core/jndi/referral/ModifyReferralIT.java | 20 +-
.../jndi/referral/MoveAndRenameReferralIT.java | 20 +-
.../server/core/jndi/referral/MoveReferralIT.java | 20 +-
.../core/jndi/referral/RenameReferralIT.java | 20 +-
.../core/jndi/referral/RenameReferralIgnoreIT.java | 18 +-
.../core/jndi/referral/SearchReferralIT.java | 20 +-
.../core/normalization/NormalizationServiceIT.java | 12 +-
.../operational/OperationalAttributeServiceIT.java | 74 ++--
.../core/operations/add/AddAfterShutdownIT.java | 14 +-
.../server/core/operations/add/AddIT.java | 14 +-
.../server/core/operations/add/AddPerfIT.java | 8 +-
.../core/operations/add/ConcurrentAddSearchIT.java | 12 +-
.../server/core/operations/add/DIRSERVER169IT.java | 77 ++--
.../server/core/operations/add/DIRSERVER783IT.java | 10 +-
.../add/PasswordHashingInterceptorTest.java | 14 +-
.../server/core/operations/bind/SimpleBindIT.java | 75 ++--
.../operations/compare/CompareDirserver1139IT.java | 18 +-
.../core/operations/compare/ComparePerfIT.java | 8 +-
.../core/operations/delete/DeletePerfIT.java | 8 +-
.../server/core/operations/exists/ExistsIT.java | 20 +-
.../core/operations/getRootDse/GetRootDseIT.java | 18 +-
.../operations/getRootDse/GetRootDsePerfIT.java | 10 +-
.../core/operations/hasEntry/hasEntryPerfIT.java | 10 +-
.../server/core/operations/lookup/LookupIT.java | 26 +-
.../core/operations/lookup/LookupPerfIT.java | 14 +-
.../server/core/operations/modify/ModifyAddIT.java | 300 ++++++++------
.../server/core/operations/modify/ModifyDelIT.java | 178 ++++----
.../core/operations/modify/ModifyIncrementIT.java | 10 +-
.../operations/modify/ModifyMVAttributeIT.java | 14 +-
.../core/operations/modify/ModifyMemberIT.java | 12 +-
.../operations/modify/ModifyMultipleChangesIT.java | 14 +-
.../core/operations/modify/ModifyPerfIT.java | 8 +-
.../server/core/operations/move/MoveIT.java | 18 +-
.../server/core/operations/move/MovePerfIT.java | 8 +-
.../operations/moveAndRename/MoveAndRenameIT.java | 24 +-
.../moveAndRename/MoveAndRenamePerfIT.java | 12 +-
.../server/core/operations/rename/RenameIT.java | 22 +-
.../core/operations/rename/RenamePerfIT.java | 8 +-
.../core/operations/search/AliasSearchIT.java | 40 +-
.../core/operations/search/DIRSERVER759IT.java | 14 +-
.../core/operations/search/SearchBinaryIT.java | 14 +-
.../server/core/operations/search/SearchIT.java | 154 ++++---
.../operations/search/SearchMavibotPerfIT.java | 8 +-
.../core/operations/search/SearchPerfIT.java | 10 +-
.../operations/search/SearchWithAddDelete.java | 15 +-
.../search/SearchWithIndexedMVAttributeIT.java | 14 +-
.../operations/search/SearchWithIndicesIT.java | 20 +-
.../search/SearchWithIndicesPersonIT.java | 14 +-
.../core/operations/search/SortedSearchIT.java | 24 +-
.../server/core/partition/PartitionIT.java | 14 +-
.../core/schema/MetaAttributeTypeHandlerIT.java | 119 +++---
.../core/schema/MetaComparatorHandlerIT.java | 124 +++---
.../core/schema/MetaMatchingRuleHandlerIT.java | 124 +++---
.../core/schema/MetaNormalizerHandlerIT.java | 130 +++---
.../core/schema/MetaObjectClassHandlerIT.java | 130 +++---
.../server/core/schema/MetaSchemaHandlerIT.java | 56 +--
.../core/schema/MetaSyntaxCheckerHandlerIT.java | 130 +++---
.../server/core/schema/MetaSyntaxHandlerIT.java | 130 +++---
.../server/core/schema/ObjectClassCreateIT.java | 16 +-
.../core/schema/PartitionSchemaLoaderIT.java | 8 +-
.../server/core/schema/SchemaPersistenceIT.java | 24 +-
.../server/core/schema/SchemaServiceIT.java | 26 +-
.../server/core/schema/SubschemaSubentryIT.java | 77 ++--
.../server/core/sp/LdapClassLoaderIT.java | 12 +-
.../server/core/subtree/BadSubentryServiceIT.java | 26 +-
...SubentryServiceEntryModificationHandlingIT.java | 12 +-
.../server/core/subtree/SubentryServiceIT.java | 374 ++++++++---------
...SubentryServiceObjectClassChangeHandlingIT.java | 12 +-
.../core/trigger/SubentryServiceForTriggersIT.java | 146 +++----
.../server/core/trigger/TriggerInterceptorIT.java | 16 +-
core-jndi/pom.xml | 5 -
.../server/core/jndi/LdapJndiPropertiesTest.java | 8 +-
core-shared/pom.xml | 6 +-
.../server/core/security/TlsKeyGeneratorTest.java | 1 +
.../server/core/authn/DelegatingAuthenticator.java | 35 +-
kerberos-client/pom.xml | 5 -
.../kerberos/client/CredentialsCacheTest.java | 2 +-
.../server/kerberos/shared/KerberosUtilsTest.java | 11 +-
.../crypto/encryption/AesEncryptionTest.java | 7 +-
.../crypto/encryption/CipherTextHandlerTest.java | 7 +-
.../encryption/Des3CbcSha1KdEncryptionTest.java | 7 +-
.../crypto/encryption/DesCbcCrcEncryptionTest.java | 7 +-
.../crypto/encryption/DesCbcMd5EncryptionTest.java | 7 +-
.../crypto/encryption/DesStringToKeyTest.java | 7 +-
.../crypto/encryption/KerberosKeyFactoryTest.java | 7 +-
.../shared/crypto/encryption/KeyTypeTest.java | 7 +-
.../shared/crypto/encryption/NFoldTest.java | 7 +-
.../crypto/encryption/RandomKeyFactoryTest.java | 7 +-
.../server/kerberos/shared/keytab/KeytabTest.java | 7 +-
.../shared/messages/components/TicketTest.java | 7 +-
.../messages/value/AuthorizationDataTest.java | 7 +-
.../shared/messages/value/ChecksumTest.java | 11 +-
.../shared/messages/value/EncryptedDataTest.java | 7 +-
.../shared/messages/value/EncryptionKeyTest.java | 11 +-
.../shared/messages/value/KdcOptionsTest.java | 7 +-
.../kerberos/shared/messages/value/PaDataTest.java | 7 +-
.../shared/messages/value/PrincipalNameTest.java | 7 +-
.../value/flags/AbstractKerberosFlagsTest.java | 7 +-
.../messages/value/flags/TicketFlagsTest.java | 7 +-
.../shared/replay/ReplayCacheImplTest.java | 2 +-
.../shared/kerberos/codec/AdAndOrDecoderTest.java | 52 ++-
.../kerberos/codec/AdIfRelevantDecoderTest.java | 2 +-
.../kerberos/codec/AdKdcIssuedDecoderTest.java | 14 +-
.../codec/AdMandatoryForKdcDecoderTest.java | 2 +-
.../shared/kerberos/codec/ApRepDecoderTest.java | 53 +--
.../shared/kerberos/codec/ApReqDecoderTest.java | 30 +-
.../shared/kerberos/codec/AsRepDecoderTest.java | 35 +-
.../shared/kerberos/codec/AsReqDecoderTest.java | 22 +-
.../kerberos/codec/AuthenticatorDecoderTest.java | 43 +-
.../codec/AuthorizationDataDecoderTest.java | 59 +--
.../codec/ChangePasswdDataDecoderTest.java | 2 +-
.../shared/kerberos/codec/ChecksumDecoderTest.java | 24 +-
.../kerberos/codec/ETypeInfo2DecoderTest.java | 26 +-
.../kerberos/codec/ETypeInfo2EntryDecoderTest.java | 38 +-
.../kerberos/codec/ETypeInfoDecoderTest.java | 26 +-
.../kerberos/codec/ETypeInfoEntryDecoderTest.java | 38 +-
.../kerberos/codec/EncApRepPartDecoderTest.java | 43 +-
.../kerberos/codec/EncAsRepPartDecoderTest.java | 22 +-
.../kerberos/codec/EncKdcRepPartDecoderTest.java | 59 +--
.../kerberos/codec/EncKrbCredPartDecoderTest.java | 6 +-
.../kerberos/codec/EncKrbPrivPartDecoderTest.java | 2 +-
.../kerberos/codec/EncTgsRepPartDecoderTest.java | 22 +-
.../kerberos/codec/EncTicketPartDecoderTest.java | 6 +-
.../kerberos/codec/EncryptedDataDecoderTest.java | 63 +--
.../kerberos/codec/EncryptionKeyDecoderTest.java | 54 +--
.../kerberos/codec/HostAddressDecoderTest.java | 58 +--
.../kerberos/codec/HostAddressesDecoderTest.java | 23 +-
.../shared/kerberos/codec/KdcRepDecoderTest.java | 29 +-
.../kerberos/codec/KdcReqBodyDecoderTest.java | 36 +-
.../shared/kerberos/codec/KdcReqDecoderTest.java | 30 +-
.../kerberos/codec/KerberosMessageDecoderTest.java | 7 +-
.../shared/kerberos/codec/KrbCredDecoderTest.java | 2 +-
.../kerberos/codec/KrbCredInfoDecoderTest.java | 6 +-
.../shared/kerberos/codec/KrbErrorDecoderTest.java | 2 +-
.../shared/kerberos/codec/KrbPrivDecoderTest.java | 2 +-
.../kerberos/codec/KrbSafeBodyDecoderTest.java | 2 +-
.../shared/kerberos/codec/KrbSafeDecoderTest.java | 9 +-
.../shared/kerberos/codec/LastReqDecoderTest.java | 39 +-
.../kerberos/codec/MethodDataDecoderTest.java | 23 +-
.../shared/kerberos/codec/PaDataDecoderTest.java | 19 +-
.../kerberos/codec/PaEncTimestampDecoderTest.java | 7 +-
.../kerberos/codec/PaEncTsEncDecoderTest.java | 39 +-
.../kerberos/codec/PrincipalNameDecoderTest.java | 69 ++--
.../shared/kerberos/codec/TgsRepDecoderTest.java | 35 +-
.../shared/kerberos/codec/TgsReqDecoderTest.java | 26 +-
.../shared/kerberos/codec/TicketDecoderTest.java | 104 +++--
.../codec/TransitedEncodingDecoderTest.java | 50 +--
.../kerberos/codec/TypedDataDecoderTest.java | 39 +-
.../kerberos/codec/flags/TicketFlagsTest.java | 2 +-
.../shared/kerberos/codec/options/OptionsTest.java | 2 +-
.../shared/client/api/BeforeAllInjector.java | 30 ++
.../shared/client/api/LdapConnectionTest.java | 20 +-
pom.xml | 20 +-
protocol-dhcp/pom.xml | 5 -
.../server/dhcp/DhcpMessageDecoderTest.java | 7 +-
.../dns/io/decoder/AddressRecordDecoderTest.java | 6 +-
.../dns/io/decoder/IPv6RecordDecoderTest.java | 6 +-
.../io/decoder/MailExchangeRecordDecoderTest.java | 6 +-
.../io/decoder/NameServerRecordDecoderTest.java | 6 +-
.../encoder/AbstractResourceRecordEncoderTest.java | 12 +-
.../dns/io/encoder/QuestionRecordEncoderTest.java | 6 +-
.../server/dns/messages/RecordClassTest.java | 2 +-
.../protocol/AuthenticationEncryptionTypeTest.java | 14 +-
.../protocol/AuthenticationPolicyTest.java | 10 +-
.../protocol/AuthenticationServiceTest.java | 10 +-
.../server/kerberos/protocol/EncTktInSkeyTest.java | 10 +-
.../kerberos/protocol/FragmentDecoderTest.java | 6 +-
.../kerberos/protocol/PreAuthenticationTest.java | 10 +-
.../kerberos/protocol/TGSReplayCacheTest.java | 2 +-
.../protocol/TicketGrantingEncryptionTypeTest.java | 14 +-
.../protocol/TicketGrantingPolicyTest.java | 10 +-
.../protocol/TicketGrantingServiceTest.java | 16 +-
protocol-ldap/pom.xml | 5 -
.../apache/directory/server/ldap/JournalTest.java | 18 +-
.../server/ldap/LdapServerSettingsTest.java | 8 +-
.../ldap/SettingAlternativeHandlersTest.java | 8 +-
.../org/apache/directory/server/ntp/NtpITest.java | 14 +-
.../server/ntp/NtpMessageDecoderTest.java | 2 +-
.../server/ntp/NtpMessageEncoderTest.java | 2 +-
.../server/ntp/messages/NtpTimeStampTest.java | 6 +-
server-annotations/pom.xml | 5 -
.../server/factory/ServerAnnotationProcessor.java | 27 +-
.../factory/CreateKdcServerAnnotationTest.java | 2 +-
.../factory/DirectoryServiceAnnotationTest.java | 2 +-
server-config/pom.xml | 5 -
.../config/ChangePasswordConfigReaderTest.java | 17 +-
.../server/config/ConfigPartitionReaderTest.java | 13 +-
.../directory/server/config/ConfigWriterTest.java | 13 +-
.../server/config/HttpServerConfigReaderTest.java | 13 +-
.../config/KerberosServerConfigReaderTest.java | 13 +-
.../server/config/LdapServerConfigReaderTest.java | 13 +-
.../operations/bind/DelegatedAuthOverSslIT.java | 4 +-
.../operations/bind/DelegatedAuthOverTlsIT.java | 3 +-
.../server/configuration/ApacheDSTest.java | 2 +-
.../server/config/builder/ServiceBuilderTest.java | 6 +-
.../apache/directory/server/UberJarMainTest.java | 10 +-
test-framework/pom.xml | 11 +-
.../server/core/integ/AbstractLdapTestUnit.java | 6 +
.../server/core/integ/ApacheDSTestExtension.java | 418 +++++++++++++++++++
.../server/core/integ/CreateDSTestExtension.java | 221 ++++++++++
.../directory/server/core/integ/CreateDsRule.java | 136 -------
.../integ/CreateLdapConnectionPoolExtension.java | 130 ++++++
.../core/integ/CreateLdapConnectionPoolRule.java | 292 --------------
.../server/core/integ/CreateLdapServerRule.java | 136 -------
.../server/core/integ/FrameworkRunner.java | 447 ---------------------
.../directory/server/core/integ/TestClassA.java | 17 +-
.../directory/server/core/integ/TestClassB.java | 24 +-
.../directory/server/core/integ/TestClassC.java | 6 +-
.../server/core/integ/TestClassServer.java | 6 +-
.../server/core/integ/TestCreateDsRule.java | 39 +-
.../integ/TestCreateLdapConnectionPoolRule.java | 4 +-
.../core/integ/TestCreateLdapServerRule.java | 2 +
.../server/core/integ/TestMultiLevelDS.java | 14 +-
.../core/integ/TestWithClassLevelLdapServer.java | 12 +-
260 files changed, 4151 insertions(+), 4239 deletions(-)
diff --cc core-annotations/src/main/java/org/apache/directory/server/core/factory/DSAnnotationProcessor.java
index 028808c,028808c..921de1d
--- a/core-annotations/src/main/java/org/apache/directory/server/core/factory/DSAnnotationProcessor.java
+++ b/core-annotations/src/main/java/org/apache/directory/server/core/factory/DSAnnotationProcessor.java
@@@ -22,6 -22,6 +22,7 @@@ package org.apache.directory.server.cor
import java.io.File;
import java.io.FileNotFoundException;
import java.io.InputStream;
++import java.lang.reflect.AnnotatedElement;
import java.lang.reflect.Constructor;
import java.util.HashSet;
import java.util.List;
@@@ -56,7 -56,7 +57,7 @@@ import org.apache.directory.server.core
import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmIndex;
import org.apache.directory.server.core.partition.impl.btree.mavibot.MavibotIndex;
import org.apache.directory.server.i18n.I18n;
--import org.junit.runner.Description;
++import org.junit.jupiter.api.extension.ExtensionContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@@ -315,18 -315,18 +316,16 @@@ public final class DSAnnotationProcesso
* @return A valid DirectoryService
* @throws Exception If the DirectoryService instance can't be returned
*/
-- public static DirectoryService getDirectoryService( Description description )
++ public static DirectoryService getDirectoryService( CreateDS dsBuilder )
throws Exception
{
-- CreateDS dsBuilder = description.getAnnotation( CreateDS.class );
--
if ( dsBuilder != null )
{
return createDS( dsBuilder );
}
else
{
-- LOG.debug( "No {} DS.", description.getDisplayName() );
++ LOG.debug( "No CreateDS annotation." );
return null;
}
}
@@@ -450,18 -450,18 +449,19 @@@
/**
* Load the schemas, and enable/disable them.
*
-- * @param desc The description
++ * @param context The text context
* @param service The DirectoryService instance
*/
-- public static void loadSchemas( Description desc, DirectoryService service )
++ public static void loadSchemas( ExtensionContext context, DirectoryService service )
{
-- if ( desc == null )
++ if ( context == null )
{
return;
}
-- LoadSchema loadSchema = desc
-- .getAnnotation( LoadSchema.class );
++ AnnotatedElement annotations = context.getTestClass().get();
++
++ LoadSchema loadSchema = annotations.getDeclaredAnnotation( LoadSchema.class );
if ( loadSchema != null )
{
@@@ -486,29 -486,29 +486,28 @@@
/**
* Apply the LDIF entries to the given service
*
-- * @param desc The description
++ * @param annotations The test annotations
++ * @param displayName The context in which this methods is executed (suite name, class name or method name)
* @param service The DirectoryService instance
* @throws Exception If we can't apply the ldifs
*/
-- public static void applyLdifs( Description desc, DirectoryService service )
++ public static void applyLdifs( AnnotatedElement annotations, String displayName, DirectoryService service )
throws Exception
{
-- if ( desc == null )
++ if ( annotations == null )
{
return;
}
-- ApplyLdifFiles applyLdifFiles = desc
-- .getAnnotation( ApplyLdifFiles.class );
++ ApplyLdifFiles applyLdifFiles = annotations.getDeclaredAnnotation( ApplyLdifFiles.class );
if ( applyLdifFiles != null )
{
-- LOG.debug( "Applying {} to {}", applyLdifFiles.value(),
-- desc.getDisplayName() );
++ LOG.debug( "Applying {} to {}", applyLdifFiles.value(), displayName );
injectLdifFiles( applyLdifFiles.clazz(), service, applyLdifFiles.value() );
}
-- ApplyLdifs applyLdifs = desc.getAnnotation( ApplyLdifs.class );
++ ApplyLdifs applyLdifs = annotations.getDeclaredAnnotation( ApplyLdifs.class );
if ( ( applyLdifs != null ) && ( applyLdifs.value() != null ) )
{
@@@ -539,7 -539,7 +538,7 @@@
}
}
-- LOG.debug( "Applying {} to {}", sb, desc.getDisplayName() );
++ LOG.debug( "Applying {} to {}", sb, displayName );
injectEntries( service, sb.toString() );
sb.setLength( 0 );
diff --cc core-integ/pom.xml
index 9dc36cb,9dc36cb..9abef57
--- a/core-integ/pom.xml
+++ b/core-integ/pom.xml
@@@ -136,6 -136,6 +136,18 @@@
<groupId>org.apache.directory.api</groupId>
<artifactId>api-util</artifactId>
</dependency>
++
++ <dependency>
++ <groupId>org.junit.jupiter</groupId>
++ <artifactId>junit-jupiter</artifactId>
++ <scope>test</scope>
++ </dependency>
++
++ <dependency>
++ <groupId>org.junit.jupiter</groupId>
++ <artifactId>junit-jupiter-api</artifactId>
++ <scope>test</scope>
++ </dependency>
</dependencies>
<properties>
diff --cc core-integ/src/test/java/org/apache/directory/server/core/admin/AdministrativePointServiceIT.java
index 813ef28,813ef28..dade022
--- a/core-integ/src/test/java/org/apache/directory/server/core/admin/AdministrativePointServiceIT.java
+++ b/core-integ/src/test/java/org/apache/directory/server/core/admin/AdministrativePointServiceIT.java
@@@ -20,10 -20,10 +20,10 @@@
package org.apache.directory.server.core.admin;
--import static org.junit.Assert.assertFalse;
--import static org.junit.Assert.assertNotNull;
--import static org.junit.Assert.assertTrue;
--import static org.junit.Assert.fail;
++import static org.junit.jupiter.api.Assertions.assertNotNull;
++import static org.junit.jupiter.api.Assertions.assertTrue;
++import static org.junit.jupiter.api.Assertions.fail;
++import static org.junit.jupiter.api.Assertions.assertFalse;
import org.apache.directory.api.ldap.model.entry.DefaultAttribute;
import org.apache.directory.api.ldap.model.entry.DefaultEntry;
@@@ -37,13 -37,13 +37,13 @@@ import org.apache.directory.api.ldap.mo
import org.apache.directory.ldap.client.api.LdapConnection;
import org.apache.directory.server.core.annotations.CreateDS;
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.directory.server.core.integ.IntegrationUtils;
--import org.junit.After;
--import org.junit.Before;
--import org.junit.Ignore;
--import org.junit.Test;
--import org.junit.runner.RunWith;
++import org.junit.jupiter.api.AfterEach;
++import org.junit.jupiter.api.BeforeEach;
++import org.junit.jupiter.api.Test;
++import org.junit.jupiter.api.Disabled;
++import org.junit.jupiter.api.extension.ExtendWith;
/**
@@@ -51,23 -51,23 +51,23 @@@
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
--@RunWith(FrameworkRunner.class)
++@ExtendWith( ApacheDSTestExtension.class )
@CreateDS(name = "AdministrativePointServiceIT")
--@Ignore
++@Disabled
public class AdministrativePointServiceIT extends AbstractLdapTestUnit
{
// The shared LDAP connection
private static LdapConnection connection;
-- @Before
++ @BeforeEach
public void init() throws Exception
{
connection = IntegrationUtils.getAdminConnection( getService() );
}
-- @After
++ @AfterEach
public void shutdown() throws Exception
{
connection.close();
diff --cc core-integ/src/test/java/org/apache/directory/server/core/api/LdapCoreSessionConnectionTest.java
index 7e903fc,7e903fc..1be022f
--- a/core-integ/src/test/java/org/apache/directory/server/core/api/LdapCoreSessionConnectionTest.java
+++ b/core-integ/src/test/java/org/apache/directory/server/core/api/LdapCoreSessionConnectionTest.java
@@@ -20,7 -20,7 +20,7 @@@
package org.apache.directory.server.core.api;
--import static org.junit.Assert.assertNotNull;
++import static org.junit.jupiter.api.Assertions.assertNotNull;
import org.apache.directory.api.ldap.extras.controls.ppolicy.PasswordPolicyResponse;
import org.apache.directory.api.ldap.extras.controls.ppolicy.PasswordPolicyResponseImpl;
@@@ -42,10 -42,10 +42,10 @@@ import org.apache.directory.server.core
import org.apache.directory.server.core.authn.AuthenticationInterceptor;
import org.apache.directory.server.core.authn.ppolicy.PpolicyConfigContainer;
import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
--import org.apache.directory.server.core.integ.FrameworkRunner;
--import org.junit.Before;
--import org.junit.Test;
--import org.junit.runner.RunWith;
++import org.apache.directory.server.core.integ.ApacheDSTestExtension;
++import org.junit.jupiter.api.BeforeEach;
++import org.junit.jupiter.api.Test;
++import org.junit.jupiter.api.extension.ExtendWith;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@@ -56,7 -56,7 +56,7 @@@
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
--@RunWith(FrameworkRunner.class)
++@ExtendWith( ApacheDSTestExtension.class )
@CreateLdapServer(transports =
{
@CreateTransport(protocol = "LDAP") })
@@@ -78,7 -78,7 +78,7 @@@ public class LdapCoreSessionConnectionT
new PasswordPolicyResponseImpl();
-- @Before
++ @BeforeEach
public void setPwdPolicy() throws LdapException
{
PasswordPolicyConfiguration policyConfig = new PasswordPolicyConfiguration();
diff --cc core-integ/src/test/java/org/apache/directory/server/core/authn/SimpleAuthenticationIT.java
index 7bcdffd,7bcdffd..ffc0c68
--- a/core-integ/src/test/java/org/apache/directory/server/core/authn/SimpleAuthenticationIT.java
+++ b/core-integ/src/test/java/org/apache/directory/server/core/authn/SimpleAuthenticationIT.java
@@@ -23,9 -23,9 +23,9 @@@ package org.apache.directory.server.cor
import static org.apache.directory.server.core.integ.IntegrationUtils.apply;
import static org.apache.directory.server.core.integ.IntegrationUtils.getConnectionAs;
import static org.apache.directory.server.core.integ.IntegrationUtils.getUserAddLdif;
--import static org.junit.Assert.assertNotNull;
--import static org.junit.Assert.assertTrue;
--import static org.junit.Assert.fail;
++import static org.junit.jupiter.api.Assertions.assertNotNull;
++import static org.junit.jupiter.api.Assertions.assertTrue;
++import static org.junit.jupiter.api.Assertions.fail;
import java.util.Objects;
@@@ -39,11 -39,11 +39,11 @@@ import org.apache.directory.api.util.St
import org.apache.directory.ldap.client.api.LdapConnection;
import org.apache.directory.server.core.annotations.CreateDS;
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.directory.server.core.integ.IntegrationUtils;
--import org.junit.After;
--import org.junit.Test;
--import org.junit.runner.RunWith;
++import org.junit.jupiter.api.AfterEach;
++import org.junit.jupiter.api.Test;
++import org.junit.jupiter.api.extension.ExtendWith;
/**
@@@ -52,7 -52,7 +52,7 @@@
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
--@RunWith(FrameworkRunner.class)
++@ExtendWith( ApacheDSTestExtension.class )
@CreateDS(name = "SimpleAuthenticationIT-DS")
public class SimpleAuthenticationIT extends AbstractLdapTestUnit
{
@@@ -72,7 -72,7 +72,7 @@@
}
-- @After
++ @AfterEach
public void closeConnections()
{
IntegrationUtils.closeConnections();
diff --cc core-integ/src/test/java/org/apache/directory/server/core/authz/AddAuthorizationIT.java
index 1f21bf0,1f21bf0..691282e
--- a/core-integ/src/test/java/org/apache/directory/server/core/authz/AddAuthorizationIT.java
+++ b/core-integ/src/test/java/org/apache/directory/server/core/authz/AddAuthorizationIT.java
@@@ -24,8 -24,8 +24,8 @@@ import static org.apache.directory.serv
import static org.apache.directory.server.core.authz.AutzIntegUtils.createAccessControlSubentry;
import static org.apache.directory.server.core.authz.AutzIntegUtils.createUser;
import static org.apache.directory.server.core.authz.AutzIntegUtils.getConnectionAs;
--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.apache.directory.api.ldap.model.entry.DefaultEntry;
import org.apache.directory.api.ldap.model.entry.Entry;
@@@ -34,10 -34,10 +34,10 @@@ import org.apache.directory.api.ldap.mo
import org.apache.directory.ldap.client.api.LdapConnection;
import org.apache.directory.server.core.annotations.CreateDS;
import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
--import org.apache.directory.server.core.integ.FrameworkRunner;
--import org.junit.Before;
--import org.junit.Test;
--import org.junit.runner.RunWith;
++import org.apache.directory.server.core.integ.ApacheDSTestExtension;
++import org.junit.jupiter.api.BeforeEach;
++import org.junit.jupiter.api.Test;
++import org.junit.jupiter.api.extension.ExtendWith;
/**
@@@ -45,12 -45,12 +45,12 @@@
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
--@RunWith(FrameworkRunner.class)
++@ExtendWith( ApacheDSTestExtension.class )
@CreateDS(name = "AddAuthorizationIT")
public class AddAuthorizationIT extends AbstractLdapTestUnit
{
-- @Before
++ @BeforeEach
public void setService()
{
AutzIntegUtils.service = getService();
diff --cc core-integ/src/test/java/org/apache/directory/server/core/authz/AdministratorsGroupIT.java
index f7f9cc3,f7f9cc3..558adc7
--- a/core-integ/src/test/java/org/apache/directory/server/core/authz/AdministratorsGroupIT.java
+++ b/core-integ/src/test/java/org/apache/directory/server/core/authz/AdministratorsGroupIT.java
@@@ -23,20 -23,20 +23,20 @@@ package org.apache.directory.server.cor
import static org.apache.directory.server.core.authz.AutzIntegUtils.addUserToGroup;
import static org.apache.directory.server.core.authz.AutzIntegUtils.createUser;
import static org.apache.directory.server.core.authz.AutzIntegUtils.getConnectionAs;
--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.apache.directory.api.ldap.model.entry.Entry;
import org.apache.directory.api.ldap.model.name.Dn;
import org.apache.directory.ldap.client.api.LdapConnection;
import org.apache.directory.server.core.annotations.CreateDS;
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.directory.server.core.integ.IntegrationUtils;
--import org.junit.After;
--import org.junit.Before;
--import org.junit.Test;
--import org.junit.runner.RunWith;
++import org.junit.jupiter.api.AfterEach;
++import org.junit.jupiter.api.BeforeEach;
++import org.junit.jupiter.api.Test;
++import org.junit.jupiter.api.extension.ExtendWith;
/**
@@@ -45,19 -45,19 +45,19 @@@
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
--@RunWith(FrameworkRunner.class)
++@ExtendWith( ApacheDSTestExtension.class )
@CreateDS(name = "AdministratorsGroupIT")
public class AdministratorsGroupIT extends AbstractLdapTestUnit
{
-- @Before
++ @BeforeEach
public void setService()
{
AutzIntegUtils.service = getService();
}
-- @After
++ @AfterEach
public void closeConnections()
{
IntegrationUtils.closeConnections();
diff --cc core-integ/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsAdminIT.java
index ca82726,ca82726..57013c5
--- a/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsAdminIT.java
+++ b/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsAdminIT.java
@@@ -22,8 -22,8 +22,8 @@@ package org.apache.directory.server.cor
import static org.apache.directory.server.core.authz.AutzIntegUtils.getAdminConnection;
import static org.apache.directory.server.core.authz.AutzIntegUtils.getConnectionAs;
--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 java.util.HashSet;
import java.util.Objects;
@@@ -41,12 -41,12 +41,13 @@@ import org.apache.directory.api.util.St
import org.apache.directory.ldap.client.api.LdapConnection;
import org.apache.directory.server.core.annotations.CreateDS;
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.directory.server.core.integ.IntegrationUtils;
--import org.junit.After;
--import org.junit.Before;
--import org.junit.Test;
--import org.junit.runner.RunWith;
++import org.junit.jupiter.api.AfterEach;
++import org.junit.jupiter.api.Assertions;
++import org.junit.jupiter.api.BeforeEach;
++import org.junit.jupiter.api.Test;
++import org.junit.jupiter.api.extension.ExtendWith;
/**
@@@ -55,19 -55,19 +56,19 @@@
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
--@RunWith(FrameworkRunner.class)
++@ExtendWith( ApacheDSTestExtension.class )
@CreateDS(name = "AuthorizationServiceAsAdminIT")
public class AuthorizationServiceAsAdminIT extends AbstractLdapTestUnit
{
-- @Before
++ @BeforeEach
public void setService()
{
AutzIntegUtils.service = getService();
}
-- @After
++ @AfterEach
public void closeConnections()
{
IntegrationUtils.closeConnections();
@@@ -79,10 -79,10 +80,13 @@@
*
* @throws Exception if there are problems
*/
-- @Test(expected = LdapNoPermissionException.class)
++ @Test
public void testNoDeleteOnAdminByAdmin() throws Exception
{
-- getAdminConnection().delete( "uid=admin,ou=system" );
++ Assertions.assertThrows( LdapNoPermissionException.class, () ->
++ {
++ getAdminConnection().delete( "uid=admin,ou=system" );
++ } );
}
@@@ -91,11 -91,11 +95,14 @@@
*
* @throws Exception if there are problems
*/
-- @Test(expected = LdapNoPermissionException.class)
++ @Test
public void testNoRdnChangesOnAdminByAdmin() throws Exception
{
-- getAdminConnection().rename( new Dn( getService().getSchemaManager(), "uid=admin,ou=system" ),
-- new Rdn( getService().getSchemaManager(), "uid=alex" ) );
++ Assertions.assertThrows( LdapNoPermissionException.class, () ->
++ {
++ getAdminConnection().rename( new Dn( getService().getSchemaManager(), "uid=admin,ou=system" ),
++ new Rdn( getService().getSchemaManager(), "uid=alex" ) );
++ } );
}
diff --cc core-integ/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsNonAdminIT.java
index 598c9db,598c9db..7e97e4e
--- a/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsNonAdminIT.java
+++ b/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsNonAdminIT.java
@@@ -21,9 -21,9 +21,9 @@@ package org.apache.directory.server.cor
import static org.apache.directory.server.core.integ.IntegrationUtils.getUserAddLdif;
--import static org.junit.Assert.assertNotNull;
--import static org.junit.Assert.assertTrue;
--import static org.junit.Assert.fail;
++import static org.junit.jupiter.api.Assertions.assertNotNull;
++import static org.junit.jupiter.api.Assertions.assertTrue;
++import static org.junit.jupiter.api.Assertions.fail;
import java.util.Arrays;
@@@ -48,9 -48,9 +48,9 @@@ import org.apache.directory.server.core
import org.apache.directory.server.core.api.CoreSession;
import org.apache.directory.server.core.api.LdapPrincipal;
import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
--import org.apache.directory.server.core.integ.FrameworkRunner;
--import org.junit.Test;
--import org.junit.runner.RunWith;
++import org.apache.directory.server.core.integ.ApacheDSTestExtension;
++import org.junit.jupiter.api.Test;
++import org.junit.jupiter.api.extension.ExtendWith;
/**
@@@ -59,7 -59,7 +59,7 @@@
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
--@RunWith ( FrameworkRunner.class )
++@ExtendWith( ApacheDSTestExtension.class )
@CreateDS(name = "AuthorizationServiceAsNonAdminIT")
public class AuthorizationServiceAsNonAdminIT extends AbstractLdapTestUnit
{
diff --cc core-integ/src/test/java/org/apache/directory/server/core/authz/AuthzAuthnIT.java
index ce79657,ce79657..98552b9
--- a/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthzAuthnIT.java
+++ b/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthzAuthnIT.java
@@@ -23,21 -23,21 +23,21 @@@ package org.apache.directory.server.cor
import static org.apache.directory.server.core.authz.AutzIntegUtils.createAccessControlSubentry;
import static org.apache.directory.server.core.authz.AutzIntegUtils.createUser;
import static org.apache.directory.server.core.authz.AutzIntegUtils.getConnectionAs;
--import static org.junit.Assert.assertEquals;
--import static org.junit.Assert.assertNotNull;
--import static org.junit.Assert.assertNull;
++import static org.junit.jupiter.api.Assertions.assertEquals;
++import static org.junit.jupiter.api.Assertions.assertNotNull;
++import static org.junit.jupiter.api.Assertions.assertNull;
import org.apache.directory.api.ldap.model.entry.Entry;
import org.apache.directory.api.ldap.model.name.Dn;
import org.apache.directory.ldap.client.api.LdapConnection;
import org.apache.directory.server.core.annotations.CreateDS;
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.directory.server.core.integ.IntegrationUtils;
--import org.junit.After;
--import org.junit.Before;
--import org.junit.Test;
--import org.junit.runner.RunWith;
++import org.junit.jupiter.api.AfterEach;
++import org.junit.jupiter.api.BeforeEach;
++import org.junit.jupiter.api.Test;
++import org.junit.jupiter.api.extension.ExtendWith;
/**
@@@ -45,12 -45,12 +45,12 @@@
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
--@RunWith(FrameworkRunner.class)
++@ExtendWith( ApacheDSTestExtension.class )
@CreateDS(name = "AuthzAuthnIT")
public class AuthzAuthnIT extends AbstractLdapTestUnit
{
-- @Before
++ @BeforeEach
public void setService()
{
AutzIntegUtils.service = getService();
@@@ -58,7 -58,7 +58,7 @@@
}
-- @After
++ @AfterEach
public void closeConnections()
{
IntegrationUtils.closeConnections();
diff --cc core-integ/src/test/java/org/apache/directory/server/core/authz/AutzIntegUtils.java
index 9e23856,9e23856..8813566
--- a/core-integ/src/test/java/org/apache/directory/server/core/authz/AutzIntegUtils.java
+++ b/core-integ/src/test/java/org/apache/directory/server/core/authz/AutzIntegUtils.java
@@@ -20,7 -20,7 +20,7 @@@
package org.apache.directory.server.core.authz;
--import static org.junit.Assert.assertTrue;
++import static org.junit.jupiter.api.Assertions.assertTrue;
import org.apache.directory.api.ldap.model.entry.Attribute;
import org.apache.directory.api.ldap.model.entry.DefaultAttribute;
diff --cc core-integ/src/test/java/org/apache/directory/server/core/authz/CompareAuthorizationIT.java
index b483a63,b483a63..b252633
--- a/core-integ/src/test/java/org/apache/directory/server/core/authz/CompareAuthorizationIT.java
+++ b/core-integ/src/test/java/org/apache/directory/server/core/authz/CompareAuthorizationIT.java
@@@ -25,8 -25,8 +25,8 @@@ import static org.apache.directory.serv
import static org.apache.directory.server.core.authz.AutzIntegUtils.createUser;
import static org.apache.directory.server.core.authz.AutzIntegUtils.getAdminConnection;
import static org.apache.directory.server.core.authz.AutzIntegUtils.getConnectionAs;
--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.apache.directory.api.ldap.model.entry.DefaultEntry;
import org.apache.directory.api.ldap.model.entry.Entry;
@@@ -35,12 -35,12 +35,12 @@@ import org.apache.directory.api.ldap.mo
import org.apache.directory.ldap.client.api.LdapConnection;
import org.apache.directory.server.core.annotations.CreateDS;
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.directory.server.core.integ.IntegrationUtils;
--import org.junit.After;
--import org.junit.Before;
--import org.junit.Test;
--import org.junit.runner.RunWith;
++import org.junit.jupiter.api.AfterEach;
++import org.junit.jupiter.api.BeforeEach;
++import org.junit.jupiter.api.Test;
++import org.junit.jupiter.api.extension.ExtendWith;
/**
@@@ -48,18 -48,18 +48,18 @@@
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
--@RunWith(FrameworkRunner.class)
++@ExtendWith( ApacheDSTestExtension.class )
@CreateDS(enableAccessControl = true, name = "CompareAuthorizationIT")
public class CompareAuthorizationIT extends AbstractLdapTestUnit
{
-- @Before
++ @BeforeEach
public void setService()
{
AutzIntegUtils.service = getService();
}
-- @After
++ @AfterEach
public void closeConnections()
{
IntegrationUtils.closeConnections();
diff --cc core-integ/src/test/java/org/apache/directory/server/core/authz/DeleteAuthorizationIT.java
index c8b93dc,c8b93dc..1f2e5d7
--- a/core-integ/src/test/java/org/apache/directory/server/core/authz/DeleteAuthorizationIT.java
+++ b/core-integ/src/test/java/org/apache/directory/server/core/authz/DeleteAuthorizationIT.java
@@@ -25,8 -25,8 +25,8 @@@ import static org.apache.directory.serv
import static org.apache.directory.server.core.authz.AutzIntegUtils.createUser;
import static org.apache.directory.server.core.authz.AutzIntegUtils.getAdminConnection;
import static org.apache.directory.server.core.authz.AutzIntegUtils.getConnectionAs;
--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.apache.directory.api.ldap.model.constants.SchemaConstants;
import org.apache.directory.api.ldap.model.entry.DefaultEntry;
@@@ -36,12 -36,12 +36,12 @@@ import org.apache.directory.api.ldap.mo
import org.apache.directory.ldap.client.api.LdapConnection;
import org.apache.directory.server.core.annotations.CreateDS;
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.directory.server.core.integ.IntegrationUtils;
--import org.junit.After;
--import org.junit.Before;
--import org.junit.Test;
--import org.junit.runner.RunWith;
++import org.junit.jupiter.api.AfterEach;
++import org.junit.jupiter.api.BeforeEach;
++import org.junit.jupiter.api.Test;
++import org.junit.jupiter.api.extension.ExtendWith;
/**
@@@ -49,18 -49,18 +49,18 @@@
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
--@RunWith(FrameworkRunner.class)
++@ExtendWith( ApacheDSTestExtension.class )
@CreateDS(enableAccessControl = true, name = "DeleteAuthorizationIT")
public class DeleteAuthorizationIT extends AbstractLdapTestUnit
{
-- @Before
++ @BeforeEach
public void setService()
{
AutzIntegUtils.service = getService();
}
-- @After
++ @AfterEach
public void closeConnections()
{
IntegrationUtils.closeConnections();
diff --cc core-integ/src/test/java/org/apache/directory/server/core/authz/GeneralAuthorizationIT.java
index c1db774,c1db774..b0bed77
--- a/core-integ/src/test/java/org/apache/directory/server/core/authz/GeneralAuthorizationIT.java
+++ b/core-integ/src/test/java/org/apache/directory/server/core/authz/GeneralAuthorizationIT.java
@@@ -21,17 -21,17 +21,17 @@@ package org.apache.directory.server.cor
import static org.apache.directory.server.core.authz.AutzIntegUtils.createAccessControlSubentry;
--import static org.junit.Assert.assertEquals;
++import static org.junit.jupiter.api.Assertions.assertEquals;
import org.apache.directory.api.ldap.model.message.ResultCodeEnum;
import org.apache.directory.server.core.annotations.CreateDS;
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.directory.server.core.integ.IntegrationUtils;
--import org.junit.After;
--import org.junit.Before;
--import org.junit.Test;
--import org.junit.runner.RunWith;
++import org.junit.jupiter.api.AfterEach;
++import org.junit.jupiter.api.BeforeEach;
++import org.junit.jupiter.api.Test;
++import org.junit.jupiter.api.extension.ExtendWith;
/**
@@@ -39,18 -39,18 +39,18 @@@
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
--@RunWith(FrameworkRunner.class)
++@ExtendWith( ApacheDSTestExtension.class )
@CreateDS(name = "GeneralAuthorizationIT")
public class GeneralAuthorizationIT extends AbstractLdapTestUnit
{
-- @Before
++ @BeforeEach
public void setService()
{
AutzIntegUtils.service = getService();
}
-- @After
++ @AfterEach
public void closeConnections()
{
IntegrationUtils.closeConnections();
diff --cc core-integ/src/test/java/org/apache/directory/server/core/authz/LookupAuthorizationIT.java
index 29da6da,29da6da..48f1dac
--- a/core-integ/src/test/java/org/apache/directory/server/core/authz/LookupAuthorizationIT.java
+++ b/core-integ/src/test/java/org/apache/directory/server/core/authz/LookupAuthorizationIT.java
@@@ -21,10 -21,10 +21,10 @@@ package org.apache.directory.server.cor
import static org.apache.directory.server.core.authz.AutzIntegUtils.createAccessControlSubentry;
--import static org.junit.Assert.assertEquals;
--import static org.junit.Assert.assertNotNull;
--import static org.junit.Assert.assertTrue;
--import static org.junit.Assert.fail;
++import static org.junit.jupiter.api.Assertions.assertEquals;
++import static org.junit.jupiter.api.Assertions.assertNotNull;
++import static org.junit.jupiter.api.Assertions.assertTrue;
++import static org.junit.jupiter.api.Assertions.fail;
import org.apache.directory.api.ldap.model.entry.Entry;
import org.apache.directory.api.ldap.model.exception.LdapNoPermissionException;
@@@ -32,10 -32,10 +32,10 @@@ import org.apache.directory.api.ldap.mo
import org.apache.directory.server.core.annotations.ApplyLdifs;
import org.apache.directory.server.core.annotations.CreateDS;
import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
--import org.apache.directory.server.core.integ.FrameworkRunner;
--import org.junit.Before;
--import org.junit.Test;
--import org.junit.runner.RunWith;
++import org.apache.directory.server.core.integ.ApacheDSTestExtension;
++import org.junit.jupiter.api.BeforeEach;
++import org.junit.jupiter.api.Test;
++import org.junit.jupiter.api.extension.ExtendWith;
/**
@@@ -43,7 -43,7 +43,7 @@@
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
--@RunWith(FrameworkRunner.class)
++@ExtendWith( ApacheDSTestExtension.class )
@CreateDS(allowAnonAccess = true, name = "LookupAuthorizationIT")
@ApplyLdifs(
{
@@@ -55,7 -55,7 +55,7 @@@
})
public class LookupAuthorizationIT extends AbstractLdapTestUnit
{
-- @Before
++ @BeforeEach
public void init()
{
AutzIntegUtils.service = getService();
diff --cc core-integ/src/test/java/org/apache/directory/server/core/authz/ModifyAuthorizationIT.java
index ae4d10e,ae4d10e..c508176
--- a/core-integ/src/test/java/org/apache/directory/server/core/authz/ModifyAuthorizationIT.java
+++ b/core-integ/src/test/java/org/apache/directory/server/core/authz/ModifyAuthorizationIT.java
@@@ -28,8 -28,8 +28,8 @@@ import static org.apache.directory.serv
import static org.apache.directory.server.core.authz.AutzIntegUtils.deleteAccessControlSubentry;
import static org.apache.directory.server.core.authz.AutzIntegUtils.getAdminConnection;
import static org.apache.directory.server.core.authz.AutzIntegUtils.getConnectionAs;
--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.apache.directory.api.ldap.model.constants.SchemaConstants;
import org.apache.directory.api.ldap.model.entry.Attribute;
@@@ -47,12 -47,12 +47,12 @@@ import org.apache.directory.api.ldap.mo
import org.apache.directory.ldap.client.api.LdapConnection;
import org.apache.directory.server.core.annotations.CreateDS;
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.directory.server.core.integ.IntegrationUtils;
--import org.junit.After;
--import org.junit.Before;
--import org.junit.Test;
--import org.junit.runner.RunWith;
++import org.junit.jupiter.api.AfterEach;
++import org.junit.jupiter.api.BeforeEach;
++import org.junit.jupiter.api.Test;
++import org.junit.jupiter.api.extension.ExtendWith;
/**
@@@ -60,18 -60,18 +60,18 @@@
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
--@RunWith(FrameworkRunner.class)
++@ExtendWith( ApacheDSTestExtension.class )
@CreateDS(enableAccessControl = true, name = "ModifyAuthorizationIT")
public class ModifyAuthorizationIT extends AbstractLdapTestUnit
{
-- @Before
++ @BeforeEach
public void setService()
{
AutzIntegUtils.service = getService();
}
-- @After
++ @AfterEach
public void closeConnections()
{
IntegrationUtils.closeConnections();
diff --cc core-integ/src/test/java/org/apache/directory/server/core/authz/MoveRenameAuthorizationIT.java
index 5303a74,5303a74..3ad9da2
--- a/core-integ/src/test/java/org/apache/directory/server/core/authz/MoveRenameAuthorizationIT.java
+++ b/core-integ/src/test/java/org/apache/directory/server/core/authz/MoveRenameAuthorizationIT.java
@@@ -28,8 -28,8 +28,8 @@@ import static org.apache.directory.serv
import static org.apache.directory.server.core.authz.AutzIntegUtils.getAdminConnection;
import static org.apache.directory.server.core.authz.AutzIntegUtils.getConnectionAs;
import static org.apache.directory.server.core.authz.AutzIntegUtils.removeUserFromGroup;
--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.apache.directory.api.ldap.model.constants.SchemaConstants;
import org.apache.directory.api.ldap.model.entry.DefaultEntry;
@@@ -41,12 -41,12 +41,12 @@@ import org.apache.directory.api.ldap.mo
import org.apache.directory.ldap.client.api.LdapConnection;
import org.apache.directory.server.core.annotations.CreateDS;
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.directory.server.core.integ.IntegrationUtils;
--import org.junit.After;
--import org.junit.Before;
--import org.junit.Test;
--import org.junit.runner.RunWith;
++import org.junit.jupiter.api.AfterEach;
++import org.junit.jupiter.api.BeforeEach;
++import org.junit.jupiter.api.Test;
++import org.junit.jupiter.api.extension.ExtendWith;
/**
@@@ -54,11 -54,11 +54,11 @@@
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
--@RunWith(FrameworkRunner.class)
++@ExtendWith( ApacheDSTestExtension.class )
@CreateDS(name = "MoveRenameAuthorizationIT")
public class MoveRenameAuthorizationIT extends AbstractLdapTestUnit
{
-- @Before
++ @BeforeEach
public void setService()
{
AutzIntegUtils.service = getService();
@@@ -66,7 -66,7 +66,7 @@@
}
-- @After
++ @AfterEach
public void closeConnections()
{
IntegrationUtils.closeConnections();
diff --cc core-integ/src/test/java/org/apache/directory/server/core/authz/SearchAuthorizationIT.java
index c3a8ec2,c3a8ec2..0c0d569
--- a/core-integ/src/test/java/org/apache/directory/server/core/authz/SearchAuthorizationIT.java
+++ b/core-integ/src/test/java/org/apache/directory/server/core/authz/SearchAuthorizationIT.java
@@@ -30,12 -30,12 +30,12 @@@ import static org.apache.directory.serv
import static org.apache.directory.server.core.authz.AutzIntegUtils.getAdminConnection;
import static org.apache.directory.server.core.authz.AutzIntegUtils.getConnectionAs;
import static org.apache.directory.server.core.authz.AutzIntegUtils.removeEntryACI;
--import static org.junit.Assert.assertEquals;
--import static org.junit.Assert.assertFalse;
--import static org.junit.Assert.assertNotNull;
--import static org.junit.Assert.assertNull;
--import static org.junit.Assert.assertTrue;
--import static org.junit.Assert.fail;
++import static org.junit.jupiter.api.Assertions.assertNotNull;
++import static org.junit.jupiter.api.Assertions.assertNull;
++import static org.junit.jupiter.api.Assertions.assertTrue;
++import static org.junit.jupiter.api.Assertions.fail;
++import static org.junit.jupiter.api.Assertions.assertEquals;
++import static org.junit.jupiter.api.Assertions.assertFalse;
import java.net.URL;
import java.util.HashMap;
@@@ -55,14 -55,14 +55,14 @@@ import org.apache.directory.server.core
import org.apache.directory.server.core.annotations.CreateDS;
import org.apache.directory.server.core.annotations.LoadSchema;
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.directory.server.core.integ.IntegrationUtils;
import org.apache.directory.server.protocol.shared.store.LdifFileLoader;
--import org.junit.After;
--import org.junit.Before;
--import org.junit.Ignore;
--import org.junit.Test;
--import org.junit.runner.RunWith;
++import org.junit.jupiter.api.AfterEach;
++import org.junit.jupiter.api.BeforeEach;
++import org.junit.jupiter.api.Disabled;
++import org.junit.jupiter.api.Test;
++import org.junit.jupiter.api.extension.ExtendWith;
/**
@@@ -71,7 -71,7 +71,7 @@@
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
--@RunWith(FrameworkRunner.class)
++@ExtendWith( ApacheDSTestExtension.class )
@CreateDS(
enableAccessControl = true,
name = "SearchAuthorizationIT",
@@@ -152,14 -152,14 +152,14 @@@
})
public class SearchAuthorizationIT extends AbstractLdapTestUnit
{
-- @Before
++ @BeforeEach
public void setService() throws Exception
{
AutzIntegUtils.service = getService();
}
-- @After
++ @AfterEach
public void closeConnections()
{
IntegrationUtils.closeConnections();
@@@ -1112,7 -1112,7 +1112,7 @@@
* @throws Exception if the test encounters an error
*/
@Test
-- @Ignore("The test is currently failing")
++ @Disabled( "The test is currently failing" )
public void testRangeOfValues() throws Exception
{
// create the non-admin user
diff --cc core-integ/src/test/java/org/apache/directory/server/core/authz/support/MaxImmSubFilterIT.java
index d21e2cc,d21e2cc..aa258e2
--- a/core-integ/src/test/java/org/apache/directory/server/core/authz/support/MaxImmSubFilterIT.java
+++ b/core-integ/src/test/java/org/apache/directory/server/core/authz/support/MaxImmSubFilterIT.java
@@@ -20,7 -20,7 +20,7 @@@
package org.apache.directory.server.core.authz.support;
--import static org.junit.Assert.assertEquals;
++import static org.junit.jupiter.api.Assertions.assertEquals;
import java.util.ArrayList;
import java.util.Collection;
@@@ -41,11 -41,11 +41,12 @@@ import org.apache.directory.api.ldap.mo
import org.apache.directory.server.core.annotations.CreateDS;
import org.apache.directory.server.core.api.interceptor.context.AddOperationContext;
import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
--import org.apache.directory.server.core.integ.FrameworkRunner;
--import org.junit.Before;
--import org.junit.Ignore;
--import org.junit.Test;
--import org.junit.runner.RunWith;
++import org.apache.directory.server.core.integ.ApacheDSTestExtension;
++import org.junit.jupiter.api.BeforeEach;
++import org.junit.jupiter.api.Disabled;
++import org.junit.jupiter.api.Test;
++import org.junit.jupiter.api.extension.ExtendWith;
++
/**
@@@ -53,7 -53,7 +54,7 @@@
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
--@RunWith(FrameworkRunner.class)
++@ExtendWith( ApacheDSTestExtension.class )
@CreateDS(name = "MaxImmSubFilter-DS")
public class MaxImmSubFilterIT extends AbstractLdapTestUnit
{
@@@ -75,7 -75,7 +76,7 @@@
private SchemaManager schemaManager;
-- @Before
++ @BeforeEach
public void setup() throws Exception
{
schemaManager = service.getSchemaManager();
@@@ -166,7 -166,7 +167,7 @@@
@Test
-- @Ignore("test is failing cause of incorrect results from MaxImmSubFilter.filter() method after " +
++ @Disabled("test is failing cause of incorrect results from MaxImmSubFilter.filter() method after " +
"started using real OperationContext instead of MockOperationContext")
public void testGrantTuple() throws Exception
{
diff --cc core-integ/src/test/java/org/apache/directory/server/core/changelog/DefaultChangeLogIT.java
index a50e668,a50e668..af1f655
--- a/core-integ/src/test/java/org/apache/directory/server/core/changelog/DefaultChangeLogIT.java
+++ b/core-integ/src/test/java/org/apache/directory/server/core/changelog/DefaultChangeLogIT.java
@@@ -20,10 -20,10 +20,10 @@@ package org.apache.directory.server.cor
import static org.apache.directory.server.core.integ.IntegrationUtils.getAdminConnection;
--import static org.junit.Assert.assertEquals;
--import static org.junit.Assert.assertNotNull;
--import static org.junit.Assert.assertNull;
--import static org.junit.Assert.assertTrue;
++import static org.junit.jupiter.api.Assertions.assertEquals;
++import static org.junit.jupiter.api.Assertions.assertNotNull;
++import static org.junit.jupiter.api.Assertions.assertNull;
++import static org.junit.jupiter.api.Assertions.assertTrue;
import java.util.Arrays;
@@@ -39,11 -39,11 +39,11 @@@ import org.apache.directory.server.core
import org.apache.directory.server.core.api.changelog.Tag;
import org.apache.directory.server.core.factory.DefaultDirectoryServiceFactory;
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.directory.server.core.integ.IntegrationUtils;
--import org.junit.After;
--import org.junit.Test;
--import org.junit.runner.RunWith;
++import org.junit.jupiter.api.AfterEach;
++import org.junit.jupiter.api.Test;
++import org.junit.jupiter.api.extension.ExtendWith;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@@ -55,14 -55,14 +55,14 @@@
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
--@RunWith(FrameworkRunner.class)
++@ExtendWith( ApacheDSTestExtension.class )
@CreateDS(factory = DefaultDirectoryServiceFactory.class, name = "DefaultChangeLogIT-class")
public class DefaultChangeLogIT extends AbstractLdapTestUnit
{
public static final Logger LOG = LoggerFactory.getLogger( DefaultChangeLogIT.class );
-- @After
++ @AfterEach
public void closeConnections()
{
IntegrationUtils.closeConnections();
diff --cc core-integ/src/test/java/org/apache/directory/server/core/changelog/MemoryChangeLogStoreTest.java
index 8a8905a,8a8905a..8b0a1ae
--- a/core-integ/src/test/java/org/apache/directory/server/core/changelog/MemoryChangeLogStoreTest.java
+++ b/core-integ/src/test/java/org/apache/directory/server/core/changelog/MemoryChangeLogStoreTest.java
@@@ -19,10 -19,10 +19,10 @@@
package org.apache.directory.server.core.changelog;
--import static org.junit.Assert.assertEquals;
--import static org.junit.Assert.assertNotSame;
--import static org.junit.Assert.assertNull;
--import static org.junit.Assert.fail;
++import static org.junit.jupiter.api.Assertions.assertEquals;
++import static org.junit.jupiter.api.Assertions.assertNotSame;
++import static org.junit.jupiter.api.Assertions.assertNull;
++import static org.junit.jupiter.api.Assertions.fail;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@@ -124,7 -124,7 +124,7 @@@ public class MemoryChangeLogStoreTes
@Test
public void testLogCheckRevision() throws Exception
{
-- assertEquals( "first revision is always 0", 0, store.getCurrentRevision() );
++ assertEquals( 0, store.getCurrentRevision(), "first revision is always 0" );
LdifEntry forward = new LdifEntry();
forward.setDn( "ou=system" );
diff --cc core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java
index bef787a,bef787a..ff0c41f
--- a/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java
+++ b/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java
@@@ -20,10 -20,10 +20,10 @@@
package org.apache.directory.server.core.collective;
--import static org.junit.Assert.assertEquals;
--import static org.junit.Assert.assertNotNull;
--import static org.junit.Assert.assertNull;
--import static org.junit.Assert.assertTrue;
++import static org.junit.jupiter.api.Assertions.assertEquals;
++import static org.junit.jupiter.api.Assertions.assertNotNull;
++import static org.junit.jupiter.api.Assertions.assertNull;
++import static org.junit.jupiter.api.Assertions.assertTrue;
import java.util.HashMap;
import java.util.Map;
@@@ -43,11 -43,11 +43,12 @@@ import org.apache.directory.api.ldap.mo
import org.apache.directory.ldap.client.api.LdapConnection;
import org.apache.directory.server.core.annotations.CreateDS;
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.directory.server.core.integ.IntegrationUtils;
--import org.junit.Ignore;
--import org.junit.Test;
--import org.junit.runner.RunWith;
++import org.junit.jupiter.api.Assertions;
++import org.junit.jupiter.api.Disabled;
++import org.junit.jupiter.api.Test;
++import org.junit.jupiter.api.extension.ExtendWith;
/**
@@@ -55,7 -55,7 +56,7 @@@
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
--@RunWith(FrameworkRunner.class)
++@ExtendWith( ApacheDSTestExtension.class )
@CreateDS(name = "CollectiveAttributeServiceIT")
public class CollectiveAttributeServiceIT extends AbstractLdapTestUnit
{
@@@ -207,7 -207,7 +208,7 @@@
Entry entry = connection.lookup( "ou=services,ou=configuration,ou=system" );
Attribute c_ou = entry.get( "c-ou" );
-- assertNotNull( "a collective c-ou attribute should be present", c_ou );
++ assertNotNull( c_ou, "a collective c-ou attribute should be present" );
assertEquals( "configuration", c_ou.getString() );
// -------------------------------------------------------------------
@@@ -216,7 -216,7 +217,7 @@@
entry = connection.lookup( "ou=users,ou=system" );
c_ou = entry.get( "c-ou" );
-- assertNull( "the c-ou collective attribute should not be present", c_ou );
++ assertNull( c_ou, "the c-ou collective attribute should not be present" );
// -------------------------------------------------------------------
// now modify entries included by the subentry to have collectiveExclusions
@@@ -231,7 -231,7 +232,7 @@@
if ( c_ou != null )
{
-- assertEquals( "the c-ou collective attribute should not be present", 0, c_ou.size() );
++ assertEquals( 0, c_ou.size(), "the c-ou collective attribute should not be present" );
}
// now add more collective subentries - the c-ou should still not show due to exclusions
@@@ -243,14 -243,14 +244,14 @@@
if ( c_ou != null )
{
-- assertEquals( "the c-ou collective attribute should not be present", 0, c_ou.size() );
++ assertEquals( 0, c_ou.size(), "the c-ou collective attribute should not be present" );
}
// entries without the collectiveExclusion should still show both values of c-ou
entry = connection.lookup( "ou=interceptors,ou=configuration,ou=system" );
c_ou = entry.get( "c-ou" );
-- assertNotNull( "a collective c-ou attribute should be present", c_ou );
++ assertNotNull( c_ou, "a collective c-ou attribute should be present" );
assertTrue( c_ou.contains( "configuration" ) );
assertTrue( c_ou.contains( "configuration2" ) );
@@@ -258,7 -258,7 +259,7 @@@
entry = connection.lookup( "ou=interceptors,ou=configuration,ou=system", "c-ou" );
c_ou = entry.get( "c-ou" );
-- assertNotNull( "a collective c-ou attribute should be present", c_ou );
++ assertNotNull( c_ou, "a collective c-ou attribute should be present" );
assertTrue( c_ou.contains( "configuration" ) );
assertTrue( c_ou.contains( "configuration2" ) );
@@@ -266,7 -266,7 +267,7 @@@
entry = connection.lookup( "ou=interceptors,ou=configuration,ou=system", "objectClass" );
c_ou = entry.get( "c-ou" );
-- assertNull( "a collective c-ou attribute should not be present", c_ou );
++ assertNull( c_ou, "a collective c-ou attribute should not be present" );
// -------------------------------------------------------------------
// now add the subentry for the c-st collective attribute
@@@ -277,19 -277,19 +278,19 @@@
entry = connection.lookup( "ou=services,ou=configuration,ou=system" );
Attribute c_st = entry.get( "c-st" );
-- assertNotNull( "a collective c-st attribute should be present", c_st );
++ assertNotNull( c_st, "a collective c-st attribute should be present" );
assertTrue( c_st.contains( "FL" ) );
// in node without exclusions both values of c-ou should appear with c-st value
entry = connection.lookup( "ou=interceptors,ou=configuration,ou=system" );
c_ou = entry.get( "c-ou" );
-- assertNotNull( "a collective c-ou attribute should be present", c_ou );
++ assertNotNull( c_ou, "a collective c-ou attribute should be present" );
assertTrue( c_ou.contains( "configuration" ) );
assertTrue( c_ou.contains( "configuration2" ) );
c_st = entry.get( "c-st" );
-- assertNotNull( "a collective c-st attribute should be present", c_st );
++ assertNotNull( c_st, "a collective c-st attribute should be present" );
assertTrue( c_st.contains( "FL" ) );
// -------------------------------------------------------------------
@@@ -305,14 -305,14 +306,14 @@@
if ( c_ou != null )
{
-- assertEquals( "the c-ou collective attribute should not be present", 0, c_ou.size() );
++ assertEquals( 0, c_ou.size(), "the c-ou collective attribute should not be present" );
}
c_st = entry.get( "c-st" );
if ( c_st != null )
{
-- assertEquals( "the c-st collective attribute should not be present", 0, c_st.size() );
++ assertEquals( 0, c_st.size(), "the c-st collective attribute should not be present" );
}
connection.close();
@@@ -320,7 -320,7 +321,7 @@@
@Test
-- @Ignore("This test is failing until we fix the handling of collective attributes in filters")
++ @Disabled("This test is failing until we fix the handling of collective attributes in filters")
public void testSearchFilterCollectiveAttribute() throws Exception
{
LdapConnection connection = IntegrationUtils.getAdminConnection( getService() );
@@@ -369,7 -369,7 +370,7 @@@
Map<String, Entry> entries = getAllEntries( connection, false );
Entry entry = entries.get( "ou=services,ou=configuration,ou=system" );
Attribute c_ou = entry.get( "c-ou" );
-- assertNotNull( "a collective c-ou attribute should be present", c_ou );
++ assertNotNull( c_ou, "a collective c-ou attribute should be present" );
assertEquals( "configuration", c_ou.getString() );
// -------------------------------------------------------------------
@@@ -398,7 -398,7 +399,7 @@@
entries = getAllEntriesCollectiveAttributesOnly( connection );
entry = entries.get( "ou=services,ou=configuration,ou=system" );
c_ou = entry.get( "c-ou" );
-- assertNotNull( "a collective c-ou attribute should be present", c_ou );
++ assertNotNull( c_ou, "a collective c-ou attribute should be present" );
assertEquals( "configuration", c_ou.getString() );
// -------------------------------------------------------------------
@@@ -406,7 -406,7 +407,7 @@@
// -------------------------------------------------------------------
entry = entries.get( "ou=users,ou=system" );
c_ou = entry.get( "c-ou" );
-- assertNull( "the c-ou collective attribute should not be present", c_ou );
++ assertNull( c_ou, "the c-ou collective attribute should not be present" );
// -------------------------------------------------------------------
// now modify entries included by the subentry to have collectiveExclusions
@@@ -424,7 -424,7 +425,7 @@@
if ( c_ou != null )
{
-- assertEquals( "the c-ou collective attribute should not be present", 0, c_ou.size() );
++ assertEquals( 0, c_ou.size(), "the c-ou collective attribute should not be present" );
}
// System.out.println( "----- Exclusions OK" );
@@@ -438,13 -438,13 +439,13 @@@
if ( c_ou != null )
{
-- assertEquals( "the c-ou collective attribute should not be present", 0, c_ou.size() );
++ assertEquals( 0, c_ou.size(), "the c-ou collective attribute should not be present" );
}
// entries without the collectiveExclusion should still show both values of c-ou
entry = entries.get( "ou=interceptors,ou=configuration,ou=system" );
c_ou = entry.get( "c-ou" );
-- assertNotNull( "a collective c-ou attribute should be present", c_ou );
++ assertNotNull( c_ou, "a collective c-ou attribute should be present" );
assertTrue( c_ou.contains( "configuration" ) );
assertTrue( c_ou.contains( "configuration2" ) );
@@@ -458,17 -458,17 +459,17 @@@
// the new attribute c-st should appear in the node with the c-ou exclusion
entry = entries.get( "ou=services,ou=configuration,ou=system" );
Attribute c_st = entry.get( "c-st" );
-- assertNotNull( "a collective c-st attribute should be present", c_st );
++ assertNotNull( c_st, "a collective c-st attribute should be present" );
assertTrue( c_st.contains( "FL" ) );
// in node without exclusions both values of c-ou should appear with c-st value
entry = entries.get( "ou=interceptors,ou=configuration,ou=system" );
c_ou = entry.get( "c-ou" );
-- assertNotNull( "a collective c-ou attribute should be present", c_ou );
++ assertNotNull( c_ou , "a collective c-ou attribute should be present");
assertTrue( c_ou.contains( "configuration" ) );
assertTrue( c_ou.contains( "configuration2" ) );
c_st = entry.get( "c-st" );
-- assertNotNull( "a collective c-st attribute should be present", c_st );
++ assertNotNull( c_st, "a collective c-st attribute should be present" );
assertTrue( c_st.contains( "FL" ) );
// -------------------------------------------------------------------
@@@ -486,14 -486,14 +487,14 @@@
if ( c_ou != null )
{
-- assertEquals( "the c-ou collective attribute should not be present", 0, c_ou.size() );
++ assertEquals( 0, c_ou.size(), "the c-ou collective attribute should not be present" );
}
c_st = entry.get( "c-st" );
if ( c_st != null )
{
-- assertEquals( "the c-st collective attribute should not be present", 0, c_st.size() );
++ assertEquals( 0, c_st.size(), "the c-st collective attribute should not be present" );
}
// -------------------------------------------------------------------
@@@ -505,7 -505,7 +506,7 @@@
// we should no longer see collective attributes with restricted return attribs
entry = entries.get( "ou=services,ou=configuration,ou=system" );
c_st = entry.get( "c-st" );
-- assertNull( "a collective c-st attribute should NOT be present", c_st );
++ assertNull( c_st, "a collective c-st attribute should NOT be present" );
entry = entries.get( "ou=partitions,ou=configuration,ou=system" );
c_ou = entry.get( "c-ou" );
@@@ -517,30 -517,30 +518,36 @@@
}
-- @Test(expected = LdapSchemaViolationException.class)
++ @Test
public void testAddRegularEntryWithCollectiveAttribute() throws Exception
{
-- LdapConnection connection = IntegrationUtils.getAdminConnection( getService() );
-- Entry entry = getTestEntry( "cn=Ersin Er,ou=system", "Ersin Er" );
-- entry.put( "c-l", "Turkiye" );
--
-- connection.add( entry );
-- connection.close();
++ Assertions.assertThrows( LdapSchemaViolationException.class, () ->
++ {
++ LdapConnection connection = IntegrationUtils.getAdminConnection( getService() );
++ Entry entry = getTestEntry( "cn=Ersin Er,ou=system", "Ersin Er" );
++ entry.put( "c-l", "Turkiye" );
++
++ connection.add( entry );
++ connection.close();
++ } );
}
-- @Test(expected = LdapSchemaViolationException.class)
++ @Test
public void testModifyRegularEntryAddingCollectiveAttribute() throws Exception
{
-- LdapConnection connection = IntegrationUtils.getAdminConnection( getService() );
--
-- Entry entry = getTestEntry( "cn=Ersin Er,ou=system", "Ersin Er" );
-- connection.add( entry );
--
-- connection.modify( "cn=Ersin Er,ou=system", new DefaultModification(
-- ModificationOperation.ADD_ATTRIBUTE, new DefaultAttribute( "c-l", "Turkiye" ) ) );
--
-- connection.close();
++ Assertions.assertThrows( LdapSchemaViolationException.class, () ->
++ {
++ LdapConnection connection = IntegrationUtils.getAdminConnection( getService() );
++
++ Entry entry = getTestEntry( "cn=Ersin Er,ou=system", "Ersin Er" );
++ connection.add( entry );
++
++ connection.modify( "cn=Ersin Er,ou=system", new DefaultModification(
++ ModificationOperation.ADD_ATTRIBUTE, new DefaultAttribute( "c-l", "Turkiye" ) ) );
++
++ connection.close();
++ } );
}
@@@ -560,7 -560,7 +567,7 @@@
Entry entry = connection.lookup( "ou=interceptors,ou=configuration,ou=system", "ou" );
Attribute c_ou = entry.get( "c-ou" );
-- assertNotNull( "a collective c-ou attribute should be present", c_ou );
++ assertNotNull( c_ou, "a collective c-ou attribute should be present" );
assertTrue( c_ou.contains( "configuration" ) );
connection.close();
diff --cc core-integ/src/test/java/org/apache/directory/server/core/configuration/PartitionConfigurationIT.java
index a366f42,a366f42..bb93b70
--- a/core-integ/src/test/java/org/apache/directory/server/core/configuration/PartitionConfigurationIT.java
+++ b/core-integ/src/test/java/org/apache/directory/server/core/configuration/PartitionConfigurationIT.java
@@@ -20,8 -20,8 +20,8 @@@
package org.apache.directory.server.core.configuration;
--import static org.junit.Assert.assertNotNull;
--import static org.junit.Assert.assertNull;
++import static org.junit.jupiter.api.Assertions.assertNotNull;
++import static org.junit.jupiter.api.Assertions.assertNull;
import java.io.IOException;
import java.util.UUID;
@@@ -34,16 -34,16 +34,15 @@@ import org.apache.directory.ldap.client
import org.apache.directory.server.core.annotations.CreateDS;
import org.apache.directory.server.core.api.interceptor.context.AddOperationContext;
import org.apache.directory.server.core.api.partition.Partition;
--import org.apache.directory.server.core.api.partition.PartitionReadTxn;
import org.apache.directory.server.core.api.partition.PartitionTxn;
import org.apache.directory.server.core.factory.DefaultDirectoryServiceFactory;
import org.apache.directory.server.core.factory.DirectoryServiceFactory;
import org.apache.directory.server.core.factory.PartitionFactory;
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.directory.server.core.integ.IntegrationUtils;
--import org.junit.Test;
--import org.junit.runner.RunWith;
++import org.junit.jupiter.api.Test;
++import org.junit.jupiter.api.extension.ExtendWith;
/**
@@@ -51,7 -51,7 +50,7 @@@
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
--@RunWith(FrameworkRunner.class)
++@ExtendWith( ApacheDSTestExtension.class )
@CreateDS(name = "PartitionConfigurationIT")
public class PartitionConfigurationIT extends AbstractLdapTestUnit
{
diff --cc core-integ/src/test/java/org/apache/directory/server/core/event/EventServiceIT.java
index db20146,db20146..d243e78
--- a/core-integ/src/test/java/org/apache/directory/server/core/event/EventServiceIT.java
+++ b/core-integ/src/test/java/org/apache/directory/server/core/event/EventServiceIT.java
@@@ -22,7 -22,7 +22,7 @@@ package org.apache.directory.server.cor
import static org.apache.directory.server.core.integ.IntegrationUtils.getConnectionAs;
import static org.apache.directory.server.core.integ.IntegrationUtils.getSystemContext;
--import static org.junit.Assert.assertEquals;
++import static org.junit.jupiter.api.Assertions.assertEquals;
import java.util.ArrayList;
import java.util.EventObject;
@@@ -41,9 -41,9 +41,9 @@@ import org.apache.directory.api.ldap.mo
import org.apache.directory.ldap.client.api.LdapConnection;
import org.apache.directory.server.core.annotations.CreateDS;
import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
--import org.apache.directory.server.core.integ.FrameworkRunner;
--import org.junit.Test;
--import org.junit.runner.RunWith;
++import org.apache.directory.server.core.integ.ApacheDSTestExtension;
++import org.junit.jupiter.api.Test;
++import org.junit.jupiter.api.extension.ExtendWith;
/**
@@@ -51,7 -51,7 +51,7 @@@
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
--@RunWith(FrameworkRunner.class)
++@ExtendWith( ApacheDSTestExtension.class )
@CreateDS(name = "EventServiceIT")
public class EventServiceIT extends AbstractLdapTestUnit
{
diff --cc core-integ/src/test/java/org/apache/directory/server/core/exception/ExceptionServiceIT.java
index 5443ef3,5443ef3..8eeea4e
--- a/core-integ/src/test/java/org/apache/directory/server/core/exception/ExceptionServiceIT.java
+++ b/core-integ/src/test/java/org/apache/directory/server/core/exception/ExceptionServiceIT.java
@@@ -21,12 -21,12 +21,12 @@@ package org.apache.directory.server.cor
import static org.apache.directory.server.core.integ.IntegrationUtils.getAdminConnection;
--import static org.junit.Assert.assertEquals;
--import static org.junit.Assert.assertFalse;
--import static org.junit.Assert.assertNotNull;
--import static org.junit.Assert.assertNull;
--import static org.junit.Assert.assertTrue;
--import static org.junit.Assert.fail;
++import static org.junit.jupiter.api.Assertions.assertEquals;
++import static org.junit.jupiter.api.Assertions.assertFalse;
++import static org.junit.jupiter.api.Assertions.assertNotNull;
++import static org.junit.jupiter.api.Assertions.assertNull;
++import static org.junit.jupiter.api.Assertions.assertTrue;
++import static org.junit.jupiter.api.Assertions.fail;
import org.apache.directory.api.ldap.model.constants.SchemaConstants;
import org.apache.directory.api.ldap.model.cursor.EntryCursor;
@@@ -51,19 -51,19 +51,19 @@@ import org.apache.directory.ldap.client
import org.apache.directory.server.constants.ServerDNConstants;
import org.apache.directory.server.core.annotations.CreateDS;
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.directory.server.core.integ.IntegrationUtils;
--import org.junit.After;
--import org.junit.Test;
--import org.junit.runner.RunWith;
--
++import org.junit.jupiter.api.AfterEach;
++import org.junit.jupiter.api.Assertions;
++import org.junit.jupiter.api.Test;
++import org.junit.jupiter.api.extension.ExtendWith;
/**
* Tests the correct operation of the ServerExceptionService.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
--@RunWith(FrameworkRunner.class)
++@ExtendWith( ApacheDSTestExtension.class )
@CreateDS(name = "ExceptionServiceIT-DS")
public class ExceptionServiceIT extends AbstractLdapTestUnit
{
@@@ -94,7 -94,7 +94,7 @@@
}
-- @After
++ @AfterEach
public void closeConnections()
{
IntegrationUtils.closeConnections();
@@@ -270,12 -270,12 +270,15 @@@
*
* @throws Exception on error
*/
-- @Test(expected = LdapEntryAlreadyExistsException.class)
++ @Test
public void testFailModifyRdnEntryAlreadyExists() throws Exception
{
-- LdapConnection connection = getAdminConnection( getService() );
--
-- connection.rename( "ou=users,ou=system", "ou=Groups" );
++ Assertions.assertThrows( LdapEntryAlreadyExistsException.class, () ->
++ {
++ LdapConnection connection = getAdminConnection( getService() );
++
++ connection.rename( "ou=users,ou=system", "ou=Groups" );
++ } );
}
@@@ -284,12 -284,12 +287,15 @@@
*
* @throws Exception on error
*/
-- @Test(expected = LdapNoSuchObjectException.class)
++ @Test
public void testFailModifyRdnNoSuchObject() throws Exception
{
-- LdapConnection connection = getAdminConnection( getService() );
--
-- connection.rename( "ou=blah,ou=system", "ou=asdf" );
++ Assertions.assertThrows( LdapNoSuchObjectException.class, () ->
++ {
++ LdapConnection connection = getAdminConnection( getService() );
++
++ connection.rename( "ou=blah,ou=system", "ou=asdf" );
++ } );
}
@@@ -452,22 -452,22 +458,25 @@@
*
* @throws Exception on error
*/
-- @Test(expected = LdapAliasException.class)
++ @Test
public void testFailAddOnAlias() throws Exception
{
-- LdapConnection connection = getAdminConnection( getService() );
--
-- Entry entry = new DefaultEntry( "cn=toanother,ou=system" );
-- entry.add( SchemaConstants.OBJECT_CLASS_AT, "alias", SchemaConstants.EXTENSIBLE_OBJECT_OC );
-- entry.add( "aliasedObjectName", "ou=users,ou=system" );
--
-- connection.add( entry );
--
-- Entry aliasChild = new DefaultEntry( "ou=blah,cn=toanother,ou=system" );
-- aliasChild.add( SchemaConstants.OBJECT_CLASS_AT, "organizationalUnit" );
-- aliasChild.add( SchemaConstants.OU_AT, "blah" );
--
-- connection.add( aliasChild );
++ Assertions.assertThrows( LdapAliasException.class, () ->
++ {
++ LdapConnection connection = getAdminConnection( getService() );
++
++ Entry entry = new DefaultEntry( "cn=toanother,ou=system" );
++ entry.add( SchemaConstants.OBJECT_CLASS_AT, "alias", SchemaConstants.EXTENSIBLE_OBJECT_OC );
++ entry.add( "aliasedObjectName", "ou=users,ou=system" );
++
++ connection.add( entry );
++
++ Entry aliasChild = new DefaultEntry( "ou=blah,cn=toanother,ou=system" );
++ aliasChild.add( SchemaConstants.OBJECT_CLASS_AT, "organizationalUnit" );
++ aliasChild.add( SchemaConstants.OU_AT, "blah" );
++
++ connection.add( aliasChild );
++ } );
}
@@@ -512,15 -512,15 +521,18 @@@
*
* @throws Exception on error
*/
-- @Test(expected = LdapContextNotEmptyException.class)
++ @Test
public void testFailDeleteNotAllowedOnNonLeaf() throws Exception
{
-- LdapConnection connection = getAdminConnection( getService() );
--
-- AddResponse resp = createSubContext( "ou", "blah" );
-- resp = createSubContext( new Dn( "ou=blah,ou=system" ), "ou", "subctx" );
--
-- connection.delete( "ou=blah,ou=system" );
++ Assertions.assertThrows( LdapContextNotEmptyException.class, () ->
++ {
++ LdapConnection connection = getAdminConnection( getService() );
++
++ AddResponse resp = createSubContext( "ou", "blah" );
++ resp = createSubContext( new Dn( "ou=blah,ou=system" ), "ou", "subctx" );
++
++ connection.delete( "ou=blah,ou=system" );
++ } );
}
@@@ -530,12 -530,12 +542,15 @@@
*
* @throws Exception on error
*/
-- @Test(expected = LdapNoSuchObjectException.class)
++ @Test
public void testFailDeleteNoSuchObject() throws Exception
{
-- LdapConnection connection = getAdminConnection( getService() );
--
-- connection.delete( "ou=blah,ou=system" );
++ Assertions.assertThrows( LdapNoSuchObjectException.class, () ->
++ {
++ LdapConnection connection = getAdminConnection( getService() );
++
++ connection.delete( "ou=blah,ou=system" );
++ } );
}
diff --cc core-integ/src/test/java/org/apache/directory/server/core/jndi/AddJndiIT.java
index 18028da,18028da..5dce1a9
--- a/core-integ/src/test/java/org/apache/directory/server/core/jndi/AddJndiIT.java
+++ b/core-integ/src/test/java/org/apache/directory/server/core/jndi/AddJndiIT.java
@@@ -21,10 -21,10 +21,10 @@@ package org.apache.directory.server.cor
import static org.apache.directory.server.core.integ.IntegrationUtils.getSystemContext;
--import static org.junit.Assert.assertEquals;
--import static org.junit.Assert.assertNotNull;
--import static org.junit.Assert.assertTrue;
--import static org.junit.Assert.fail;
++import static org.junit.jupiter.api.Assertions.assertEquals;
++import static org.junit.jupiter.api.Assertions.assertNotNull;
++import static org.junit.jupiter.api.Assertions.assertTrue;
++import static org.junit.jupiter.api.Assertions.fail;
import javax.naming.NamingEnumeration;
import javax.naming.NamingException;
@@@ -38,9 -38,9 +38,9 @@@ import javax.naming.ldap.LdapContext
import org.apache.directory.api.ldap.model.ldif.LdifUtils;
import org.apache.directory.server.core.annotations.CreateDS;
import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
--import org.apache.directory.server.core.integ.FrameworkRunner;
--import org.junit.Test;
--import org.junit.runner.RunWith;
++import org.apache.directory.server.core.integ.ApacheDSTestExtension;
++import org.junit.jupiter.api.Test;
++import org.junit.jupiter.api.extension.ExtendWith;
/**
@@@ -48,7 -48,7 +48,7 @@@
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
--@RunWith(FrameworkRunner.class)
++@ExtendWith( ApacheDSTestExtension.class )
@CreateDS(name = "AddIT")
public class AddJndiIT extends AbstractLdapTestUnit
{
diff --cc core-integ/src/test/java/org/apache/directory/server/core/jndi/CreateContextIT.java
index 787bdbc,787bdbc..c2e0db7
--- a/core-integ/src/test/java/org/apache/directory/server/core/jndi/CreateContextIT.java
+++ b/core-integ/src/test/java/org/apache/directory/server/core/jndi/CreateContextIT.java
@@@ -21,11 -21,11 +21,11 @@@ package org.apache.directory.server.cor
import static org.apache.directory.server.core.integ.IntegrationUtils.getSystemContext;
--import static org.junit.Assert.assertEquals;
--import static org.junit.Assert.assertNotNull;
--import static org.junit.Assert.assertNull;
--import static org.junit.Assert.assertTrue;
--import static org.junit.Assert.fail;
++import static org.junit.jupiter.api.Assertions.assertEquals;
++import static org.junit.jupiter.api.Assertions.assertNotNull;
++import static org.junit.jupiter.api.Assertions.assertNull;
++import static org.junit.jupiter.api.Assertions.assertTrue;
++import static org.junit.jupiter.api.Assertions.fail;
import javax.naming.CompositeName;
import javax.naming.Name;
@@@ -43,9 -43,9 +43,9 @@@ import javax.naming.ldap.LdapContext
import org.apache.directory.api.ldap.model.ldif.LdifUtils;
import org.apache.directory.server.core.annotations.CreateDS;
import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
--import org.apache.directory.server.core.integ.FrameworkRunner;
--import org.junit.Test;
--import org.junit.runner.RunWith;
++import org.apache.directory.server.core.integ.ApacheDSTestExtension;
++import org.junit.jupiter.api.Test;
++import org.junit.jupiter.api.extension.ExtendWith;
/**
@@@ -53,7 -53,7 +53,7 @@@
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
--@RunWith(FrameworkRunner.class)
++@ExtendWith( ApacheDSTestExtension.class )
@CreateDS(name = "CreateContextIT")
public class CreateContextIT extends AbstractLdapTestUnit
{
diff --cc core-integ/src/test/java/org/apache/directory/server/core/jndi/DIRSERVER169IT.java
index c481998,c481998..6e458f1
--- a/core-integ/src/test/java/org/apache/directory/server/core/jndi/DIRSERVER169IT.java
+++ b/core-integ/src/test/java/org/apache/directory/server/core/jndi/DIRSERVER169IT.java
@@@ -21,8 -21,8 +21,8 @@@ package org.apache.directory.server.cor
import static org.apache.directory.server.core.integ.IntegrationUtils.getSystemContext;
--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 java.util.Hashtable;
@@@ -40,9 -40,9 +40,9 @@@ import org.apache.directory.api.ldap.mo
import org.apache.directory.server.core.annotations.CreateDS;
import org.apache.directory.server.core.api.DirectoryService;
import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
--import org.apache.directory.server.core.integ.FrameworkRunner;
--import org.junit.Test;
--import org.junit.runner.RunWith;
++import org.apache.directory.server.core.integ.ApacheDSTestExtension;
++import org.junit.jupiter.api.Test;
++import org.junit.jupiter.api.extension.ExtendWith;
/**
@@@ -50,7 -50,7 +50,7 @@@
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
--@RunWith(FrameworkRunner.class)
++@ExtendWith( ApacheDSTestExtension.class )
@CreateDS(allowAnonAccess = true, name = "DIRSERVER169IT")
public class DIRSERVER169IT extends AbstractLdapTestUnit
{
diff --cc core-integ/src/test/java/org/apache/directory/server/core/jndi/DIRSERVER791IT.java
index 8e1c04b,8e1c04b..0ee3136
--- a/core-integ/src/test/java/org/apache/directory/server/core/jndi/DIRSERVER791IT.java
+++ b/core-integ/src/test/java/org/apache/directory/server/core/jndi/DIRSERVER791IT.java
@@@ -21,10 -21,10 +21,10 @@@ package org.apache.directory.server.cor
import static org.apache.directory.server.core.integ.IntegrationUtils.getSystemContext;
--import static org.junit.Assert.assertEquals;
--import static org.junit.Assert.assertFalse;
--import static org.junit.Assert.assertTrue;
--import static org.junit.Assert.fail;
++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 static org.junit.jupiter.api.Assertions.fail;
import java.util.Hashtable;
@@@ -44,9 -44,9 +44,9 @@@ import javax.naming.directory.SchemaVio
import org.apache.directory.server.core.annotations.CreateDS;
import org.apache.directory.server.core.api.DirectoryService;
import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
--import org.apache.directory.server.core.integ.FrameworkRunner;
--import org.junit.Test;
--import org.junit.runner.RunWith;
++import org.apache.directory.server.core.integ.ApacheDSTestExtension;
++import org.junit.jupiter.api.Test;
++import org.junit.jupiter.api.extension.ExtendWith;
/**
@@@ -54,7 -54,7 +54,7 @@@
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
--@RunWith(FrameworkRunner.class)
++@ExtendWith( ApacheDSTestExtension.class )
@CreateDS(allowAnonAccess = true, name = "DIRSERVER791IT")
public class DIRSERVER791IT extends AbstractLdapTestUnit
{
@@@ -127,7 -127,7 +127,7 @@@
Attribute cn = attrs.get( "cn" );
// cn=aaa must be removed, cn=test must exist
-- assertEquals( "number of cn values", 1, cn.size() );
++ assertEquals( 1, cn.size(), "number of cn values" );
assertTrue( cn.contains( "test" ) );
assertFalse( cn.contains( "aaa" ) );
}
@@@ -162,7 -162,7 +162,7 @@@
Attribute cn = attrs.get( "cn" );
// cn=aaa must be removed, cn=test must exist
-- assertEquals( "number of cn values", 1, cn.size() );
++ assertEquals( 1, cn.size(), "number of cn values" );
assertTrue( cn.contains( "test" ) );
assertFalse( cn.contains( "aaa" ) );
}
@@@ -215,7 -215,7 +215,7 @@@
Attributes attrs = ctx.getAttributes( "cn=test", new String[]
{ "objectClass" } );
Attribute ocls = attrs.get( "objectClass" );
-- assertEquals( "number of objectClasses", 4, ocls.size() );
++ assertEquals( 4, ocls.size(), "number of objectClasses" );
assertTrue( ocls.contains( "top" ) );
assertTrue( ocls.contains( "person" ) );
assertTrue( ocls.contains( "organizationalPerson" ) );
diff --cc core-integ/src/test/java/org/apache/directory/server/core/jndi/DestroyContextIT.java
index 154de3b,154de3b..bbde095
--- a/core-integ/src/test/java/org/apache/directory/server/core/jndi/DestroyContextIT.java
+++ b/core-integ/src/test/java/org/apache/directory/server/core/jndi/DestroyContextIT.java
@@@ -21,8 -21,8 +21,8 @@@ package org.apache.directory.server.cor
import static org.apache.directory.server.core.integ.IntegrationUtils.getSystemContext;
--import static org.junit.Assert.assertTrue;
--import static org.junit.Assert.fail;
++import static org.junit.jupiter.api.Assertions.assertTrue;
++import static org.junit.jupiter.api.Assertions.fail;
import javax.naming.NamingException;
import javax.naming.ldap.LdapContext;
@@@ -30,9 -30,9 +30,9 @@@
import org.apache.directory.server.core.annotations.ApplyLdifs;
import org.apache.directory.server.core.annotations.CreateDS;
import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
--import org.apache.directory.server.core.integ.FrameworkRunner;
--import org.junit.Test;
--import org.junit.runner.RunWith;
++import org.apache.directory.server.core.integ.ApacheDSTestExtension;
++import org.junit.jupiter.api.Test;
++import org.junit.jupiter.api.extension.ExtendWith;
/**
@@@ -40,7 -40,7 +40,7 @@@
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
--@RunWith(FrameworkRunner.class)
++@ExtendWith( ApacheDSTestExtension.class )
@CreateDS(name = "DestroyContextIT")
@ApplyLdifs(
{
@@@ -66,76 -66,76 +66,75 @@@
})
public class DestroyContextIT extends AbstractLdapTestUnit
{
--/**
-- * Tests the creation and subsequent read of a new JNDI context under the
-- * system context root.
-- *
-- * @throws NamingException if there are failures
-- */
--@Test
--public void testDestroyContext() throws Exception
--{
-- LdapContext sysRoot = getSystemContext( getService() );
--
-- /*
-- * delete ou=testing00,ou=system
-- */
-- sysRoot.destroySubcontext( "ou=testing00" );
--
-- try
-- {
-- sysRoot.lookup( "ou=testing00" );
-- fail( "ou=testing00, ou=system should not exist" );
-- }
-- catch ( Exception e )
-- {
-- assertTrue( e instanceof NamingException );
-- }
--
-- /*
-- * delete ou=subtest,ou=testing01,ou=system
++ /**
++ * Tests the creation and subsequent read of a new JNDI context under the
++ * system context root.
++ *
++ * @throws NamingException if there are failures
*/
-- sysRoot.destroySubcontext( "ou=subtest,ou=testing01" );
--
-- try
-- {
-- sysRoot.lookup( "ou=subtest,ou=testing01" );
-- fail( "ou=subtest,ou=testing01,ou=system should not exist" );
-- }
-- catch ( NamingException e )
++ @Test
++ public void testDestroyContext() throws Exception
{
-- assertTrue( e instanceof NamingException );
++ LdapContext sysRoot = getSystemContext( getService() );
++
++ /*
++ * delete ou=testing00,ou=system
++ */
++ sysRoot.destroySubcontext( "ou=testing00" );
++
++ try
++ {
++ sysRoot.lookup( "ou=testing00" );
++ fail( "ou=testing00, ou=system should not exist" );
++ }
++ catch ( Exception e )
++ {
++ assertTrue( e instanceof NamingException );
++ }
++
++ /*
++ * delete ou=subtest,ou=testing01,ou=system
++ */
++ sysRoot.destroySubcontext( "ou=subtest,ou=testing01" );
++
++ try
++ {
++ sysRoot.lookup( "ou=subtest,ou=testing01" );
++ fail( "ou=subtest,ou=testing01,ou=system should not exist" );
++ }
++ catch ( NamingException e )
++ {
++ assertTrue( e instanceof NamingException );
++ }
++
++ /*
++ * delete ou=testing01,ou=system
++ */
++ sysRoot.destroySubcontext( "ou=testing01" );
++
++ try
++ {
++ sysRoot.lookup( "ou=testing01" );
++ fail( "ou=testing01, ou=system should not exist" );
++ }
++ catch ( NamingException e )
++ {
++ assertTrue( e instanceof NamingException );
++ }
++
++ /*
++ * delete ou=testing01,ou=system
++ */
++ sysRoot.destroySubcontext( "ou=testing02" );
++
++ try
++ {
++ sysRoot.lookup( "ou=testing02" );
++ fail( "ou=testing02, ou=system should not exist" );
++ }
++ catch ( NamingException e )
++ {
++ assertTrue( e instanceof NamingException );
++ }
}
--
-- /*
-- * delete ou=testing01,ou=system
-- */
-- sysRoot.destroySubcontext( "ou=testing01" );
--
-- try
-- {
-- sysRoot.lookup( "ou=testing01" );
-- fail( "ou=testing01, ou=system should not exist" );
-- }
-- catch ( NamingException e )
-- {
-- assertTrue( e instanceof NamingException );
-- }
--
-- /*
-- * delete ou=testing01,ou=system
-- */
-- sysRoot.destroySubcontext( "ou=testing02" );
--
-- try
-- {
-- sysRoot.lookup( "ou=testing02" );
-- fail( "ou=testing02, ou=system should not exist" );
-- }
-- catch ( NamingException e )
-- {
-- assertTrue( e instanceof NamingException );
-- }
--}
--
}
diff --cc core-integ/src/test/java/org/apache/directory/server/core/jndi/ExtensibleObjectIT.java
index e01f622,e01f622..3d99961
--- a/core-integ/src/test/java/org/apache/directory/server/core/jndi/ExtensibleObjectIT.java
+++ b/core-integ/src/test/java/org/apache/directory/server/core/jndi/ExtensibleObjectIT.java
@@@ -21,9 -21,9 +21,9 @@@ package org.apache.directory.server.cor
import static org.apache.directory.server.core.integ.IntegrationUtils.getSystemContext;
--import static org.junit.Assert.assertEquals;
--import static org.junit.Assert.assertNotNull;
--import static org.junit.Assert.assertTrue;
++import static org.junit.jupiter.api.Assertions.assertEquals;
++import static org.junit.jupiter.api.Assertions.assertNotNull;
++import static org.junit.jupiter.api.Assertions.assertTrue;
import javax.naming.directory.Attribute;
import javax.naming.directory.Attributes;
@@@ -35,9 -35,9 +35,9 @@@ import javax.naming.ldap.LdapContext
import org.apache.directory.server.core.annotations.CreateDS;
import org.apache.directory.server.core.factory.DefaultDirectoryServiceFactory;
import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
--import org.apache.directory.server.core.integ.FrameworkRunner;
--import org.junit.Test;
--import org.junit.runner.RunWith;
++import org.apache.directory.server.core.integ.ApacheDSTestExtension;
++import org.junit.jupiter.api.Test;
++import org.junit.jupiter.api.extension.ExtendWith;
/**
@@@ -45,7 -45,7 +45,7 @@@
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
--@RunWith(FrameworkRunner.class)
++@ExtendWith( ApacheDSTestExtension.class )
@CreateDS(factory = DefaultDirectoryServiceFactory.class, name = "ExtensibleObjectIT-class")
public class ExtensibleObjectIT extends AbstractLdapTestUnit
{
diff --cc core-integ/src/test/java/org/apache/directory/server/core/jndi/ListIT.java
index b4e1a11,b4e1a11..ebab7e3
--- a/core-integ/src/test/java/org/apache/directory/server/core/jndi/ListIT.java
+++ b/core-integ/src/test/java/org/apache/directory/server/core/jndi/ListIT.java
@@@ -23,9 -23,9 +23,9 @@@ package org.apache.directory.server.cor
import static org.apache.directory.server.core.integ.IntegrationUtils.getContext;
import static org.apache.directory.server.core.integ.IntegrationUtils.getSystemContext;
import static org.apache.directory.server.core.integ.IntegrationUtils.getUserAddLdif;
--import static org.junit.Assert.assertFalse;
--import static org.junit.Assert.assertTrue;
--import static org.junit.Assert.assertEquals;
++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 java.util.HashSet;
@@@ -39,9 -39,9 +39,9 @@@ import org.apache.directory.api.ldap.mo
import org.apache.directory.api.ldap.model.ldif.LdifEntry;
import org.apache.directory.server.core.annotations.CreateDS;
import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
--import org.apache.directory.server.core.integ.FrameworkRunner;
--import org.junit.Test;
--import org.junit.runner.RunWith;
++import org.apache.directory.server.core.integ.ApacheDSTestExtension;
++import org.junit.jupiter.api.Test;
++import org.junit.jupiter.api.extension.ExtendWith;
/**
@@@ -51,7 -51,7 +51,7 @@@
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
--@RunWith(FrameworkRunner.class)
++@ExtendWith( ApacheDSTestExtension.class )
@CreateDS(name = "ListIT")
public class ListIT extends AbstractLdapTestUnit
{
diff --cc core-integ/src/test/java/org/apache/directory/server/core/jndi/MixedCaseIT.java
index 45e1d88,45e1d88..058422a
--- a/core-integ/src/test/java/org/apache/directory/server/core/jndi/MixedCaseIT.java
+++ b/core-integ/src/test/java/org/apache/directory/server/core/jndi/MixedCaseIT.java
@@@ -21,11 -21,11 +21,11 @@@ package org.apache.directory.server.cor
import static org.apache.directory.server.core.integ.IntegrationUtils.getContext;
--import static org.junit.Assert.assertEquals;
--import static org.junit.Assert.assertFalse;
--import static org.junit.Assert.assertNotNull;
--import static org.junit.Assert.assertTrue;
--import static org.junit.Assert.fail;
++import static org.junit.jupiter.api.Assertions.assertEquals;
++import static org.junit.jupiter.api.Assertions.assertFalse;
++import static org.junit.jupiter.api.Assertions.assertNotNull;
++import static org.junit.jupiter.api.Assertions.assertTrue;
++import static org.junit.jupiter.api.Assertions.fail;
import javax.naming.NamingEnumeration;
import javax.naming.NamingException;
@@@ -44,9 -44,9 +44,9 @@@ import org.apache.directory.server.core
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.junit.Test;
--import org.junit.runner.RunWith;
++import org.apache.directory.server.core.integ.ApacheDSTestExtension;
++import org.junit.jupiter.api.Test;
++import org.junit.jupiter.api.extension.ExtendWith;
/**
@@@ -54,7 -54,7 +54,7 @@@
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
--@RunWith(FrameworkRunner.class)
++@ExtendWith( ApacheDSTestExtension.class )
@CreateDS(name = "MixedCaseITest-class",
partitions =
{
@@@ -89,11 -89,11 +89,11 @@@ public class MixedCaseIT extends Abstra
sc.setSearchScope( SearchControls.SUBTREE_SCOPE );
NamingEnumeration<SearchResult> ne = ctxRoot.search( "", "(objectClass=*)", sc );
-- assertTrue( "Search should return at least one entry.", ne.hasMore() );
++ assertTrue( ne.hasMore(), "Search should return at least one entry." );
SearchResult sr = ne.next();
-- assertEquals( "The entry returned should be the root entry.", SUFFIX_DN, sr.getName() );
-- assertFalse( "Search should return no more entries.", ne.hasMore() );
++ assertEquals( SUFFIX_DN, sr.getName(), "The entry returned should be the root entry." );
++ assertFalse( ne.hasMore(), "Search should return no more entries." );
}
@@@ -114,11 -114,11 +114,11 @@@
sc.setSearchScope( SearchControls.OBJECT_SCOPE );
NamingEnumeration<SearchResult> ne = ctxRoot.search( dn, "(objectClass=*)", sc );
-- assertTrue( "Search should return at least one entry.", ne.hasMore() );
++ assertTrue( ne.hasMore(), "Search should return at least one entry." );
SearchResult sr = ne.next();
-- assertEquals( "The entry returned should be the entry added earlier.", dn + "," + SUFFIX_DN, sr.getName() );
-- assertFalse( "Search should return no more entries.", ne.hasMore() );
++ assertEquals( dn + "," + SUFFIX_DN, sr.getName(), "The entry returned should be the entry added earlier." );
++ assertFalse( ne.hasMore(), "Search should return no more entries." );
}
@@@ -145,16 -145,16 +145,16 @@@
sc.setSearchScope( SearchControls.OBJECT_SCOPE );
NamingEnumeration<SearchResult> ne = ctxRoot.search( dn, "(objectClass=*)", sc );
-- assertTrue( "Search should return at least one entry.", ne.hasMore() );
++ assertTrue( ne.hasMore(), "Search should return at least one entry." );
SearchResult sr = ( SearchResult ) ne.next();
-- assertEquals( "The entry returned should be the entry added earlier.", dn + "," + SUFFIX_DN, sr.getName() );
++ assertEquals( dn + "," + SUFFIX_DN, sr.getName(), "The entry returned should be the entry added earlier." );
attributes = sr.getAttributes();
Attribute attribute = attributes.get( "description" );
-- assertEquals( "The description attribute should contain the new value.", description, attribute.get() );
-- assertFalse( "Search should return no more entries.", ne.hasMore() );
++ assertEquals( description, attribute.get(), "The description attribute should contain the new value." );
++ assertFalse( ne.hasMore(), "Search should return no more entries." );
}
diff --cc core-integ/src/test/java/org/apache/directory/server/core/jndi/ModifyContextIT.java
index 590b63c,590b63c..a7c7206
--- a/core-integ/src/test/java/org/apache/directory/server/core/jndi/ModifyContextIT.java
+++ b/core-integ/src/test/java/org/apache/directory/server/core/jndi/ModifyContextIT.java
@@@ -22,11 -22,11 +22,11 @@@ package org.apache.directory.server.cor
import static org.apache.directory.server.core.integ.IntegrationUtils.getSystemContext;
import static org.apache.directory.server.core.integ.IntegrationUtils.getUserAddLdif;
--import static org.junit.Assert.assertEquals;
--import static org.junit.Assert.assertNotNull;
--import static org.junit.Assert.assertNull;
--import static org.junit.Assert.assertTrue;
--import static org.junit.Assert.fail;
++import static org.junit.jupiter.api.Assertions.assertEquals;
++import static org.junit.jupiter.api.Assertions.assertNotNull;
++import static org.junit.jupiter.api.Assertions.assertNull;
++import static org.junit.jupiter.api.Assertions.assertTrue;
++import static org.junit.jupiter.api.Assertions.fail;
import javax.naming.NamingException;
import javax.naming.directory.Attribute;
@@@ -41,9 -41,9 +41,10 @@@ import org.apache.directory.api.ldap.mo
import org.apache.directory.server.core.annotations.CreateDS;
import org.apache.directory.server.core.factory.DefaultDirectoryServiceFactory;
import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
--import org.apache.directory.server.core.integ.FrameworkRunner;
--import org.junit.Test;
--import org.junit.runner.RunWith;
++import org.apache.directory.server.core.integ.ApacheDSTestExtension;
++import org.junit.jupiter.api.Assertions;
++import org.junit.jupiter.api.Test;
++import org.junit.jupiter.api.extension.ExtendWith;
/**
@@@ -52,7 -52,7 +53,7 @@@
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
--@RunWith(FrameworkRunner.class)
++@ExtendWith( ApacheDSTestExtension.class )
@CreateDS(factory = DefaultDirectoryServiceFactory.class, name = "ModifyContextIT-class")
public class ModifyContextIT extends AbstractLdapTestUnit
{
@@@ -255,14 -255,14 +256,17 @@@
}
-- @Test(expected = NamingException.class)
++ @Test
public void testRemoveNonExistingValue() throws Exception
{
-- createData();
--
-- LdapContext sysRoot = getSystemContext( getService() );
-- Attributes attributes = new BasicAttributes( true );
-- attributes.put( "ou", "testCases" );
-- sysRoot.modifyAttributes( "ou=testing00", DirContext.REMOVE_ATTRIBUTE, attributes );
++ Assertions.assertThrows( NamingException.class, () ->
++ {
++ createData();
++
++ LdapContext sysRoot = getSystemContext( getService() );
++ Attributes attributes = new BasicAttributes( true );
++ attributes.put( "ou", "testCases" );
++ sysRoot.modifyAttributes( "ou=testing00", DirContext.REMOVE_ATTRIBUTE, attributes );
++ } );
}
}
diff --cc core-integ/src/test/java/org/apache/directory/server/core/jndi/ObjStateFactoryIT.java
index 9f2c93a,9f2c93a..ed5e934
--- a/core-integ/src/test/java/org/apache/directory/server/core/jndi/ObjStateFactoryIT.java
+++ b/core-integ/src/test/java/org/apache/directory/server/core/jndi/ObjStateFactoryIT.java
@@@ -22,8 -22,8 +22,8 @@@ package org.apache.directory.server.cor
import static org.apache.directory.server.core.integ.IntegrationUtils.getSystemContext;
import static org.apache.directory.server.core.integ.IntegrationUtils.getUserAddLdif;
--import static org.junit.Assert.assertEquals;
--import static org.junit.Assert.assertNull;
++import static org.junit.jupiter.api.Assertions.assertEquals;
++import static org.junit.jupiter.api.Assertions.assertNull;
import java.nio.charset.StandardCharsets;
import java.util.Hashtable;
@@@ -44,9 -44,9 +44,9 @@@ import org.apache.directory.api.ldap.mo
import org.apache.directory.api.ldap.model.ldif.LdifEntry;
import org.apache.directory.api.util.Strings;
import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
--import org.apache.directory.server.core.integ.FrameworkRunner;
--import org.junit.Test;
--import org.junit.runner.RunWith;
++import org.apache.directory.server.core.integ.ApacheDSTestExtension;
++import org.junit.jupiter.api.Test;
++import org.junit.jupiter.api.extension.ExtendWith;
/**
@@@ -54,7 -54,7 +54,7 @@@
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
--@RunWith(FrameworkRunner.class)
++@ExtendWith( ApacheDSTestExtension.class )
public class ObjStateFactoryIT extends AbstractLdapTestUnit
{
diff --cc core-integ/src/test/java/org/apache/directory/server/core/jndi/RFC2713IT.java
index efe60f8,efe60f8..d0dc39e
--- a/core-integ/src/test/java/org/apache/directory/server/core/jndi/RFC2713IT.java
+++ b/core-integ/src/test/java/org/apache/directory/server/core/jndi/RFC2713IT.java
@@@ -21,9 -21,9 +21,9 @@@ package org.apache.directory.server.cor
import static org.apache.directory.server.core.integ.IntegrationUtils.getSystemContext;
--import static org.junit.Assert.assertEquals;
--import static org.junit.Assert.assertNotNull;
--import static org.junit.Assert.assertTrue;
++import static org.junit.jupiter.api.Assertions.assertEquals;
++import static org.junit.jupiter.api.Assertions.assertNotNull;
++import static org.junit.jupiter.api.Assertions.assertTrue;
import java.util.ArrayList;
@@@ -33,9 -33,9 +33,9 @@@ import javax.naming.ldap.LdapContext
import org.apache.directory.server.core.annotations.CreateDS;
import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
--import org.apache.directory.server.core.integ.FrameworkRunner;
--import org.junit.Test;
--import org.junit.runner.RunWith;
++import org.apache.directory.server.core.integ.ApacheDSTestExtension;
++import org.junit.jupiter.api.Test;
++import org.junit.jupiter.api.extension.ExtendWith;
/**
@@@ -44,7 -44,7 +44,7 @@@
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
--@RunWith(FrameworkRunner.class)
++@ExtendWith( ApacheDSTestExtension.class )
@CreateDS(name = "RFC2713IT")
public class RFC2713IT extends AbstractLdapTestUnit
{
diff --cc core-integ/src/test/java/org/apache/directory/server/core/jndi/ReferralIT.java
index db927aa,db927aa..3eb2023
--- a/core-integ/src/test/java/org/apache/directory/server/core/jndi/ReferralIT.java
+++ b/core-integ/src/test/java/org/apache/directory/server/core/jndi/ReferralIT.java
@@@ -22,12 -22,12 +22,12 @@@ package org.apache.directory.server.cor
import static org.apache.directory.server.core.integ.IntegrationUtils.getSystemContext;
import static org.apache.directory.server.core.integ.IntegrationUtils.getUserAddLdif;
--import static org.junit.Assert.assertEquals;
--import static org.junit.Assert.assertFalse;
--import static org.junit.Assert.assertNotNull;
--import static org.junit.Assert.assertNull;
--import static org.junit.Assert.assertTrue;
--import static org.junit.Assert.fail;
++import static org.junit.jupiter.api.Assertions.assertEquals;
++import static org.junit.jupiter.api.Assertions.assertFalse;
++import static org.junit.jupiter.api.Assertions.assertNotNull;
++import static org.junit.jupiter.api.Assertions.assertNull;
++import static org.junit.jupiter.api.Assertions.assertTrue;
++import static org.junit.jupiter.api.Assertions.fail;
import java.util.HashMap;
import java.util.Map;
@@@ -58,9 -58,9 +58,9 @@@ import org.apache.directory.api.ldap.mo
import org.apache.directory.api.ldap.model.name.Dn;
import org.apache.directory.server.core.annotations.CreateDS;
import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
--import org.apache.directory.server.core.integ.FrameworkRunner;
--import org.junit.Test;
--import org.junit.runner.RunWith;
++import org.apache.directory.server.core.integ.ApacheDSTestExtension;
++import org.junit.jupiter.api.Test;
++import org.junit.jupiter.api.extension.ExtendWith;
/**
@@@ -68,7 -68,7 +68,7 @@@
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
--@RunWith(FrameworkRunner.class)
++@ExtendWith( ApacheDSTestExtension.class )
@CreateDS(name = "ReferralIT")
public class ReferralIT extends AbstractLdapTestUnit
{
diff --cc core-integ/src/test/java/org/apache/directory/server/core/jndi/RootDSEJndiIT.java
index c0787c5,c0787c5..5d85e08
--- a/core-integ/src/test/java/org/apache/directory/server/core/jndi/RootDSEJndiIT.java
+++ b/core-integ/src/test/java/org/apache/directory/server/core/jndi/RootDSEJndiIT.java
@@@ -20,10 -20,10 +20,10 @@@
package org.apache.directory.server.core.jndi;
--import static org.junit.Assert.assertEquals;
--import static org.junit.Assert.assertNotNull;
--import static org.junit.Assert.assertTrue;
--import static org.junit.Assert.fail;
++import static org.junit.jupiter.api.Assertions.assertEquals;
++import static org.junit.jupiter.api.Assertions.assertNotNull;
++import static org.junit.jupiter.api.Assertions.assertTrue;
++import static org.junit.jupiter.api.Assertions.fail;
import java.util.Hashtable;
@@@ -38,9 -38,9 +38,9 @@@ import javax.naming.directory.Modificat
import org.apache.directory.server.core.annotations.CreateDS;
import org.apache.directory.server.core.api.DirectoryService;
import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
--import org.apache.directory.server.core.integ.FrameworkRunner;
--import org.junit.Test;
--import org.junit.runner.RunWith;
++import org.apache.directory.server.core.integ.ApacheDSTestExtension;
++import org.junit.jupiter.api.Test;
++import org.junit.jupiter.api.extension.ExtendWith;
/**
@@@ -48,7 -48,7 +48,7 @@@
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
--@RunWith(FrameworkRunner.class)
++@ExtendWith( ApacheDSTestExtension.class )
@CreateDS(name = "RootDSEIT")
public class RootDSEJndiIT extends AbstractLdapTestUnit
{
diff --cc core-integ/src/test/java/org/apache/directory/server/core/jndi/SimpleBindJndiIT.java
index 8637901,8637901..c7cf9c3
--- a/core-integ/src/test/java/org/apache/directory/server/core/jndi/SimpleBindJndiIT.java
+++ b/core-integ/src/test/java/org/apache/directory/server/core/jndi/SimpleBindJndiIT.java
@@@ -20,11 -20,11 +20,11 @@@
package org.apache.directory.server.core.jndi;
--import static org.junit.Assert.assertEquals;
--import static org.junit.Assert.assertFalse;
--import static org.junit.Assert.assertNotNull;
--import static org.junit.Assert.assertTrue;
--import static org.junit.Assert.fail;
++import static org.junit.jupiter.api.Assertions.assertEquals;
++import static org.junit.jupiter.api.Assertions.assertFalse;
++import static org.junit.jupiter.api.Assertions.assertNotNull;
++import static org.junit.jupiter.api.Assertions.assertTrue;
++import static org.junit.jupiter.api.Assertions.fail;
import java.util.Hashtable;
@@@ -47,11 -47,11 +47,11 @@@ import org.apache.directory.ldap.client
import org.apache.directory.server.core.annotations.CreateDS;
import org.apache.directory.server.core.api.DirectoryService;
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.directory.server.core.integ.IntegrationUtils;
--import org.apache.directory.server.core.jndi.CoreContextFactory;
--import org.junit.Test;
--import org.junit.runner.RunWith;
++import org.junit.jupiter.api.Assertions;
++import org.junit.jupiter.api.Test;
++import org.junit.jupiter.api.extension.ExtendWith;
/**
@@@ -59,7 -59,7 +59,7 @@@
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
--@RunWith(FrameworkRunner.class)
++@ExtendWith( ApacheDSTestExtension.class )
@CreateDS(name = "SimpleBindIT", allowAnonAccess = true)
public class SimpleBindJndiIT extends AbstractLdapTestUnit
{
@@@ -235,8 -235,8 +235,8 @@@
catch ( AuthenticationException ae )
{
// lae.printStackTrace();
-- assertTrue( org.apache.directory.server.i18n.I18n.err( org.apache.directory.server.i18n.I18n.ERR_229 ), ae
-- .getMessage().startsWith( org.apache.directory.server.i18n.I18n.ERR_229.getErrorCode() ) );
++ assertTrue( ae.getMessage().startsWith( org.apache.directory.server.i18n.I18n.ERR_229.getErrorCode() ),
++ org.apache.directory.server.i18n.I18n.err( org.apache.directory.server.i18n.I18n.ERR_229 ) );
}
catch ( NamingException ne )
{
@@@ -367,15 -367,15 +367,18 @@@
*
* @throws Exception on error
*/
-- @Test( expected = LdapUnwillingToPerformException.class )
++ @Test
public void testSimpleBindAPrincipalNullPassword() throws Exception
{
-- LdapConnection connection = IntegrationUtils.getConnectionAs( getService(), "uid=admin,ou=system", null );
-- assertFalse( connection.isAuthenticated() );
--
-- connection = IntegrationUtils.getConnectionAs( getService(), "uid=admin,ou=system", "secret" );
--
-- connection.bind( "uid=admin,ou=system", null );
++ Assertions.assertThrows( LdapUnwillingToPerformException.class, () ->
++ {
++ LdapConnection connection = IntegrationUtils.getConnectionAs( getService(), "uid=admin,ou=system", null );
++ assertFalse( connection.isAuthenticated() );
++
++ connection = IntegrationUtils.getConnectionAs( getService(), "uid=admin,ou=system", "secret" );
++
++ connection.bind( "uid=admin,ou=system", null );
++ } );
}
diff --cc core-integ/src/test/java/org/apache/directory/server/core/jndi/UniqueMemberIT.java
index c5a68eb,c5a68eb..e6d14da
--- a/core-integ/src/test/java/org/apache/directory/server/core/jndi/UniqueMemberIT.java
+++ b/core-integ/src/test/java/org/apache/directory/server/core/jndi/UniqueMemberIT.java
@@@ -21,11 -21,11 +21,11 @@@ package org.apache.directory.server.cor
import static org.apache.directory.server.core.integ.IntegrationUtils.getSystemContext;
--import static org.junit.Assert.assertEquals;
--import static org.junit.Assert.assertFalse;
--import static org.junit.Assert.assertNotNull;
--import static org.junit.Assert.assertTrue;
--import static org.junit.Assert.fail;
++import static org.junit.jupiter.api.Assertions.assertEquals;
++import static org.junit.jupiter.api.Assertions.assertFalse;
++import static org.junit.jupiter.api.Assertions.assertNotNull;
++import static org.junit.jupiter.api.Assertions.assertTrue;
++import static org.junit.jupiter.api.Assertions.fail;
import java.util.HashMap;
import java.util.HashSet;
@@@ -46,9 -46,9 +46,9 @@@ import org.apache.directory.api.ldap.mo
import org.apache.directory.api.util.Strings;
import org.apache.directory.server.core.annotations.CreateDS;
import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
--import org.apache.directory.server.core.integ.FrameworkRunner;
--import org.junit.Test;
--import org.junit.runner.RunWith;
++import org.apache.directory.server.core.integ.ApacheDSTestExtension;
++import org.junit.jupiter.api.Test;
++import org.junit.jupiter.api.extension.ExtendWith;
/**
@@@ -57,7 -57,7 +57,7 @@@
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
--@RunWith(FrameworkRunner.class)
++@ExtendWith( ApacheDSTestExtension.class )
@CreateDS(name = "UniqueMemeberIT")
public class UniqueMemberIT extends AbstractLdapTestUnit
{
@@@ -318,7 -318,7 +318,7 @@@
map.put( Strings.toLowerCaseAscii( result.getName() ), result.getAttributes() );
}
-- assertEquals( "Expected number of results returned was incorrect!", 1, map.size() );
++ assertEquals( 1, map.size(), "Expected number of results returned was incorrect!" );
attrs = map.get( "cn=kevin spacey,ou=system" );
@@@ -372,7 -372,7 +372,7 @@@
map.put( Strings.toLowerCaseAscii( result.getName() ), result.getAttributes() );
}
-- assertEquals( "Expected number of results returned was incorrect!", 1, map.size() );
++ assertEquals( 1, map.size(), "Expected number of results returned was incorrect!" );
attrs = map.get( "cn=kevin spacey,ou=system" );
@@@ -467,7 -467,7 +467,7 @@@
map.put( Strings.toLowerCaseAscii( result.getName() ), result.getAttributes() );
}
-- assertEquals( "Expected number of results returned was incorrect!", 1, map.size() );
++ assertEquals( 1, map.size(), "Expected number of results returned was incorrect!" );
attrs = map.get( "cn=kevin spacey,ou=system" );
diff --cc core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/AddReferralIT.java
index f7dda8b,f7dda8b..0177c87
--- a/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/AddReferralIT.java
+++ b/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/AddReferralIT.java
@@@ -20,10 -20,10 +20,10 @@@
package org.apache.directory.server.core.jndi.referral;
import static org.apache.directory.server.core.integ.IntegrationUtils.getContext;
--import static org.junit.Assert.assertEquals;
--import static org.junit.Assert.assertNotNull;
--import static org.junit.Assert.assertTrue;
--import static org.junit.Assert.fail;
++import static org.junit.jupiter.api.Assertions.assertEquals;
++import static org.junit.jupiter.api.Assertions.assertNotNull;
++import static org.junit.jupiter.api.Assertions.assertTrue;
++import static org.junit.jupiter.api.Assertions.fail;
import java.util.HashSet;
import java.util.Set;
@@@ -48,10 -48,10 +48,10 @@@ import org.apache.directory.server.core
import org.apache.directory.server.core.annotations.CreateDS;
import org.apache.directory.server.core.api.CoreSession;
import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
--import org.apache.directory.server.core.integ.FrameworkRunner;
--import org.junit.Before;
--import org.junit.Test;
--import org.junit.runner.RunWith;
++import org.apache.directory.server.core.integ.ApacheDSTestExtension;
++import org.junit.jupiter.api.BeforeEach;
++import org.junit.jupiter.api.Test;
++import org.junit.jupiter.api.extension.ExtendWith;
/**
@@@ -63,7 -63,7 +63,7 @@@
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
--@RunWith ( FrameworkRunner.class )
++@ExtendWith( ApacheDSTestExtension.class )
@CreateDS(name = "AddReferralIT")
@ApplyLdifs( {
// Root
@@@ -113,7 -113,7 +113,7 @@@ public class AddReferralIT extends Abst
Attributes userEntry;
Entry serverEntry;
-- @Before
++ @BeforeEach
public void setUp() throws Exception
{
MNNCtx = getContext( ServerDNConstants.ADMIN_SYSTEM_DN, getService(), "o=MNN,c=WW,ou=system" );
diff --cc core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/CompareReferralIT.java
index 2e38479,2e38479..6fa08c7
--- a/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/CompareReferralIT.java
+++ b/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/CompareReferralIT.java
@@@ -20,10 -20,10 +20,10 @@@
package org.apache.directory.server.core.jndi.referral;
import static org.apache.directory.server.core.integ.IntegrationUtils.getContext;
--import static org.junit.Assert.assertEquals;
--import static org.junit.Assert.assertNotNull;
--import static org.junit.Assert.assertTrue;
--import static org.junit.Assert.fail;
++import static org.junit.jupiter.api.Assertions.assertEquals;
++import static org.junit.jupiter.api.Assertions.assertNotNull;
++import static org.junit.jupiter.api.Assertions.assertTrue;
++import static org.junit.jupiter.api.Assertions.fail;
import java.util.HashSet;
import java.util.Set;
@@@ -50,10 -50,10 +50,10 @@@ import org.apache.directory.server.core
import org.apache.directory.server.core.annotations.CreateDS;
import org.apache.directory.server.core.api.CoreSession;
import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
--import org.apache.directory.server.core.integ.FrameworkRunner;
--import org.junit.Before;
--import org.junit.Test;
--import org.junit.runner.RunWith;
++import org.apache.directory.server.core.integ.ApacheDSTestExtension;
++import org.junit.jupiter.api.BeforeEach;
++import org.junit.jupiter.api.Test;
++import org.junit.jupiter.api.extension.ExtendWith;
/**
@@@ -65,7 -65,7 +65,7 @@@
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
--@RunWith ( FrameworkRunner.class )
++@ExtendWith( ApacheDSTestExtension.class )
@CreateDS(name = "CompareReferralIT")
@ApplyLdifs( {
// Root
@@@ -118,7 -118,7 +118,7 @@@ public class CompareReferralIT extends
/** The search controls used globally */
SearchControls ctls;
-- @Before
++ @BeforeEach
public void setUp() throws Exception
{
MNNCtx = getContext( ServerDNConstants.ADMIN_SYSTEM_DN, getService(), "o=MNN,c=WW,ou=system" );
diff --cc core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/DeleteReferralIT.java
index d21544a,d21544a..984a175
--- a/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/DeleteReferralIT.java
+++ b/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/DeleteReferralIT.java
@@@ -20,9 -20,9 +20,9 @@@
package org.apache.directory.server.core.jndi.referral;
import static org.apache.directory.server.core.integ.IntegrationUtils.getContext;
--import static org.junit.Assert.assertEquals;
--import static org.junit.Assert.assertTrue;
--import static org.junit.Assert.fail;
++import static org.junit.jupiter.api.Assertions.assertEquals;
++import static org.junit.jupiter.api.Assertions.assertTrue;
++import static org.junit.jupiter.api.Assertions.fail;
import java.util.HashSet;
import java.util.Set;
@@@ -45,10 -45,10 +45,10 @@@ import org.apache.directory.server.core
import org.apache.directory.server.core.annotations.CreateDS;
import org.apache.directory.server.core.api.CoreSession;
import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
--import org.apache.directory.server.core.integ.FrameworkRunner;
--import org.junit.Before;
--import org.junit.Test;
--import org.junit.runner.RunWith;
++import org.apache.directory.server.core.integ.ApacheDSTestExtension;
++import org.junit.jupiter.api.BeforeEach;
++import org.junit.jupiter.api.Test;
++import org.junit.jupiter.api.extension.ExtendWith;
/**
@@@ -60,7 -60,7 +60,7 @@@
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
--@RunWith ( FrameworkRunner.class )
++@ExtendWith( ApacheDSTestExtension.class )
@CreateDS(name = "DeleteReferralIT")
@ApplyLdifs( {
// Root
@@@ -110,7 -110,7 +110,7 @@@ public class DeleteReferralIT extends A
Attributes userEntry;
Entry serverEntry;
-- @Before
++ @BeforeEach
public void setUp() throws Exception
{
MNNCtx = getContext( ServerDNConstants.ADMIN_SYSTEM_DN, getService(), "o=MNN,c=WW,ou=system" );
diff --cc core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/ModifyReferralIT.java
index caf8b9d,caf8b9d..7c8ced0
--- a/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/ModifyReferralIT.java
+++ b/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/ModifyReferralIT.java
@@@ -20,10 -20,10 +20,10 @@@
package org.apache.directory.server.core.jndi.referral;
import static org.apache.directory.server.core.integ.IntegrationUtils.getContext;
--import static org.junit.Assert.assertEquals;
--import static org.junit.Assert.assertNotNull;
--import static org.junit.Assert.assertTrue;
--import static org.junit.Assert.fail;
++import static org.junit.jupiter.api.Assertions.assertEquals;
++import static org.junit.jupiter.api.Assertions.assertNotNull;
++import static org.junit.jupiter.api.Assertions.assertTrue;
++import static org.junit.jupiter.api.Assertions.fail;
import java.util.ArrayList;
import java.util.HashSet;
@@@ -55,10 -55,10 +55,10 @@@ import org.apache.directory.server.core
import org.apache.directory.server.core.annotations.CreateDS;
import org.apache.directory.server.core.api.CoreSession;
import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
--import org.apache.directory.server.core.integ.FrameworkRunner;
--import org.junit.Before;
--import org.junit.Test;
--import org.junit.runner.RunWith;
++import org.apache.directory.server.core.integ.ApacheDSTestExtension;
++import org.junit.jupiter.api.BeforeEach;
++import org.junit.jupiter.api.Test;
++import org.junit.jupiter.api.extension.ExtendWith;
/**
@@@ -70,7 -70,7 +70,7 @@@
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
--@RunWith ( FrameworkRunner.class )
++@ExtendWith( ApacheDSTestExtension.class )
@CreateDS(name = "ModifyReferralIT")
@ApplyLdifs( {
// Root
@@@ -120,7 -120,7 +120,7 @@@ public class ModifyReferralIT extends A
Attributes userEntry;
Entry serverEntry;
-- @Before
++ @BeforeEach
public void setUp() throws Exception
{
MNNCtx = getContext( ServerDNConstants.ADMIN_SYSTEM_DN, getService(), "o=MNN,c=WW,ou=system" );
diff --cc core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/MoveAndRenameReferralIT.java
index 6905b73,6905b73..4dd1786
--- a/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/MoveAndRenameReferralIT.java
+++ b/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/MoveAndRenameReferralIT.java
@@@ -20,10 -20,10 +20,10 @@@
package org.apache.directory.server.core.jndi.referral;
import static org.apache.directory.server.core.integ.IntegrationUtils.getContext;
--import static org.junit.Assert.assertEquals;
--import static org.junit.Assert.assertNotNull;
--import static org.junit.Assert.assertTrue;
--import static org.junit.Assert.fail;
++import static org.junit.jupiter.api.Assertions.assertEquals;
++import static org.junit.jupiter.api.Assertions.assertNotNull;
++import static org.junit.jupiter.api.Assertions.assertTrue;
++import static org.junit.jupiter.api.Assertions.fail;
import java.util.HashSet;
import java.util.Set;
@@@ -49,10 -49,10 +49,10 @@@ import org.apache.directory.server.core
import org.apache.directory.server.core.annotations.CreateDS;
import org.apache.directory.server.core.api.CoreSession;
import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
--import org.apache.directory.server.core.integ.FrameworkRunner;
--import org.junit.Before;
--import org.junit.Test;
--import org.junit.runner.RunWith;
++import org.apache.directory.server.core.integ.ApacheDSTestExtension;
++import org.junit.jupiter.api.BeforeEach;
++import org.junit.jupiter.api.Test;
++import org.junit.jupiter.api.extension.ExtendWith;
/**
@@@ -64,7 -64,7 +64,7 @@@
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
--@RunWith ( FrameworkRunner.class )
++@ExtendWith( ApacheDSTestExtension.class )
@CreateDS(name = "MoveAndRenameReferralIT")
@ApplyLdifs( {
// Root
@@@ -136,7 -136,7 +136,7 @@@ public class MoveAndRenameReferralIT ex
Attributes userEntry;
Entry serverEntry;
-- @Before
++ @BeforeEach
public void setUp() throws Exception
{
MNNCtx = getContext( ServerDNConstants.ADMIN_SYSTEM_DN, getService(), "o=MNN,c=WW,ou=system" );
diff --cc core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/MoveReferralIT.java
index 8e26de5,8e26de5..86ef0ff
--- a/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/MoveReferralIT.java
+++ b/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/MoveReferralIT.java
@@@ -20,10 -20,10 +20,10 @@@
package org.apache.directory.server.core.jndi.referral;
import static org.apache.directory.server.core.integ.IntegrationUtils.getContext;
--import static org.junit.Assert.assertEquals;
--import static org.junit.Assert.assertNotNull;
--import static org.junit.Assert.assertTrue;
--import static org.junit.Assert.fail;
++import static org.junit.jupiter.api.Assertions.assertEquals;
++import static org.junit.jupiter.api.Assertions.assertNotNull;
++import static org.junit.jupiter.api.Assertions.assertTrue;
++import static org.junit.jupiter.api.Assertions.fail;
import java.util.HashSet;
import java.util.Set;
@@@ -47,10 -47,10 +47,10 @@@ import org.apache.directory.server.core
import org.apache.directory.server.core.annotations.CreateDS;
import org.apache.directory.server.core.api.CoreSession;
import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
--import org.apache.directory.server.core.integ.FrameworkRunner;
--import org.junit.Before;
--import org.junit.Test;
--import org.junit.runner.RunWith;
++import org.apache.directory.server.core.integ.ApacheDSTestExtension;
++import org.junit.jupiter.api.BeforeEach;
++import org.junit.jupiter.api.Test;
++import org.junit.jupiter.api.extension.ExtendWith;
/**
@@@ -62,7 -62,7 +62,7 @@@
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
--@RunWith ( FrameworkRunner.class )
++@ExtendWith( ApacheDSTestExtension.class )
@CreateDS(name = "MoveReferralIT")
@ApplyLdifs( {
// Root
@@@ -127,7 -127,7 +127,7 @@@ public class MoveReferralIT extends Abs
Attributes userEntry;
Entry serverEntry;
-- @Before
++ @BeforeEach
public void setUp() throws Exception
{
MNNCtx = getContext( ServerDNConstants.ADMIN_SYSTEM_DN, getService(), "o=MNN,c=WW,ou=system" );
diff --cc core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/RenameReferralIT.java
index 5c81587,5c81587..f658f04
--- a/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/RenameReferralIT.java
+++ b/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/RenameReferralIT.java
@@@ -20,10 -20,10 +20,10 @@@
package org.apache.directory.server.core.jndi.referral;
import static org.apache.directory.server.core.integ.IntegrationUtils.getContext;
--import static org.junit.Assert.assertEquals;
--import static org.junit.Assert.assertNotNull;
--import static org.junit.Assert.assertTrue;
--import static org.junit.Assert.fail;
++import static org.junit.jupiter.api.Assertions.assertEquals;
++import static org.junit.jupiter.api.Assertions.assertNotNull;
++import static org.junit.jupiter.api.Assertions.assertTrue;
++import static org.junit.jupiter.api.Assertions.fail;
import java.util.HashSet;
import java.util.Set;
@@@ -46,10 -46,10 +46,10 @@@ import org.apache.directory.server.core
import org.apache.directory.server.core.annotations.CreateDS;
import org.apache.directory.server.core.api.CoreSession;
import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
--import org.apache.directory.server.core.integ.FrameworkRunner;
--import org.junit.Before;
--import org.junit.Test;
--import org.junit.runner.RunWith;
++import org.apache.directory.server.core.integ.ApacheDSTestExtension;
++import org.junit.jupiter.api.BeforeEach;
++import org.junit.jupiter.api.Test;
++import org.junit.jupiter.api.extension.ExtendWith;
/**
@@@ -63,7 -63,7 +63,7 @@@
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
--@RunWith ( FrameworkRunner.class )
++@ExtendWith( ApacheDSTestExtension.class )
@CreateDS(name = "RenameReferralIT")
@ApplyLdifs( {
// Root
@@@ -126,7 -126,7 +126,7 @@@ public class RenameReferralIT extends A
Attributes userEntry;
Entry serverEntry;
-- @Before
++ @BeforeEach
public void setUp() throws Exception
{
MNNCtx = getContext( ServerDNConstants.ADMIN_SYSTEM_DN, getService(), "o=MNN,c=WW,ou=system" );
diff --cc core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/RenameReferralIgnoreIT.java
index 9819fc1,9819fc1..c13250b
--- a/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/RenameReferralIgnoreIT.java
+++ b/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/RenameReferralIgnoreIT.java
@@@ -20,9 -20,9 +20,9 @@@
package org.apache.directory.server.core.jndi.referral;
import static org.apache.directory.server.core.integ.IntegrationUtils.getContext;
--import static org.junit.Assert.assertNotNull;
--import static org.junit.Assert.assertTrue;
--import static org.junit.Assert.fail;
++import static org.junit.jupiter.api.Assertions.assertNotNull;
++import static org.junit.jupiter.api.Assertions.assertTrue;
++import static org.junit.jupiter.api.Assertions.fail;
import javax.naming.NameAlreadyBoundException;
import javax.naming.NameNotFoundException;
@@@ -44,10 -44,10 +44,10 @@@ import org.apache.directory.server.core
import org.apache.directory.server.core.annotations.CreateDS;
import org.apache.directory.server.core.api.CoreSession;
import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
--import org.apache.directory.server.core.integ.FrameworkRunner;
--import org.junit.Before;
--import org.junit.Test;
--import org.junit.runner.RunWith;
++import org.apache.directory.server.core.integ.ApacheDSTestExtension;
++import org.junit.jupiter.api.BeforeEach;
++import org.junit.jupiter.api.Test;
++import org.junit.jupiter.api.extension.ExtendWith;
/**
@@@ -61,7 -61,7 +61,7 @@@
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
--@RunWith ( FrameworkRunner.class )
++@ExtendWith( ApacheDSTestExtension.class )
@CreateDS(name = "RenameReferralIgnoreIT")
@ApplyLdifs( {
// Root
@@@ -124,7 -124,7 +124,7 @@@ public class RenameReferralIgnoreIT ext
Attributes userEntry;
Entry serverEntry;
-- @Before
++ @BeforeEach
public void setUp() throws Exception
{
MNNCtx = getContext( ServerDNConstants.ADMIN_SYSTEM_DN, getService(), "o=MNN,c=WW,ou=system" );
diff --cc core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/SearchReferralIT.java
index 81747b5,81747b5..e945847
--- a/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/SearchReferralIT.java
+++ b/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/SearchReferralIT.java
@@@ -20,10 -20,10 +20,10 @@@
package org.apache.directory.server.core.jndi.referral;
import static org.apache.directory.server.core.integ.IntegrationUtils.getContext;
--import static org.junit.Assert.assertEquals;
--import static org.junit.Assert.assertNotNull;
--import static org.junit.Assert.assertTrue;
--import static org.junit.Assert.fail;
++import static org.junit.jupiter.api.Assertions.assertEquals;
++import static org.junit.jupiter.api.Assertions.assertNotNull;
++import static org.junit.jupiter.api.Assertions.assertTrue;
++import static org.junit.jupiter.api.Assertions.fail;
import java.util.HashSet;
import java.util.Set;
@@@ -50,10 -50,10 +50,10 @@@ import org.apache.directory.server.core
import org.apache.directory.server.core.annotations.CreateDS;
import org.apache.directory.server.core.api.CoreSession;
import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
--import org.apache.directory.server.core.integ.FrameworkRunner;
--import org.junit.Before;
--import org.junit.Test;
--import org.junit.runner.RunWith;
++import org.apache.directory.server.core.integ.ApacheDSTestExtension;
++import org.junit.jupiter.api.BeforeEach;
++import org.junit.jupiter.api.Test;
++import org.junit.jupiter.api.extension.ExtendWith;
/**
@@@ -65,7 -65,7 +65,7 @@@
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
--@RunWith ( FrameworkRunner.class )
++@ExtendWith( ApacheDSTestExtension.class )
@CreateDS(name = "SearchReferralIT")
@ApplyLdifs( {
// Root
@@@ -128,7 -128,7 +128,7 @@@ public class SearchReferralIT extends A
Attributes userEntry;
Entry serverEntry;
-- @Before
++ @BeforeEach
public void setUp() throws Exception
{
MNNCtx = getContext( ServerDNConstants.ADMIN_SYSTEM_DN, getService(), "o=MNN,c=WW,ou=system" );
diff --cc core-integ/src/test/java/org/apache/directory/server/core/normalization/NormalizationServiceIT.java
index 2deb436,2deb436..4037b6a
--- a/core-integ/src/test/java/org/apache/directory/server/core/normalization/NormalizationServiceIT.java
+++ b/core-integ/src/test/java/org/apache/directory/server/core/normalization/NormalizationServiceIT.java
@@@ -20,18 -20,18 +20,18 @@@
package org.apache.directory.server.core.normalization;
--import static org.junit.Assert.assertNotNull;
--import static org.junit.Assert.assertTrue;
++import static org.junit.jupiter.api.Assertions.assertNotNull;
++import static org.junit.jupiter.api.Assertions.assertTrue;
import org.apache.directory.api.ldap.model.entry.DefaultEntry;
import org.apache.directory.api.ldap.model.entry.Entry;
import org.apache.directory.ldap.client.api.LdapConnection;
import org.apache.directory.server.core.annotations.CreateDS;
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.directory.server.core.integ.IntegrationUtils;
--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 +39,7 @@@
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
--@RunWith(FrameworkRunner.class)
++@ExtendWith( ApacheDSTestExtension.class )
@CreateDS(name = "NormalizationServiceIT")
public final class NormalizationServiceIT extends AbstractLdapTestUnit
{
diff --cc core-integ/src/test/java/org/apache/directory/server/core/operational/OperationalAttributeServiceIT.java
index c363c52,c363c52..14ad56b
--- a/core-integ/src/test/java/org/apache/directory/server/core/operational/OperationalAttributeServiceIT.java
+++ b/core-integ/src/test/java/org/apache/directory/server/core/operational/OperationalAttributeServiceIT.java
@@@ -20,10 -20,10 +20,10 @@@
package org.apache.directory.server.core.operational;
--import static org.junit.Assert.assertFalse;
--import static org.junit.Assert.assertNotNull;
--import static org.junit.Assert.assertNull;
--import static org.junit.Assert.assertTrue;
++import static org.junit.jupiter.api.Assertions.assertFalse;
++import static org.junit.jupiter.api.Assertions.assertNotNull;
++import static org.junit.jupiter.api.Assertions.assertNull;
++import static org.junit.jupiter.api.Assertions.assertTrue;
import org.apache.directory.api.ldap.model.cursor.EntryCursor;
import org.apache.directory.api.ldap.model.entry.Attribute;
@@@ -38,13 -38,13 +38,13 @@@ import org.apache.directory.api.ldap.mo
import org.apache.directory.ldap.client.api.LdapConnection;
import org.apache.directory.server.core.annotations.CreateDS;
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.directory.server.core.integ.IntegrationUtils;
--import org.junit.After;
--import org.junit.Before;
--import org.junit.Ignore;
--import org.junit.Test;
--import org.junit.runner.RunWith;
++import org.junit.jupiter.api.AfterEach;
++import org.junit.jupiter.api.Assertions;
++import org.junit.jupiter.api.Test;import org.junit.jupiter.api.BeforeEach;
++import org.junit.jupiter.api.Disabled;
++import org.junit.jupiter.api.extension.ExtendWith;
/**
@@@ -53,7 -53,7 +53,7 @@@
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
--@RunWith(FrameworkRunner.class)
++@ExtendWith( ApacheDSTestExtension.class )
@CreateDS(name = "OperationalAttributeServiceDS")
public class OperationalAttributeServiceIT extends AbstractLdapTestUnit
{
@@@ -63,7 -63,7 +63,7 @@@
private LdapConnection connection;
-- @Before
++ @BeforeEach
public void setup() throws Exception
{
connection = IntegrationUtils.getAdminConnection( getService() );
@@@ -81,7 -81,7 +81,7 @@@
}
-- @After
++ @AfterEach
public void shutdown() throws Exception
{
// delete this entry after each test because we want
@@@ -96,7 -96,7 +96,7 @@@
@Test
-- @Ignore
++ @Disabled
public void testBinaryAttributeFilterExtension() throws Exception
{
Entry entry = new DefaultEntry(
@@@ -142,7 -142,7 +142,7 @@@
@Test
-- @Ignore
++ @Disabled
public void testAddShouldAddOperationalOpAttrs() throws Exception
{
/*
@@@ -188,7 -188,7 +188,7 @@@
* @throws Exception on error
*/
@Test
-- @Ignore
++ @Disabled
public void testSystemContextRoot() throws Exception
{
EntryCursor responses = connection
@@@ -232,7 -232,7 +232,7 @@@
* @throws Exception on error
*/
@Test
-- @Ignore
++ @Disabled
public void testConfirmNonAdminUserDnIsCreatorsName() throws Exception
{
Entry entry = new DefaultEntry(
@@@ -268,7 -268,7 +268,7 @@@
* @throws Exception on error
*/
@Test
-- @Ignore
++ @Disabled
public void testModifyShouldLeadToModifiersAttributes() throws Exception
{
Entry entry = connection.lookup( DN_KATE_BUSH, "modifiersName", "modifyTimestamp" );
@@@ -295,7 -295,7 +295,7 @@@
* @throws InterruptedException on error
*/
@Test
-- @Ignore
++ @Disabled
public void testModifyShouldChangeModifyTimestamp() throws Exception, InterruptedException
{
// Add attribute description to entry
@@@ -337,7 -337,7 +337,7 @@@
* this will succeed look at DIRSERVER-1416
*/
@Test
-- @Ignore
++ @Disabled
public void testModifyOperationalAttributeAdd() throws Exception
{
// Add attribute description to entry
@@@ -353,14 -353,14 +353,17 @@@
*
* @throws Exception on error
*/
-- @Test(expected = LdapNoPermissionException.class)
-- @Ignore
++ @Test
++ @Disabled
public void testModifyOperationalAttributeRemove() throws Exception
{
-- Modification modifyOp = new DefaultModification( ModificationOperation.REMOVE_ATTRIBUTE,
-- new DefaultAttribute( "creatorsName" ) );
--
-- connection.modify( DN_KATE_BUSH, modifyOp );
++ Assertions.assertThrows( LdapNoPermissionException.class, () ->
++ {
++ Modification modifyOp = new DefaultModification( ModificationOperation.REMOVE_ATTRIBUTE,
++ new DefaultAttribute( "creatorsName" ) );
++
++ connection.modify( DN_KATE_BUSH, modifyOp );
++ } );
}
@@@ -369,14 -369,14 +372,17 @@@
*
* @throws Exception on error
*/
-- @Test(expected = LdapNoPermissionException.class)
-- @Ignore
++ @Test
++ @Disabled
public void testModifyOperationalAttributeReplace() throws Exception
{
-- Modification modifyOp = new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE,
-- new DefaultAttribute( "creatorsName", "cn=Tori Amos,dc=example,dc=com" ) );
--
-- connection.modify( DN_KATE_BUSH, modifyOp );
++ Assertions.assertThrows( LdapNoPermissionException.class, () ->
++ {
++ Modification modifyOp = new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE,
++ new DefaultAttribute( "creatorsName", "cn=Tori Amos,dc=example,dc=com" ) );
++
++ connection.modify( DN_KATE_BUSH, modifyOp );
++ } );
}
@@@ -384,7 -384,7 +390,7 @@@
* Rename an entry and check whether attribute modifyTimestamp changes.
*/
@Test
-- @Ignore
++ @Disabled
public void testRenameShouldChangeModifyTimestamp() throws Exception, InterruptedException
{
Entry entry = connection.lookup( DN_KATE_BUSH, "*", "+" );
@@@ -411,7 -411,7 +417,7 @@@
* Move an entry and check whether attribute modifyTimestamp changes.
*/
@Test
-- @Ignore
++ @Disabled
public void testMoveShouldChangeModifyTimestamp() throws Exception, InterruptedException
{
Entry entry = connection.lookup( DN_KATE_BUSH, "*", "+" );
diff --cc core-integ/src/test/java/org/apache/directory/server/core/operations/add/AddAfterShutdownIT.java
index 14801a0,14801a0..0d4f3bf
--- a/core-integ/src/test/java/org/apache/directory/server/core/operations/add/AddAfterShutdownIT.java
+++ b/core-integ/src/test/java/org/apache/directory/server/core/operations/add/AddAfterShutdownIT.java
@@@ -20,9 -20,9 +20,9 @@@
package org.apache.directory.server.core.operations.add;
--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 java.util.HashMap;
import java.util.Map;
@@@ -37,10 -37,10 +37,10 @@@ import org.apache.directory.server.core
import org.apache.directory.server.core.annotations.CreateDS;
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.directory.server.core.integ.IntegrationUtils;
--import org.junit.Test;
--import org.junit.runner.RunWith;
++import org.junit.jupiter.api.Test;
++import org.junit.jupiter.api.extension.ExtendWith;
/**
@@@ -48,7 -48,7 +48,7 @@@
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
--@RunWith(FrameworkRunner.class)
++@ExtendWith( ApacheDSTestExtension.class )
@CreateDS(
name = "AddAfterShutdownIT",
partitions =
diff --cc core-integ/src/test/java/org/apache/directory/server/core/operations/add/AddIT.java
index 83d8307,83d8307..b0f71ba
--- a/core-integ/src/test/java/org/apache/directory/server/core/operations/add/AddIT.java
+++ b/core-integ/src/test/java/org/apache/directory/server/core/operations/add/AddIT.java
@@@ -20,9 -20,9 +20,9 @@@
package org.apache.directory.server.core.operations.add;
--import static org.junit.Assert.assertEquals;
--import static org.junit.Assert.assertNull;
--import static org.junit.Assert.assertNotNull;
++import static org.junit.jupiter.api.Assertions.assertEquals;
++import static org.junit.jupiter.api.Assertions.assertNull;
++import static org.junit.jupiter.api.Assertions.assertNotNull;
import org.apache.directory.api.ldap.model.constants.SchemaConstants;
import org.apache.directory.api.ldap.model.entry.DefaultEntry;
@@@ -35,10 -35,10 +35,10 @@@ import org.apache.directory.server.core
import org.apache.directory.server.core.annotations.CreatePartition;
import org.apache.directory.server.core.annotations.LoadSchema;
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.directory.server.core.integ.IntegrationUtils;
--import org.junit.Test;
--import org.junit.runner.RunWith;
++import org.junit.jupiter.api.Test;
++import org.junit.jupiter.api.extension.ExtendWith;
/**
@@@ -46,7 -46,7 +46,7 @@@
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
--@RunWith(FrameworkRunner.class)
++@ExtendWith( { ApacheDSTestExtension.class } )
@CreateDS(
name = "AddITDS",
loadedSchemas =
diff --cc core-integ/src/test/java/org/apache/directory/server/core/operations/add/AddPerfIT.java
index 31fb4bc,31fb4bc..8399133
--- a/core-integ/src/test/java/org/apache/directory/server/core/operations/add/AddPerfIT.java
+++ b/core-integ/src/test/java/org/apache/directory/server/core/operations/add/AddPerfIT.java
@@@ -33,10 -33,10 +33,10 @@@ import org.apache.directory.server.core
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.directory.server.core.integ.IntegrationUtils;
--import org.junit.Test;
--import org.junit.runner.RunWith;
++import org.junit.jupiter.api.Test;
++import org.junit.jupiter.api.extension.ExtendWith;
/**
@@@ -44,7 -44,7 +44,7 @@@
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
--@RunWith(FrameworkRunner.class)
++@ExtendWith( { ApacheDSTestExtension.class } )
@CreateDS(
name = "AddPerfDS",
partitions =
diff --cc core-integ/src/test/java/org/apache/directory/server/core/operations/add/ConcurrentAddSearchIT.java
index 1146a86,1146a86..b04d87f
--- a/core-integ/src/test/java/org/apache/directory/server/core/operations/add/ConcurrentAddSearchIT.java
+++ b/core-integ/src/test/java/org/apache/directory/server/core/operations/add/ConcurrentAddSearchIT.java
@@@ -32,11 -32,11 +32,11 @@@ import org.apache.directory.server.core
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.directory.server.core.integ.IntegrationUtils;
--import org.junit.Ignore;
--import org.junit.Test;
--import org.junit.runner.RunWith;
++import org.junit.jupiter.api.Disabled;
++import org.junit.jupiter.api.Test;
++import org.junit.jupiter.api.extension.ExtendWith;
/**
@@@ -44,7 -44,7 +44,7 @@@
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
--@RunWith(FrameworkRunner.class)
++@ExtendWith( { ApacheDSTestExtension.class } )
@CreateDS(
name = "AddPerfDS",
partitions =
@@@ -117,7 -117,7 +117,7 @@@ public class ConcurrentAddSearchIT exte
* Test some concurrent search and add operation performance
*/
@Test
-- @Ignore
++ @Disabled
public void testConcurrentSearch() throws Exception
{
LdapConnection connection = IntegrationUtils.getAdminConnection( getService() );
diff --cc core-integ/src/test/java/org/apache/directory/server/core/operations/add/DIRSERVER169IT.java
index 09c4ece,09c4ece..4261945
--- a/core-integ/src/test/java/org/apache/directory/server/core/operations/add/DIRSERVER169IT.java
+++ b/core-integ/src/test/java/org/apache/directory/server/core/operations/add/DIRSERVER169IT.java
@@@ -21,10 -21,10 +21,10 @@@ package org.apache.directory.server.cor
import static org.apache.directory.server.core.integ.IntegrationUtils.getAdminConnection;
--import static org.junit.Assert.assertEquals;
--import static org.junit.Assert.assertNotNull;
--import static org.junit.Assert.assertTrue;
--import static org.junit.Assert.fail;
++import static org.junit.jupiter.api.Assertions.assertEquals;
++import static org.junit.jupiter.api.Assertions.assertNotNull;
++import static org.junit.jupiter.api.Assertions.assertTrue;
++import static org.junit.jupiter.api.Assertions.fail;
import org.apache.directory.api.ldap.model.entry.Attribute;
import org.apache.directory.api.ldap.model.entry.DefaultEntry;
@@@ -34,9 -34,9 +34,10 @@@ import org.apache.directory.api.ldap.mo
import org.apache.directory.ldap.client.api.LdapConnection;
import org.apache.directory.server.core.annotations.CreateDS;
import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
--import org.apache.directory.server.core.integ.FrameworkRunner;
--import org.junit.Test;
--import org.junit.runner.RunWith;
++import org.apache.directory.server.core.integ.ApacheDSTestExtension;
++import org.junit.jupiter.api.Assertions;
++import org.junit.jupiter.api.Test;
++import org.junit.jupiter.api.extension.ExtendWith;
/**
@@@ -44,7 -44,7 +45,7 @@@
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
--@RunWith(FrameworkRunner.class)
++@ExtendWith( { ApacheDSTestExtension.class } )
@CreateDS(name = "AddIT")
public class DIRSERVER169IT extends AbstractLdapTestUnit
{
@@@ -79,21 -79,21 +80,24 @@@
*
* @throws Exception on error
*/
-- @Test( expected=LdapSchemaViolationException.class )
++ @Test
public void testAddAttributesNotInObjectClasses() throws Exception
{
-- LdapConnection sysRoot = getAdminConnection( getService() );
--
-- String base = "uid=kevin, ou=system";
--
-- Entry entry = new DefaultEntry( base,
-- "ObjectClass: top",
-- "cn: kevin Spacey",
-- "dc: ke" );
--
-- //create subcontext
-- sysRoot.add( entry );
-- fail( "Should not reach this state" );
++ Assertions.assertThrows( LdapSchemaViolationException.class, () ->
++ {
++ LdapConnection sysRoot = getAdminConnection( getService() );
++
++ String base = "uid=kevin, ou=system";
++
++ Entry entry = new DefaultEntry( base,
++ "ObjectClass: top",
++ "cn: kevin Spacey",
++ "dc: ke" );
++
++ //create subcontext
++ sysRoot.add( entry );
++ fail( "Should not reach this state" );
++ } );
}
@@@ -102,22 -102,22 +106,25 @@@
*
* @throws Exception on error
*/
-- @Test( expected=LdapInvalidAttributeValueException.class )
++ @Test
public void testAddAttributesBadSyntax() throws Exception
{
-- LdapConnection sysRoot = getAdminConnection( getService() );
--
-- String base = "sn=kevin, ou=system";
--
-- Entry entry = new DefaultEntry( base,
-- "ObjectClass: top",
-- "ObjectClass: person",
-- "cn: kevin Spacey",
-- "sn: ke",
-- "telephoneNumber: 0123456abc" );
--
-- // create subcontext
-- sysRoot.add( entry );
++ Assertions.assertThrows( LdapInvalidAttributeValueException.class, () ->
++ {
++ LdapConnection sysRoot = getAdminConnection( getService() );
++
++ String base = "sn=kevin, ou=system";
++
++ Entry entry = new DefaultEntry( base,
++ "ObjectClass: top",
++ "ObjectClass: person",
++ "cn: kevin Spacey",
++ "sn: ke",
++ "telephoneNumber: 0123456abc" );
++
++ // create subcontext
++ sysRoot.add( entry );
++ } );
}
diff --cc core-integ/src/test/java/org/apache/directory/server/core/operations/add/DIRSERVER783IT.java
index 1ebeeed,1ebeeed..fe9b669
--- a/core-integ/src/test/java/org/apache/directory/server/core/operations/add/DIRSERVER783IT.java
+++ b/core-integ/src/test/java/org/apache/directory/server/core/operations/add/DIRSERVER783IT.java
@@@ -21,7 -21,7 +21,7 @@@ package org.apache.directory.server.cor
import static org.apache.directory.server.core.integ.IntegrationUtils.getAdminConnection;
--import static org.junit.Assert.assertTrue;
++import static org.junit.jupiter.api.Assertions.assertTrue;
import org.apache.directory.api.ldap.model.cursor.EntryCursor;
import org.apache.directory.api.ldap.model.entry.DefaultEntry;
@@@ -33,9 -33,9 +33,9 @@@ import org.apache.directory.api.ldap.mo
import org.apache.directory.ldap.client.api.LdapConnection;
import org.apache.directory.server.core.annotations.CreateDS;
import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
--import org.apache.directory.server.core.integ.FrameworkRunner;
--import org.junit.Test;
--import org.junit.runner.RunWith;
++import org.apache.directory.server.core.integ.ApacheDSTestExtension;
++import org.junit.jupiter.api.Test;
++import org.junit.jupiter.api.extension.ExtendWith;
/**
@@@ -44,7 -44,7 +44,7 @@@
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
--@RunWith(FrameworkRunner.class)
++@ExtendWith( { ApacheDSTestExtension.class } )
@CreateDS(allowAnonAccess = true, name = "DIRSERVER783IT")
public class DIRSERVER783IT extends AbstractLdapTestUnit
{
diff --cc core-integ/src/test/java/org/apache/directory/server/core/operations/add/PasswordHashingInterceptorTest.java
index e4026d5,e4026d5..47b4ad8
--- a/core-integ/src/test/java/org/apache/directory/server/core/operations/add/PasswordHashingInterceptorTest.java
+++ b/core-integ/src/test/java/org/apache/directory/server/core/operations/add/PasswordHashingInterceptorTest.java
@@@ -21,9 -21,9 +21,9 @@@
package org.apache.directory.server.core.operations.add;
--import static org.junit.Assert.assertFalse;
--import static org.junit.Assert.assertNull;
--import static org.junit.Assert.assertTrue;
++import static org.junit.jupiter.api.Assertions.assertFalse;
++import static org.junit.jupiter.api.Assertions.assertNull;
++import static org.junit.jupiter.api.Assertions.assertTrue;
import java.util.ArrayList;
import java.util.Arrays;
@@@ -60,10 -60,10 +60,10 @@@ import org.apache.directory.server.core
import org.apache.directory.server.core.hash.Ssha512PasswordHashingInterceptor;
import org.apache.directory.server.core.hash.SshaPasswordHashingInterceptor;
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.directory.server.core.integ.IntegrationUtils;
--import org.junit.Test;
--import org.junit.runner.RunWith;
++import org.junit.jupiter.api.Test;
++import org.junit.jupiter.api.extension.ExtendWith;
/**
@@@ -71,7 -71,7 +71,7 @@@
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
--@RunWith(FrameworkRunner.class)
++@ExtendWith( { ApacheDSTestExtension.class } )
@CreateDS(name = "PasswordHashingInterceptorTest-DS")
public class PasswordHashingInterceptorTest extends AbstractLdapTestUnit
{
diff --cc core-integ/src/test/java/org/apache/directory/server/core/operations/bind/SimpleBindIT.java
index 1d1768d,1d1768d..76e17ed
--- a/core-integ/src/test/java/org/apache/directory/server/core/operations/bind/SimpleBindIT.java
+++ b/core-integ/src/test/java/org/apache/directory/server/core/operations/bind/SimpleBindIT.java
@@@ -20,9 -20,9 +20,9 @@@
package org.apache.directory.server.core.operations.bind;
--import static org.junit.Assert.assertFalse;
--import static org.junit.Assert.assertNotNull;
--import static org.junit.Assert.assertNull;
++import static org.junit.jupiter.api.Assertions.assertFalse;
++import static org.junit.jupiter.api.Assertions.assertNotNull;
++import static org.junit.jupiter.api.Assertions.assertNull;
import java.io.IOException;
@@@ -34,12 -34,12 +34,13 @@@ import org.apache.directory.api.ldap.mo
import org.apache.directory.ldap.client.api.LdapConnection;
import org.apache.directory.server.core.annotations.CreateDS;
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.directory.server.core.integ.IntegrationUtils;
--import org.junit.After;
--import org.junit.Before;
--import org.junit.Test;
--import org.junit.runner.RunWith;
++import org.junit.jupiter.api.AfterEach;
++import org.junit.jupiter.api.Assertions;
++import org.junit.jupiter.api.BeforeEach;
++import org.junit.jupiter.api.Test;
++import org.junit.jupiter.api.extension.ExtendWith;
/**
@@@ -47,7 -47,7 +48,7 @@@
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
--@RunWith(FrameworkRunner.class)
++@ExtendWith( { ApacheDSTestExtension.class } )
@CreateDS(name = "SimpleBindIT", allowAnonAccess = true)
public class SimpleBindIT extends AbstractLdapTestUnit
{
@@@ -55,14 -55,14 +56,14 @@@
private LdapConnection connection;
-- @Before
++ @BeforeEach
public void setup() throws Exception
{
connection = IntegrationUtils.getAdminConnection( getService() );
}
-- @After
++ @AfterEach
public void shutdown() throws Exception
{
connection.close();
@@@ -106,10 -106,10 +107,13 @@@
*
* @throws Exception on error
*/
-- @Test( expected=LdapAuthenticationException.class )
++ @Test
public void testSimpleBindAPrincipalBadPassword() throws LdapException, IOException
{
-- connection.bind( "uid=admin,ou=system", "badsecret" );
++ Assertions.assertThrows( LdapAuthenticationException.class, () ->
++ {
++ connection.bind( "uid=admin,ou=system", "badsecret" );
++ } );
}
@@@ -118,10 -118,10 +122,13 @@@
*
* @throws Exception on error
*/
-- @Test( expected=LdapInvalidDnException.class )
++ @Test
public void testSimpleBindBadPrincipalAPassword() throws LdapException, IOException
{
-- connection.bind( "admin", "badsecret" );
++ Assertions.assertThrows( LdapInvalidDnException.class, () ->
++ {
++ connection.bind( "admin", "badsecret" );
++ } );
}
@@@ -130,10 -130,10 +137,13 @@@
*
* @throws Exception on error
*/
-- @Test( expected=LdapAuthenticationException.class )
++ @Test
public void testSimpleBindUnknowPrincipalAPassword() throws LdapException, IOException
{
-- connection.bind( (String)null, "secret" );
++ Assertions.assertThrows( LdapAuthenticationException.class, () ->
++ {
++ connection.bind( (String)null, "secret" );
++ } );
}
@@@ -163,10 -163,10 +173,13 @@@
*
* @throws Exception on error
*/
-- @Test( expected=LdapUnwillingToPerformException.class )
++ @Test
public void testSimpleBindAPrincipalNoPassword() throws LdapException, IOException
{
-- connection.bind( "uid=admin,ou=system", null );
++ Assertions.assertThrows( LdapUnwillingToPerformException.class, () ->
++ {
++ connection.bind( "uid=admin,ou=system", null );
++ } );
}
@@@ -175,15 -175,15 +188,18 @@@
*
* @throws Exception on error
*/
-- @Test( expected = LdapUnwillingToPerformException.class )
++ @Test
public void testSimpleBindAPrincipalNullPassword() throws Exception
{
-- LdapConnection connection = IntegrationUtils.getConnectionAs( getService(), "uid=admin,ou=system", null );
-- assertFalse( connection.isAuthenticated() );
--
-- connection = IntegrationUtils.getConnectionAs( getService(), "uid=admin,ou=system", "secret" );
--
-- connection.bind( "uid=admin,ou=system", null );
++ Assertions.assertThrows( LdapUnwillingToPerformException.class, () ->
++ {
++ LdapConnection connection = IntegrationUtils.getConnectionAs( getService(), "uid=admin,ou=system", null );
++ assertFalse( connection.isAuthenticated() );
++
++ connection = IntegrationUtils.getConnectionAs( getService(), "uid=admin,ou=system", "secret" );
++
++ connection.bind( "uid=admin,ou=system", null );
++ } );
}
@@@ -192,10 -192,10 +208,13 @@@
*
* @throws Exception on error
*/
-- @Test( expected=LdapAuthenticationException.class )
++ @Test
public void testSimpleBindNoPrincipalAPassword() throws LdapException, IOException
{
-- connection.bind( "", "secret" );
++ Assertions.assertThrows( LdapAuthenticationException.class, () ->
++ {
++ connection.bind( "", "secret" );
++ } );
}
diff --cc core-integ/src/test/java/org/apache/directory/server/core/operations/compare/CompareDirserver1139IT.java
index 23edaee,23edaee..b5fe9a3
--- a/core-integ/src/test/java/org/apache/directory/server/core/operations/compare/CompareDirserver1139IT.java
+++ b/core-integ/src/test/java/org/apache/directory/server/core/operations/compare/CompareDirserver1139IT.java
@@@ -21,9 -21,9 +21,9 @@@ package org.apache.directory.server.cor
import static org.apache.directory.server.core.integ.IntegrationUtils.getSchemaContext;
import static org.apache.directory.server.core.integ.IntegrationUtils.getSystemContext;
--import static org.junit.Assert.assertEquals;
--import static org.junit.Assert.assertNotNull;
--import static org.junit.Assert.assertTrue;
++import static org.junit.jupiter.api.Assertions.assertEquals;
++import static org.junit.jupiter.api.Assertions.assertNotNull;
++import static org.junit.jupiter.api.Assertions.assertTrue;
import javax.naming.NamingEnumeration;
import javax.naming.directory.Attribute;
@@@ -39,10 -39,10 +39,10 @@@ import org.apache.directory.api.ldap.mo
import org.apache.directory.api.util.Strings;
import org.apache.directory.server.core.annotations.CreateDS;
import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
--import org.apache.directory.server.core.integ.FrameworkRunner;
--import org.junit.Before;
--import org.junit.Test;
--import org.junit.runner.RunWith;
++import org.apache.directory.server.core.integ.ApacheDSTestExtension;
++import org.junit.jupiter.api.BeforeEach;
++import org.junit.jupiter.api.Test;
++import org.junit.jupiter.api.extension.ExtendWith;
/**
@@@ -50,7 -50,7 +50,7 @@@
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
--@RunWith ( FrameworkRunner.class )
++@ExtendWith( { ApacheDSTestExtension.class } )
@CreateDS(name = "CompareDirserver1139IT")
public class CompareDirserver1139IT extends AbstractLdapTestUnit
{
@@@ -59,7 -59,7 +59,7 @@@
* Activate the NIS and KRB5KDC schemas
* @throws Exception
*/
-- @Before
++ @BeforeEach
public void init() throws Exception
{
// -------------------------------------------------------------------
diff --cc core-integ/src/test/java/org/apache/directory/server/core/operations/compare/ComparePerfIT.java
index 052a7c9,052a7c9..9c77dcb
--- a/core-integ/src/test/java/org/apache/directory/server/core/operations/compare/ComparePerfIT.java
+++ b/core-integ/src/test/java/org/apache/directory/server/core/operations/compare/ComparePerfIT.java
@@@ -29,10 -29,10 +29,10 @@@ import org.apache.directory.server.core
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.directory.server.core.integ.IntegrationUtils;
--import org.junit.Test;
--import org.junit.runner.RunWith;
++import org.junit.jupiter.api.Test;
++import org.junit.jupiter.api.extension.ExtendWith;
/**
@@@ -40,7 -40,7 +40,7 @@@
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
--@RunWith(FrameworkRunner.class)
++@ExtendWith( { ApacheDSTestExtension.class } )
@CreateDS(
name = "ComparePerfDS",
partitions =
diff --cc core-integ/src/test/java/org/apache/directory/server/core/operations/delete/DeletePerfIT.java
index d8374bf,d8374bf..d18c7dd
--- a/core-integ/src/test/java/org/apache/directory/server/core/operations/delete/DeletePerfIT.java
+++ b/core-integ/src/test/java/org/apache/directory/server/core/operations/delete/DeletePerfIT.java
@@@ -30,10 -30,10 +30,10 @@@ import org.apache.directory.server.core
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.directory.server.core.integ.IntegrationUtils;
--import org.junit.Test;
--import org.junit.runner.RunWith;
++import org.junit.jupiter.api.Test;
++import org.junit.jupiter.api.extension.ExtendWith;
/**
@@@ -41,7 -41,7 +41,7 @@@
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
--@RunWith ( FrameworkRunner.class )
++@ExtendWith( { ApacheDSTestExtension.class } )
@CreateDS(
name="DeletePerfDS",
partitions =
diff --cc core-integ/src/test/java/org/apache/directory/server/core/operations/exists/ExistsIT.java
index 1371cfa,1371cfa..cb0cd59
--- a/core-integ/src/test/java/org/apache/directory/server/core/operations/exists/ExistsIT.java
+++ b/core-integ/src/test/java/org/apache/directory/server/core/operations/exists/ExistsIT.java
@@@ -20,19 -20,19 +20,19 @@@
package org.apache.directory.server.core.operations.exists;
--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.apache.directory.ldap.client.api.LdapConnection;
import org.apache.directory.server.core.annotations.ApplyLdifs;
import org.apache.directory.server.core.annotations.CreateDS;
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.directory.server.core.integ.IntegrationUtils;
--import org.junit.After;
--import org.junit.Before;
--import org.junit.Test;
--import org.junit.runner.RunWith;
++import org.junit.jupiter.api.AfterEach;
++import org.junit.jupiter.api.BeforeEach;
++import org.junit.jupiter.api.Test;
++import org.junit.jupiter.api.extension.ExtendWith;
/**
@@@ -40,7 -40,7 +40,7 @@@
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
--@RunWith(FrameworkRunner.class)
++@ExtendWith( { ApacheDSTestExtension.class } )
@CreateDS(name = "ExistsIT")
@ApplyLdifs(
{
@@@ -56,14 -56,14 +56,14 @@@ public class ExistsIT extends AbstractL
private LdapConnection connection;
-- @Before
++ @BeforeEach
public void setup() throws Exception
{
connection = IntegrationUtils.getAdminConnection( getService() );
}
-- @After
++ @AfterEach
public void shutdown() throws Exception
{
connection.close();
diff --cc core-integ/src/test/java/org/apache/directory/server/core/operations/getRootDse/GetRootDseIT.java
index fb553d7,fb553d7..c88c219
--- a/core-integ/src/test/java/org/apache/directory/server/core/operations/getRootDse/GetRootDseIT.java
+++ b/core-integ/src/test/java/org/apache/directory/server/core/operations/getRootDse/GetRootDseIT.java
@@@ -21,9 -21,9 +21,9 @@@
package org.apache.directory.server.core.operations.getRootDse;
--import static org.junit.Assert.assertEquals;
--import static org.junit.Assert.assertNotNull;
--import static org.junit.Assert.assertTrue;
++import static org.junit.jupiter.api.Assertions.assertEquals;
++import static org.junit.jupiter.api.Assertions.assertNotNull;
++import static org.junit.jupiter.api.Assertions.assertTrue;
import org.apache.directory.api.ldap.model.constants.SchemaConstants;
import org.apache.directory.api.ldap.model.entry.Attribute;
@@@ -32,11 -32,11 +32,11 @@@ import org.apache.directory.ldap.client
import org.apache.directory.server.core.api.DirectoryService;
import org.apache.directory.server.core.api.LdapCoreSessionConnection;
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.directory.server.core.integ.IntegrationUtils;
--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;
/**
@@@ -44,13 -44,13 +44,13 @@@
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
--@RunWith(FrameworkRunner.class)
++@ExtendWith( { ApacheDSTestExtension.class } )
public class GetRootDseIT extends AbstractLdapTestUnit
{
private LdapConnection connection;
-- @Before
++ @BeforeEach
public void setup() throws Exception
{
connection = IntegrationUtils.getAdminConnection( getService() );
diff --cc core-integ/src/test/java/org/apache/directory/server/core/operations/getRootDse/GetRootDsePerfIT.java
index 6cd817e,6cd817e..7f9eb3a
--- a/core-integ/src/test/java/org/apache/directory/server/core/operations/getRootDse/GetRootDsePerfIT.java
+++ b/core-integ/src/test/java/org/apache/directory/server/core/operations/getRootDse/GetRootDsePerfIT.java
@@@ -19,14 -19,14 +19,14 @@@
*/
package org.apache.directory.server.core.operations.getRootDse;
--import static org.junit.Assert.assertNotNull;
++import static org.junit.jupiter.api.Assertions.assertNotNull;
import org.apache.directory.api.ldap.model.entry.Entry;
import org.apache.directory.server.core.api.interceptor.context.GetRootDseOperationContext;
import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
--import org.apache.directory.server.core.integ.FrameworkRunner;
--import org.junit.Test;
--import org.junit.runner.RunWith;
++import org.apache.directory.server.core.integ.ApacheDSTestExtension;
++import org.junit.jupiter.api.Test;
++import org.junit.jupiter.api.extension.ExtendWith;
/**
@@@ -34,7 -34,7 +34,7 @@@
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
--@RunWith ( FrameworkRunner.class )
++@ExtendWith( { ApacheDSTestExtension.class } )
public class GetRootDsePerfIT extends AbstractLdapTestUnit
{
/**
diff --cc core-integ/src/test/java/org/apache/directory/server/core/operations/hasEntry/hasEntryPerfIT.java
index 0fd7793,0fd7793..c401279
--- a/core-integ/src/test/java/org/apache/directory/server/core/operations/hasEntry/hasEntryPerfIT.java
+++ b/core-integ/src/test/java/org/apache/directory/server/core/operations/hasEntry/hasEntryPerfIT.java
@@@ -19,15 -19,15 +19,15 @@@
*/
package org.apache.directory.server.core.operations.hasEntry;
--import static org.junit.Assert.assertTrue;
++import static org.junit.jupiter.api.Assertions.assertTrue;
import org.apache.directory.api.ldap.model.name.Dn;
import org.apache.directory.server.core.api.OperationEnum;
import org.apache.directory.server.core.api.interceptor.context.HasEntryOperationContext;
import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
--import org.apache.directory.server.core.integ.FrameworkRunner;
--import org.junit.Test;
--import org.junit.runner.RunWith;
++import org.apache.directory.server.core.integ.ApacheDSTestExtension;
++import org.junit.jupiter.api.Test;
++import org.junit.jupiter.api.extension.ExtendWith;
/**
@@@ -35,7 -35,7 +35,7 @@@
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
--@RunWith ( FrameworkRunner.class )
++@ExtendWith( { ApacheDSTestExtension.class } )
public class hasEntryPerfIT extends AbstractLdapTestUnit
{
/**
diff --cc core-integ/src/test/java/org/apache/directory/server/core/operations/lookup/LookupIT.java
index 50f0daf,50f0daf..345c5927
--- a/core-integ/src/test/java/org/apache/directory/server/core/operations/lookup/LookupIT.java
+++ b/core-integ/src/test/java/org/apache/directory/server/core/operations/lookup/LookupIT.java
@@@ -20,11 -20,11 +20,11 @@@
package org.apache.directory.server.core.operations.lookup;
--import static org.junit.Assert.assertEquals;
--import static org.junit.Assert.assertFalse;
--import static org.junit.Assert.assertNotNull;
--import static org.junit.Assert.assertNull;
--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.assertNotNull;
++import static org.junit.jupiter.api.Assertions.assertNull;
++import static org.junit.jupiter.api.Assertions.assertTrue;
import org.apache.directory.api.ldap.model.entry.Entry;
import org.apache.directory.api.ldap.model.exception.LdapException;
@@@ -32,12 -32,12 +32,12 @@@ import org.apache.directory.ldap.client
import org.apache.directory.server.core.annotations.ApplyLdifs;
import org.apache.directory.server.core.annotations.CreateDS;
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.directory.server.core.integ.IntegrationUtils;
--import org.junit.After;
--import org.junit.Before;
--import org.junit.Test;
--import org.junit.runner.RunWith;
++import org.junit.jupiter.api.AfterEach;
++import org.junit.jupiter.api.BeforeEach;
++import org.junit.jupiter.api.Test;
++import org.junit.jupiter.api.extension.ExtendWith;
/**
@@@ -45,7 -45,7 +45,7 @@@
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
--@RunWith(FrameworkRunner.class)
++@ExtendWith( { ApacheDSTestExtension.class } )
@CreateDS(name = "LookupIT")
@ApplyLdifs(
{
@@@ -62,14 -62,14 +62,14 @@@ public class LookupIT extends AbstractL
private LdapConnection connection;
-- @Before
++ @BeforeEach
public void setup() throws Exception
{
connection = IntegrationUtils.getAdminConnection( getService() );
}
-- @After
++ @AfterEach
public void shutdown() throws Exception
{
connection.close();
diff --cc core-integ/src/test/java/org/apache/directory/server/core/operations/lookup/LookupPerfIT.java
index e76165e,e76165e..6b64b65
--- a/core-integ/src/test/java/org/apache/directory/server/core/operations/lookup/LookupPerfIT.java
+++ b/core-integ/src/test/java/org/apache/directory/server/core/operations/lookup/LookupPerfIT.java
@@@ -21,7 -21,7 +21,7 @@@ package org.apache.directory.server.cor
import static org.apache.directory.server.core.authz.AutzIntegUtils.createAccessControlSubentry;
--import static org.junit.Assert.assertNotNull;
++import static org.junit.jupiter.api.Assertions.assertNotNull;
import org.apache.directory.api.ldap.model.entry.Entry;
import org.apache.directory.api.ldap.model.name.Dn;
@@@ -29,11 -29,11 +29,11 @@@ import org.apache.directory.ldap.client
import org.apache.directory.server.core.annotations.ApplyLdifs;
import org.apache.directory.server.core.authz.AutzIntegUtils;
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.directory.server.core.integ.IntegrationUtils;
--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;
/**
@@@ -41,7 -41,7 +41,7 @@@
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
--@RunWith(FrameworkRunner.class)
++@ExtendWith( { ApacheDSTestExtension.class } )
@ApplyLdifs(
{
// Entry # 1
@@@ -95,7 -95,7 +95,7 @@@ public class LookupPerfIT extends Abstr
}
-- @Before
++ @BeforeEach
public void init()
{
AutzIntegUtils.service= getService();
diff --cc core-integ/src/test/java/org/apache/directory/server/core/operations/modify/ModifyAddIT.java
index 4912b36,4912b36..9832340
--- a/core-integ/src/test/java/org/apache/directory/server/core/operations/modify/ModifyAddIT.java
+++ b/core-integ/src/test/java/org/apache/directory/server/core/operations/modify/ModifyAddIT.java
@@@ -22,9 -22,9 +22,9 @@@ package org.apache.directory.server.cor
import static org.apache.directory.server.core.integ.IntegrationUtils.getSchemaContext;
import static org.apache.directory.server.core.integ.IntegrationUtils.getSystemContext;
--import static org.junit.Assert.assertEquals;
--import static org.junit.Assert.assertNotNull;
--import static org.junit.Assert.assertTrue;
++import static org.junit.jupiter.api.Assertions.assertEquals;
++import static org.junit.jupiter.api.Assertions.assertNotNull;
++import static org.junit.jupiter.api.Assertions.assertTrue;
import javax.naming.NameNotFoundException;
import javax.naming.NoPermissionException;
@@@ -44,9 -44,9 +44,10 @@@ import org.apache.directory.api.util.St
import org.apache.directory.server.core.annotations.ApplyLdifs;
import org.apache.directory.server.core.annotations.CreateDS;
import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
--import org.apache.directory.server.core.integ.FrameworkRunner;
--import org.junit.Test;
--import org.junit.runner.RunWith;
++import org.apache.directory.server.core.integ.ApacheDSTestExtension;
++import org.junit.jupiter.api.Assertions;
++import org.junit.jupiter.api.Test;
++import org.junit.jupiter.api.extension.ExtendWith;
/**
@@@ -54,7 -54,7 +55,7 @@@
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
--@RunWith ( FrameworkRunner.class )
++@ExtendWith( { ApacheDSTestExtension.class } )
@CreateDS(name = "ModifyAddIT")
@ApplyLdifs(
{
@@@ -304,16 -304,16 +305,19 @@@ public class ModifyAddIT extends Abstra
* Add a new AT with a valid Value in the entry, the AT is not part of the MAY or MUST,
* and the OC does not contain the extensibleObject OC
*/
-- @Test( expected = SchemaViolationException.class )
++ @Test
public void testModifyAddExistingEntryNotExistingATNotInMayValidAVA() throws Exception
{
-- LdapContext sysRoot = getSystemContext( getService() );
-- createData( sysRoot );
--
-- // A valid AT not in MUST or MAY
-- Attributes attrs = new BasicAttributes( "crossCertificatePair", "12345", true );
--
-- sysRoot.modifyAttributes( RDN_HEATHER_NOVA, DirContext.ADD_ATTRIBUTE, attrs );
++ Assertions.assertThrows( SchemaViolationException.class, () ->
++ {
++ LdapContext sysRoot = getSystemContext( getService() );
++ createData( sysRoot );
++
++ // A valid AT not in MUST or MAY
++ Attributes attrs = new BasicAttributes( "crossCertificatePair", "12345", true );
++
++ sysRoot.modifyAttributes( RDN_HEATHER_NOVA, DirContext.ADD_ATTRIBUTE, attrs );
++ } );
}
@@@ -371,69 -371,69 +375,81 @@@
/**
* Add a new single valued AT with 2 Values in the entry
*/
-- @Test( expected = InvalidAttributeValueException.class )
++ @Test
public void testModifyAddExistingEntrySingleValuedATWithTwoValues() throws Exception
{
-- LdapContext sysRoot = getSystemContext( getService() );
-- createData( sysRoot );
--
-- //
-- Attribute attr = new BasicAttribute( "c" );
-- attr.add( "FR" );
-- attr.add( "US" );
-- Attributes attrs = new BasicAttributes( "c", true );
-- attrs.put( attr );
--
-- // Add the Ava
-- sysRoot.modifyAttributes( "ou=testing01", DirContext.ADD_ATTRIBUTE, attrs );
++ Assertions.assertThrows( InvalidAttributeValueException.class, () ->
++ {
++ LdapContext sysRoot = getSystemContext( getService() );
++ createData( sysRoot );
++
++ //
++ Attribute attr = new BasicAttribute( "c" );
++ attr.add( "FR" );
++ attr.add( "US" );
++ Attributes attrs = new BasicAttributes( "c", true );
++ attrs.put( attr );
++
++ // Add the Ava
++ sysRoot.modifyAttributes( "ou=testing01", DirContext.ADD_ATTRIBUTE, attrs );
++ } );
}
/**
* Add a bad AT in the entry, the OC does not contain the extensibleObject OC
*/
-- @Test( expected = InvalidAttributesException.class )
++ @Test
public void testModifyAddExistingEntryNotExistingATInvalidAVA() throws Exception
{
-- LdapContext sysRoot = getSystemContext( getService() );
-- createData( sysRoot );
--
-- // An invalid AT
-- Attributes attrs = new BasicAttributes( "badAttr", "12345", true );
--
-- sysRoot.modifyAttributes( RDN_HEATHER_NOVA, DirContext.ADD_ATTRIBUTE, attrs );
++ Assertions.assertThrows( InvalidAttributesException.class, () ->
++ {
++ LdapContext sysRoot = getSystemContext( getService() );
++ createData( sysRoot );
++
++ // An invalid AT
++ Attributes attrs = new BasicAttributes( "badAttr", "12345", true );
++
++ sysRoot.modifyAttributes( RDN_HEATHER_NOVA, DirContext.ADD_ATTRIBUTE, attrs );
++ } );
}
/**
* Add a bad AT in the entry, the OC contains the extensibleObject OC
*/
-- @Test( expected = InvalidAttributesException.class )
++ @Test
public void testModifyAddExistingEntryNotExistingATInvalidAVAExtensibleObjectInOcs() throws Exception
{
-- LdapContext sysRoot = getSystemContext( getService() );
-- createData( sysRoot );
--
-- // An invalid AT
-- Attributes attrs = new BasicAttributes( "badAttr", "12345", true );
--
-- sysRoot.modifyAttributes( "ou=testing01", DirContext.ADD_ATTRIBUTE, attrs );
++ Assertions.assertThrows( InvalidAttributesException.class, () ->
++ {
++ LdapContext sysRoot = getSystemContext( getService() );
++ createData( sysRoot );
++
++ // An invalid AT
++ Attributes attrs = new BasicAttributes( "badAttr", "12345", true );
++
++ sysRoot.modifyAttributes( "ou=testing01", DirContext.ADD_ATTRIBUTE, attrs );
++ } );
}
/**
* Add a AT part of the MAY/MUST, with an invalid value
*/
-- @Test( expected = IllegalArgumentException.class )
++ @Test
public void testModifyAddExistingEntryExistingATInvalidValue() throws Exception
{
-- LdapContext sysRoot = getSystemContext( getService() );
-- createData( sysRoot );
--
-- // An invalid AT value
-- Attributes attrs = new BasicAttributes( "seeAlso", "AAA", true );
--
-- sysRoot.modifyAttributes( RDN_HEATHER_NOVA, DirContext.ADD_ATTRIBUTE, attrs );
++ Assertions.assertThrows( IllegalArgumentException.class, () ->
++ {
++ LdapContext sysRoot = getSystemContext( getService() );
++ createData( sysRoot );
++
++ // An invalid AT value
++ Attributes attrs = new BasicAttributes( "seeAlso", "AAA", true );
++
++ sysRoot.modifyAttributes( RDN_HEATHER_NOVA, DirContext.ADD_ATTRIBUTE, attrs );
++ } );
}
@@@ -441,48 -441,48 +457,57 @@@
* Add a AT not part of the MAY/MUST, with an invalid value, in an entry with the
* extensibleObject OC
*/
-- @Test( expected = InvalidAttributeValueException.class )
++ @Test
public void testModifyAddExistingEntryExistingATInvalidValueExtensibleObjectInOcs() throws Exception
{
-- LdapContext sysRoot = getSystemContext( getService() );
-- createData( sysRoot );
--
-- // An invalid AT value
-- Attributes attrs = new BasicAttributes( "mobile", "AAA", true );
--
-- sysRoot.modifyAttributes( "ou=testing01", DirContext.ADD_ATTRIBUTE, attrs );
++ Assertions.assertThrows( InvalidAttributeValueException.class, () ->
++ {
++ LdapContext sysRoot = getSystemContext( getService() );
++ createData( sysRoot );
++
++ // An invalid AT value
++ Attributes attrs = new BasicAttributes( "mobile", "AAA", true );
++
++ sysRoot.modifyAttributes( "ou=testing01", DirContext.ADD_ATTRIBUTE, attrs );
++ } );
}
/**
* Add an operational AT in an entry with no extensibleObject OC
*/
-- @Test( expected = NoPermissionException.class )
++ @Test
public void testModifyAddExistingEntryOperationalAttribute() throws Exception
{
-- LdapContext sysRoot = getSystemContext( getService() );
-- createData( sysRoot );
--
-- // An operationalAttribute
-- Attributes attrs = new BasicAttributes( "subschemaSubentry", "cn=anotherSchema", true );
--
-- sysRoot.modifyAttributes( RDN_HEATHER_NOVA, DirContext.ADD_ATTRIBUTE, attrs );
++ Assertions.assertThrows( NoPermissionException.class, () ->
++ {
++ LdapContext sysRoot = getSystemContext( getService() );
++ createData( sysRoot );
++
++ // An operationalAttribute
++ Attributes attrs = new BasicAttributes( "subschemaSubentry", "cn=anotherSchema", true );
++
++ sysRoot.modifyAttributes( RDN_HEATHER_NOVA, DirContext.ADD_ATTRIBUTE, attrs );
++ } );
}
/**
* Add an operational AT in an entry the extensibleObject OC
*/
-- @Test( expected = NoPermissionException.class )
++ @Test
public void testModifyAddExistingEntryOperationalAttributeExtensibleObjectInOcs() throws Exception
{
-- LdapContext sysRoot = getSystemContext( getService() );
-- createData( sysRoot );
--
-- // An operational attribute
-- Attributes attrs = new BasicAttributes( "subschemaSubentry", "cn=anotherSchema", true );
--
-- sysRoot.modifyAttributes( "ou=testing01", DirContext.ADD_ATTRIBUTE, attrs );
++ Assertions.assertThrows( NoPermissionException.class, () ->
++ {
++ LdapContext sysRoot = getSystemContext( getService() );
++ createData( sysRoot );
++
++ // An operational attribute
++ Attributes attrs = new BasicAttributes( "subschemaSubentry", "cn=anotherSchema", true );
++
++ sysRoot.modifyAttributes( "ou=testing01", DirContext.ADD_ATTRIBUTE, attrs );
++ } );
}
@@@ -520,15 -520,15 +545,18 @@@
* Add a new AT with a valid Value in the entry, the AT is part of the MAY,
* the value already exists
*/
-- @Test( expected = AttributeInUseException.class )
++ @Test
public void testModifyAddExistingEntryExistingATExistingValue() throws Exception
{
-- LdapContext sysRoot = getSystemContext( getService() );
-- createData( sysRoot );
--
-- Attributes attrs = new BasicAttributes( "description", PERSON_DESCRIPTION, true );
--
-- sysRoot.modifyAttributes( RDN_HEATHER_NOVA, DirContext.ADD_ATTRIBUTE, attrs );
++ Assertions.assertThrows( AttributeInUseException.class, () ->
++ {
++ LdapContext sysRoot = getSystemContext( getService() );
++ createData( sysRoot );
++
++ Attributes attrs = new BasicAttributes( "description", PERSON_DESCRIPTION, true );
++
++ sysRoot.modifyAttributes( RDN_HEATHER_NOVA, DirContext.ADD_ATTRIBUTE, attrs );
++ } );
}
@@@ -565,63 -565,63 +593,72 @@@
/**
* Add a new value in a single valued AT
*/
-- @Test( expected = InvalidAttributeValueException.class )
++ @Test
public void testModifyAddExistingEntryExistingSingleValuedAT() throws Exception
{
-- LdapContext sysRoot = getSystemContext( getService() );
-- createData( sysRoot );
--
-- // The initial value
-- Attributes attrs = new BasicAttributes( "c", "FR", true );
--
-- // Add the Ava
-- sysRoot.modifyAttributes( "ou=testing01", DirContext.ADD_ATTRIBUTE, attrs );
--
-- // Add another value
-- Attributes attrs2 = new BasicAttributes( "c", "US", true );
--
-- // Add the Ava
-- sysRoot.modifyAttributes( "ou=testing01", DirContext.ADD_ATTRIBUTE, attrs2 );
++ Assertions.assertThrows( InvalidAttributeValueException.class, () ->
++ {
++ LdapContext sysRoot = getSystemContext( getService() );
++ createData( sysRoot );
++
++ // The initial value
++ Attributes attrs = new BasicAttributes( "c", "FR", true );
++
++ // Add the Ava
++ sysRoot.modifyAttributes( "ou=testing01", DirContext.ADD_ATTRIBUTE, attrs );
++
++ // Add another value
++ Attributes attrs2 = new BasicAttributes( "c", "US", true );
++
++ // Add the Ava
++ sysRoot.modifyAttributes( "ou=testing01", DirContext.ADD_ATTRIBUTE, attrs2 );
++ } );
}
/**
* Add the existing value in a single valued AT
*/
-- @Test( expected = AttributeInUseException.class )
++ @Test
public void testModifyAddExistingEntryExistingSingleValuedATExistingValue() throws Exception
{
-- LdapContext sysRoot = getSystemContext( getService() );
-- createData( sysRoot );
--
-- // The initial value
-- Attributes attrs = new BasicAttributes( "c", "FR", true );
--
-- // Add the Ava
-- sysRoot.modifyAttributes( "ou=testing01", DirContext.ADD_ATTRIBUTE, attrs );
--
-- // Add another value
-- Attributes attrs2 = new BasicAttributes( "c", "FR", true );
--
-- // Add the Ava
-- sysRoot.modifyAttributes( "ou=testing01", DirContext.ADD_ATTRIBUTE, attrs2 );
++ Assertions.assertThrows( AttributeInUseException.class, () ->
++ {
++ LdapContext sysRoot = getSystemContext( getService() );
++ createData( sysRoot );
++
++ // The initial value
++ Attributes attrs = new BasicAttributes( "c", "FR", true );
++
++ // Add the Ava
++ sysRoot.modifyAttributes( "ou=testing01", DirContext.ADD_ATTRIBUTE, attrs );
++
++ // Add another value
++ Attributes attrs2 = new BasicAttributes( "c", "FR", true );
++
++ // Add the Ava
++ sysRoot.modifyAttributes( "ou=testing01", DirContext.ADD_ATTRIBUTE, attrs2 );
++ } );
}
/**
* Add an invalue in a existing AT
*/
-- @Test( expected = InvalidAttributeValueException.class )
++ @Test
public void testModifyAddExistingEntryExistingATBadValue() throws Exception
{
-- LdapContext sysRoot = getSystemContext( getService() );
-- createData( sysRoot );
--
-- // The added value
-- Attributes attrs = new BasicAttributes( "telephoneNumber", "BAD", true );
--
-- // Add the Ava
-- sysRoot.modifyAttributes( "ou=testing01", DirContext.ADD_ATTRIBUTE, attrs );
++ Assertions.assertThrows( InvalidAttributeValueException.class, () ->
++ {
++ LdapContext sysRoot = getSystemContext( getService() );
++ createData( sysRoot );
++
++ // The added value
++ Attributes attrs = new BasicAttributes( "telephoneNumber", "BAD", true );
++
++ // Add the Ava
++ sysRoot.modifyAttributes( "ou=testing01", DirContext.ADD_ATTRIBUTE, attrs );
++ } );
}
@@@ -655,15 -655,15 +692,18 @@@
/**
* Add an AT in an entry which does not exist
*/
-- @Test( expected = NameNotFoundException.class )
++ @Test
public void testModifyAddNotExistingEntry() throws Exception
{
-- LdapContext sysRoot = getSystemContext( getService() );
-- createData( sysRoot );
--
-- // An operational attribute
-- Attributes attrs = new BasicAttributes( "cn", "test", true );
--
-- sysRoot.modifyAttributes( "ou=absent", DirContext.ADD_ATTRIBUTE, attrs );
++ Assertions.assertThrows( NameNotFoundException.class, () ->
++ {
++ LdapContext sysRoot = getSystemContext( getService() );
++ createData( sysRoot );
++
++ // An operational attribute
++ Attributes attrs = new BasicAttributes( "cn", "test", true );
++
++ sysRoot.modifyAttributes( "ou=absent", DirContext.ADD_ATTRIBUTE, attrs );
++ } );
}
}
diff --cc core-integ/src/test/java/org/apache/directory/server/core/operations/modify/ModifyDelIT.java
index 9367b64,9367b64..fa7fbe5
--- a/core-integ/src/test/java/org/apache/directory/server/core/operations/modify/ModifyDelIT.java
+++ b/core-integ/src/test/java/org/apache/directory/server/core/operations/modify/ModifyDelIT.java
@@@ -22,11 -22,11 +22,11 @@@ package org.apache.directory.server.cor
import static org.apache.directory.server.core.integ.IntegrationUtils.getSchemaContext;
import static org.apache.directory.server.core.integ.IntegrationUtils.getSystemContext;
--import static org.junit.Assert.assertEquals;
--import static org.junit.Assert.assertFalse;
--import static org.junit.Assert.assertNotNull;
--import static org.junit.Assert.assertNull;
--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.assertNotNull;
++import static org.junit.jupiter.api.Assertions.assertNull;
++import static org.junit.jupiter.api.Assertions.assertTrue;
import javax.naming.NameNotFoundException;
import javax.naming.NamingException;
@@@ -46,10 -46,10 +46,11 @@@ import org.apache.directory.server.core
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.directory.server.core.integ.IntegrationUtils;
--import org.junit.Test;
--import org.junit.runner.RunWith;
++import org.junit.jupiter.api.Assertions;
++import org.junit.jupiter.api.Test;
++import org.junit.jupiter.api.extension.ExtendWith;
/**
@@@ -57,7 -57,7 +58,7 @@@
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
--@RunWith(FrameworkRunner.class)
++@ExtendWith( { ApacheDSTestExtension.class } )
@CreateDS(name = "ModifyDelIT",
partitions =
{
@@@ -373,15 -373,15 +374,18 @@@ public class ModifyDelIT extends Abstra
/**
* Delete all the values from an existing AT in MUST
*/
-- @Test(expected = SchemaViolationException.class)
++ @Test
public void testModifyDelExistingEntryExistingATNotInRdnNotSVAllValues() throws Exception
{
-- LdapContext exampleCtx = IntegrationUtils.getContext( "uid=admin,ou=system", getService(), "dc=example,dc=com" );
-- createData( exampleCtx );
--
-- Attributes sn = new BasicAttributes( "sn", "Wilde", true );
--
-- exampleCtx.modifyAttributes( RDN_KIM_WILDE, DirContext.REMOVE_ATTRIBUTE, sn );
++ Assertions.assertThrows( SchemaViolationException.class, () ->
++ {
++ LdapContext exampleCtx = IntegrationUtils.getContext( "uid=admin,ou=system", getService(), "dc=example,dc=com" );
++ createData( exampleCtx );
++
++ Attributes sn = new BasicAttributes( "sn", "Wilde", true );
++
++ exampleCtx.modifyAttributes( RDN_KIM_WILDE, DirContext.REMOVE_ATTRIBUTE, sn );
++ } );
}
@@@ -392,32 -392,32 +396,38 @@@
/**
* Remove a non existing AT from an entry, the AT is part of MAY/MUST
*/
-- @Test(expected = NoSuchAttributeException.class)
++ @Test
public void testModifyDelExistingEntryNonExistingATInMay() throws Exception
{
-- LdapContext exampleCtx = IntegrationUtils.getContext( "uid=admin,ou=system", getService(), "dc=example,dc=com" );
-- createData( exampleCtx );
--
-- // A non existing AT
-- Attributes attrs = new BasicAttributes( "seeAlso", "cn=test", true );
--
-- exampleCtx.modifyAttributes( RDN_HEATHER_NOVA, DirContext.REMOVE_ATTRIBUTE, attrs );
++ Assertions.assertThrows( NoSuchAttributeException.class, () ->
++ {
++ LdapContext exampleCtx = IntegrationUtils.getContext( "uid=admin,ou=system", getService(), "dc=example,dc=com" );
++ createData( exampleCtx );
++
++ // A non existing AT
++ Attributes attrs = new BasicAttributes( "seeAlso", "cn=test", true );
++
++ exampleCtx.modifyAttributes( RDN_HEATHER_NOVA, DirContext.REMOVE_ATTRIBUTE, attrs );
++ } );
}
/**
* Remove a non existing AT from an entry, the AT is not part of MAY/MUST
*/
-- @Test(expected = NoSuchAttributeException.class)
++ @Test
public void testModifyDelExistingEntryNonExistingATNotInMayMust() throws Exception
{
-- LdapContext exampleCtx = IntegrationUtils.getContext( "uid=admin,ou=system", getService(), "dc=example,dc=com" );
-- createData( exampleCtx );
--
-- // A non existing AT
-- Attributes attrs = new BasicAttributes( "c", "FR", true );
--
-- exampleCtx.modifyAttributes( RDN_HEATHER_NOVA, DirContext.REMOVE_ATTRIBUTE, attrs );
++ Assertions.assertThrows( NoSuchAttributeException.class, () ->
++ {
++ LdapContext exampleCtx = IntegrationUtils.getContext( "uid=admin,ou=system", getService(), "dc=example,dc=com" );
++ createData( exampleCtx );
++
++ // A non existing AT
++ Attributes attrs = new BasicAttributes( "c", "FR", true );
++
++ exampleCtx.modifyAttributes( RDN_HEATHER_NOVA, DirContext.REMOVE_ATTRIBUTE, attrs );
++ } );
}
@@@ -444,30 -444,30 +454,36 @@@
/**
* Delete a value from an existing SingleValued AT, in MUST, not in Rdn
*/
-- @Test(expected = SchemaViolationException.class)
++ @Test
public void testModifyDelExistingEntryExistingATNotInRdnSVInMust() throws Exception
{
-- LdapContext exampleCtx = IntegrationUtils.getContext( "uid=admin,ou=system", getService(), "dc=example,dc=com" );
-- createData( exampleCtx );
--
-- Attributes attrs = new BasicAttributes( "uidNumber", "1", true );
--
-- exampleCtx.modifyAttributes( "cn=test", DirContext.REMOVE_ATTRIBUTE, attrs );
++ Assertions.assertThrows( SchemaViolationException.class, () ->
++ {
++ LdapContext exampleCtx = IntegrationUtils.getContext( "uid=admin,ou=system", getService(), "dc=example,dc=com" );
++ createData( exampleCtx );
++
++ Attributes attrs = new BasicAttributes( "uidNumber", "1", true );
++
++ exampleCtx.modifyAttributes( "cn=test", DirContext.REMOVE_ATTRIBUTE, attrs );
++ } );
}
/**
* Delete a value part of the Rdn
*/
-- @Test(expected = SchemaViolationException.class)
++ @Test
public void testModifyDelExistingEntryExistingATPartOfRdn() throws Exception
{
-- LdapContext exampleCtx = IntegrationUtils.getContext( "uid=admin,ou=system", getService(), "dc=example,dc=com" );
-- createData( exampleCtx );
--
-- Attributes attrs = new BasicAttributes( "cn", "test", true );
--
-- exampleCtx.modifyAttributes( "cn=test", DirContext.REMOVE_ATTRIBUTE, attrs );
++ Assertions.assertThrows( SchemaViolationException.class, () ->
++ {
++ LdapContext exampleCtx = IntegrationUtils.getContext( "uid=admin,ou=system", getService(), "dc=example,dc=com" );
++ createData( exampleCtx );
++
++ Attributes attrs = new BasicAttributes( "cn", "test", true );
++
++ exampleCtx.modifyAttributes( "cn=test", DirContext.REMOVE_ATTRIBUTE, attrs );
++ } );
}
@@@ -494,45 -494,45 +510,54 @@@
/**
* Delete an existing AT not part of the Rdn, but in MUST
*/
-- @Test(expected = SchemaViolationException.class)
++ @Test
public void testModifyDelExistingEntryExistingATNoInRdnInMust() throws Exception
{
-- LdapContext exampleCtx = IntegrationUtils.getContext( "uid=admin,ou=system", getService(), "dc=example,dc=com" );
-- createData( exampleCtx );
--
-- Attributes attrs = new BasicAttributes( "sn", null, true );
--
-- exampleCtx.modifyAttributes( RDN_HEATHER_NOVA, DirContext.REMOVE_ATTRIBUTE, attrs );
++ Assertions.assertThrows( SchemaViolationException.class, () ->
++ {
++ LdapContext exampleCtx = IntegrationUtils.getContext( "uid=admin,ou=system", getService(), "dc=example,dc=com" );
++ createData( exampleCtx );
++
++ Attributes attrs = new BasicAttributes( "sn", null, true );
++
++ exampleCtx.modifyAttributes( RDN_HEATHER_NOVA, DirContext.REMOVE_ATTRIBUTE, attrs );
++ } );
}
/**
* Delete an existing AT part of the Rdn
*/
-- @Test(expected = SchemaViolationException.class)
++ @Test
public void testModifyDelExistingEntryExistingATInRdn() throws Exception
{
-- LdapContext exampleCtx = IntegrationUtils.getContext( "uid=admin,ou=system", getService(), "dc=example,dc=com" );
-- createData( exampleCtx );
--
-- Attributes attrs = new BasicAttributes( "cn", null, true );
--
-- exampleCtx.modifyAttributes( RDN_HEATHER_NOVA, DirContext.REMOVE_ATTRIBUTE, attrs );
++ Assertions.assertThrows( SchemaViolationException.class, () ->
++ {
++ LdapContext exampleCtx = IntegrationUtils.getContext( "uid=admin,ou=system", getService(), "dc=example,dc=com" );
++ createData( exampleCtx );
++
++ Attributes attrs = new BasicAttributes( "cn", null, true );
++
++ exampleCtx.modifyAttributes( RDN_HEATHER_NOVA, DirContext.REMOVE_ATTRIBUTE, attrs );
++ } );
}
/**
* Delete a value not present in an existing AT
*/
-- @Test(expected = NoSuchAttributeException.class)
++ @Test
public void testModifyDelExistingEntryValueNotPresentInExistingAT() throws Exception
{
-- LdapContext exampleCtx = IntegrationUtils.getContext( "uid=admin,ou=system", getService(), "dc=example,dc=com" );
-- createData( exampleCtx );
--
-- Attributes attrs = new BasicAttributes( "description", "Not present", true );
--
-- exampleCtx.modifyAttributes( RDN_HEATHER_NOVA, DirContext.REMOVE_ATTRIBUTE, attrs );
++ Assertions.assertThrows( NoSuchAttributeException.class, () ->
++ {
++ LdapContext exampleCtx = IntegrationUtils.getContext( "uid=admin,ou=system", getService(), "dc=example,dc=com" );
++ createData( exampleCtx );
++
++ Attributes attrs = new BasicAttributes( "description", "Not present", true );
++
++ exampleCtx.modifyAttributes( RDN_HEATHER_NOVA, DirContext.REMOVE_ATTRIBUTE, attrs );
++ } );
}
@@@ -562,15 -562,15 +587,18 @@@
/**
* Del an AT in an entry which does not exist
*/
-- @Test(expected = NameNotFoundException.class)
++ @Test
public void testModifyDelNotExistingEntry() throws Exception
{
-- LdapContext exampleCtx = getSystemContext( getService() );
-- createData( exampleCtx );
--
-- // An operational attribute
-- Attributes attrs = new BasicAttributes( "cn", "test", true );
--
-- exampleCtx.modifyAttributes( "ou=absent", DirContext.REMOVE_ATTRIBUTE, attrs );
++ Assertions.assertThrows( NameNotFoundException.class, () ->
++ {
++ LdapContext exampleCtx = getSystemContext( getService() );
++ createData( exampleCtx );
++
++ // An operational attribute
++ Attributes attrs = new BasicAttributes( "cn", "test", true );
++
++ exampleCtx.modifyAttributes( "ou=absent", DirContext.REMOVE_ATTRIBUTE, attrs );
++ } );
}
}
diff --cc core-integ/src/test/java/org/apache/directory/server/core/operations/modify/ModifyIncrementIT.java
index ce66c9c,ce66c9c..fa2a7d3
--- a/core-integ/src/test/java/org/apache/directory/server/core/operations/modify/ModifyIncrementIT.java
+++ b/core-integ/src/test/java/org/apache/directory/server/core/operations/modify/ModifyIncrementIT.java
@@@ -20,7 -20,7 +20,7 @@@
package org.apache.directory.server.core.operations.modify;
--import static org.junit.Assert.assertEquals;
++import static org.junit.jupiter.api.Assertions.assertEquals;
import org.apache.directory.api.ldap.model.entry.Attribute;
import org.apache.directory.api.ldap.model.entry.DefaultAttribute;
@@@ -35,10 -35,10 +35,10 @@@ import org.apache.directory.ldap.client
import org.apache.directory.server.core.annotations.ApplyLdifs;
import org.apache.directory.server.core.annotations.CreateDS;
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.directory.server.core.integ.IntegrationUtils;
--import org.junit.Test;
--import org.junit.runner.RunWith;
++import org.junit.jupiter.api.Test;
++import org.junit.jupiter.api.extension.ExtendWith;
/**
@@@ -46,7 -46,7 +46,7 @@@
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
--@RunWith ( FrameworkRunner.class )
++@ExtendWith( { ApacheDSTestExtension.class } )
@CreateDS(name = "ModifyAddIT")
@ApplyLdifs(
{
diff --cc core-integ/src/test/java/org/apache/directory/server/core/operations/modify/ModifyMVAttributeIT.java
index 3178a97,3178a97..94aba14
--- a/core-integ/src/test/java/org/apache/directory/server/core/operations/modify/ModifyMVAttributeIT.java
+++ b/core-integ/src/test/java/org/apache/directory/server/core/operations/modify/ModifyMVAttributeIT.java
@@@ -31,17 -31,17 +31,17 @@@ import javax.naming.ldap.LdapContext
import org.apache.directory.server.core.annotations.ApplyLdifs;
import org.apache.directory.server.core.annotations.CreateDS;
import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
--import org.apache.directory.server.core.integ.FrameworkRunner;
--import org.junit.Ignore;
--import org.junit.Test;
--import org.junit.runner.RunWith;
++import org.apache.directory.server.core.integ.ApacheDSTestExtension;
++import org.junit.jupiter.api.Disabled;
++import org.junit.jupiter.api.Test;
++import org.junit.jupiter.api.extension.ExtendWith;
/**
* Test the modification of an entry with a MV attribute We add one new value N times
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
--@RunWith ( FrameworkRunner.class )
++@ExtendWith( { ApacheDSTestExtension.class } )
@CreateDS(name = "ModifyMVAttributeIT")
@ApplyLdifs(
{
@@@ -61,7 -61,7 +61,7 @@@ public class ModifyMVAttributeIT extend
* With this test the Master table will grow linearily.
*/
@Test
-- @Ignore( "Ignore atm, this is a perf test" )
++ @Disabled( "Ignore atm, this is a perf test" )
public void testAdd1000Members() throws Exception
{
LdapContext sysRoot = getSystemContext( getService() );
@@@ -88,7 -88,7 +88,7 @@@
* With this test the Master table will grow crazy.
*/
@Test
-- @Ignore( "Ignore atm, this is a perf test" )
++ @Disabled( "Ignore atm, this is a perf test" )
public void testAdd500Members() throws Exception
{
LdapContext sysRoot = getSystemContext( getService() );
diff --cc core-integ/src/test/java/org/apache/directory/server/core/operations/modify/ModifyMemberIT.java
index 0fe2b68,0fe2b68..ea82a9c
--- a/core-integ/src/test/java/org/apache/directory/server/core/operations/modify/ModifyMemberIT.java
+++ b/core-integ/src/test/java/org/apache/directory/server/core/operations/modify/ModifyMemberIT.java
@@@ -20,8 -20,8 +20,8 @@@
package org.apache.directory.server.core.operations.modify;
--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.apache.directory.api.ldap.model.entry.DefaultModification;
import org.apache.directory.api.ldap.model.entry.Modification;
@@@ -33,10 -33,10 +33,10 @@@ import org.apache.directory.ldap.client
import org.apache.directory.server.core.annotations.ApplyLdifs;
import org.apache.directory.server.core.annotations.CreateDS;
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.directory.server.core.integ.IntegrationUtils;
--import org.junit.Test;
--import org.junit.runner.RunWith;
++import org.junit.jupiter.api.Test;
++import org.junit.jupiter.api.extension.ExtendWith;
/**
@@@ -44,7 -44,7 +44,7 @@@
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
--@RunWith(FrameworkRunner.class)
++@ExtendWith( { ApacheDSTestExtension.class } )
@CreateDS(name = "ModifyMemberIT")
@ApplyLdifs(
{
diff --cc core-integ/src/test/java/org/apache/directory/server/core/operations/modify/ModifyMultipleChangesIT.java
index 500204a,500204a..2ca4d2a
--- a/core-integ/src/test/java/org/apache/directory/server/core/operations/modify/ModifyMultipleChangesIT.java
+++ b/core-integ/src/test/java/org/apache/directory/server/core/operations/modify/ModifyMultipleChangesIT.java
@@@ -22,9 -22,9 +22,9 @@@ package org.apache.directory.server.cor
import static org.apache.directory.server.core.integ.IntegrationUtils.getSchemaContext;
import static org.apache.directory.server.core.integ.IntegrationUtils.getSystemContext;
--import static org.junit.Assert.assertEquals;
--import static org.junit.Assert.assertNotNull;
--import static org.junit.Assert.assertTrue;
++import static org.junit.jupiter.api.Assertions.assertEquals;
++import static org.junit.jupiter.api.Assertions.assertNotNull;
++import static org.junit.jupiter.api.Assertions.assertTrue;
import javax.naming.NamingException;
import javax.naming.directory.Attribute;
@@@ -38,9 -38,9 +38,9 @@@ import javax.naming.ldap.LdapContext
import org.apache.directory.server.core.annotations.ApplyLdifs;
import org.apache.directory.server.core.annotations.CreateDS;
import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
--import org.apache.directory.server.core.integ.FrameworkRunner;
--import org.junit.Test;
--import org.junit.runner.RunWith;
++import org.apache.directory.server.core.integ.ApacheDSTestExtension;
++import org.junit.jupiter.api.Test;
++import org.junit.jupiter.api.extension.ExtendWith;
/**
@@@ -48,7 -48,7 +48,7 @@@
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
--@RunWith ( FrameworkRunner.class )
++@ExtendWith( { ApacheDSTestExtension.class } )
@CreateDS(name = "ModifyMultipleChangesIT")
@ApplyLdifs( {
// Entry # 1
diff --cc core-integ/src/test/java/org/apache/directory/server/core/operations/modify/ModifyPerfIT.java
index 04766d8,04766d8..814e3e8
--- a/core-integ/src/test/java/org/apache/directory/server/core/operations/modify/ModifyPerfIT.java
+++ b/core-integ/src/test/java/org/apache/directory/server/core/operations/modify/ModifyPerfIT.java
@@@ -36,10 -36,10 +36,10 @@@ import org.apache.directory.server.core
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.directory.server.core.integ.IntegrationUtils;
--import org.junit.Test;
--import org.junit.runner.RunWith;
++import org.junit.jupiter.api.Test;
++import org.junit.jupiter.api.extension.ExtendWith;
/**
@@@ -48,7 -48,7 +48,7 @@@
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$
*/
--@RunWith(FrameworkRunner.class)
++@ExtendWith( { ApacheDSTestExtension.class } )
@CreateDS(
name = "ModifyPerfDS",
partitions =
diff --cc core-integ/src/test/java/org/apache/directory/server/core/operations/move/MoveIT.java
index 93a72e2,93a72e2..5feb665
--- a/core-integ/src/test/java/org/apache/directory/server/core/operations/move/MoveIT.java
+++ b/core-integ/src/test/java/org/apache/directory/server/core/operations/move/MoveIT.java
@@@ -19,6 -19,6 +19,11 @@@
*/
package org.apache.directory.server.core.operations.move;
++import static org.junit.jupiter.api.Assertions.assertEquals;
++import static org.junit.jupiter.api.Assertions.assertNotNull;
++import static org.junit.jupiter.api.Assertions.assertNull;
++import static org.junit.jupiter.api.Assertions.fail;
++
import org.apache.directory.api.ldap.model.entry.DefaultEntry;
import org.apache.directory.api.ldap.model.entry.Entry;
import org.apache.directory.api.ldap.model.exception.LdapEntryAlreadyExistsException;
@@@ -31,15 -31,15 +36,10 @@@ import org.apache.directory.server.core
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.directory.server.core.integ.IntegrationUtils;
--import org.junit.Test;
--import org.junit.runner.RunWith;
--
--import static org.junit.Assert.assertEquals;
--import static org.junit.Assert.assertNotNull;
--import static org.junit.Assert.assertNull;
--import static org.junit.Assert.fail;
++import org.junit.jupiter.api.Test;
++import org.junit.jupiter.api.extension.ExtendWith;
/**
@@@ -48,7 -48,7 +48,7 @@@
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$
*/
--@RunWith(FrameworkRunner.class)
++@ExtendWith( { ApacheDSTestExtension.class } )
@CreateDS(name = "MovePerfDS",
partitions =
{
diff --cc core-integ/src/test/java/org/apache/directory/server/core/operations/move/MovePerfIT.java
index 5cfe98c,5cfe98c..591865a
--- a/core-integ/src/test/java/org/apache/directory/server/core/operations/move/MovePerfIT.java
+++ b/core-integ/src/test/java/org/apache/directory/server/core/operations/move/MovePerfIT.java
@@@ -28,10 -28,10 +28,10 @@@ import org.apache.directory.server.core
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.directory.server.core.integ.IntegrationUtils;
--import org.junit.Test;
--import org.junit.runner.RunWith;
++import org.junit.jupiter.api.Test;
++import org.junit.jupiter.api.extension.ExtendWith;
/**
@@@ -40,7 -40,7 +40,7 @@@
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$
*/
--@RunWith(FrameworkRunner.class)
++@ExtendWith( { ApacheDSTestExtension.class } )
@CreateDS(name = "MovePerfDS",
partitions =
{
diff --cc core-integ/src/test/java/org/apache/directory/server/core/operations/moveAndRename/MoveAndRenameIT.java
index 0900b7e,0900b7e..7849764
--- a/core-integ/src/test/java/org/apache/directory/server/core/operations/moveAndRename/MoveAndRenameIT.java
+++ b/core-integ/src/test/java/org/apache/directory/server/core/operations/moveAndRename/MoveAndRenameIT.java
@@@ -20,12 -20,12 +20,12 @@@
package org.apache.directory.server.core.operations.moveAndRename;
--import static org.junit.Assert.assertNotNull;
--import static org.junit.Assert.assertNull;
--import static org.junit.Assert.assertTrue;
--import static org.junit.Assert.fail;
--import static org.junit.Assert.assertFalse;
--import static org.junit.Assert.assertEquals;
++import static org.junit.jupiter.api.Assertions.assertNotNull;
++import static org.junit.jupiter.api.Assertions.assertNull;
++import static org.junit.jupiter.api.Assertions.assertTrue;
++import static org.junit.jupiter.api.Assertions.fail;
++import static org.junit.jupiter.api.Assertions.assertFalse;
++import static org.junit.jupiter.api.Assertions.assertEquals;
import org.apache.directory.api.ldap.model.entry.Attribute;
import org.apache.directory.api.ldap.model.entry.DefaultEntry;
@@@ -39,18 -39,18 +39,18 @@@ import org.apache.directory.server.core
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.directory.server.core.integ.IntegrationUtils;
--import org.junit.Ignore;
--import org.junit.Test;
--import org.junit.runner.RunWith;
++import org.junit.jupiter.api.Disabled;
++import org.junit.jupiter.api.Test;
++import org.junit.jupiter.api.extension.ExtendWith;
/**
* Test the MoveAndRename operation
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
--@RunWith ( FrameworkRunner.class )
++@ExtendWith( { ApacheDSTestExtension.class } )
@CreateDS(name = "MoveAndRenameIT",
partitions =
{
@@@ -296,7 -296,7 +296,7 @@@ public class MoveAndRenameIT extends Ab
* and will accept a cn as a new RDN
*/
@Test
-- @Ignore
++ @Disabled
public void testMoveAndRenameRdnNotInObjectClass() throws Exception
{
LdapConnection connection = IntegrationUtils.getAdminConnection( getService() );
diff --cc core-integ/src/test/java/org/apache/directory/server/core/operations/moveAndRename/MoveAndRenamePerfIT.java
index bcd197f,bcd197f..6790288
--- a/core-integ/src/test/java/org/apache/directory/server/core/operations/moveAndRename/MoveAndRenamePerfIT.java
+++ b/core-integ/src/test/java/org/apache/directory/server/core/operations/moveAndRename/MoveAndRenamePerfIT.java
@@@ -20,8 -20,8 +20,8 @@@
package org.apache.directory.server.core.operations.moveAndRename;
--import static org.junit.Assert.assertNotNull;
--import static org.junit.Assert.assertNull;
++import static org.junit.jupiter.api.Assertions.assertNotNull;
++import static org.junit.jupiter.api.Assertions.assertNull;
import org.apache.directory.api.ldap.model.entry.DefaultEntry;
import org.apache.directory.api.ldap.model.entry.Entry;
@@@ -32,10 -32,10 +32,10 @@@ import org.apache.directory.server.core
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.directory.server.core.integ.IntegrationUtils;
--import org.junit.Test;
--import org.junit.runner.RunWith;
++import org.junit.jupiter.api.Test;
++import org.junit.jupiter.api.extension.ExtendWith;
/**
@@@ -44,7 -44,7 +44,7 @@@
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$
*/
--@RunWith(FrameworkRunner.class)
++@ExtendWith( { ApacheDSTestExtension.class } )
@CreateDS(
name = "MovePerfDS",
partitions =
diff --cc core-integ/src/test/java/org/apache/directory/server/core/operations/rename/RenameIT.java
index a2c3f88,a2c3f88..5e6ccd8
--- a/core-integ/src/test/java/org/apache/directory/server/core/operations/rename/RenameIT.java
+++ b/core-integ/src/test/java/org/apache/directory/server/core/operations/rename/RenameIT.java
@@@ -19,6 -19,6 +19,13 @@@
*/
package org.apache.directory.server.core.operations.rename;
++import static org.junit.jupiter.api.Assertions.assertFalse;
++import static org.junit.jupiter.api.Assertions.assertNull;
++import static org.junit.jupiter.api.Assertions.assertTrue;
++import static org.junit.jupiter.api.Assertions.fail;
++import static org.junit.jupiter.api.Assertions.assertEquals;
++import static org.junit.jupiter.api.Assertions.assertNotNull;
++
import org.apache.directory.api.ldap.model.entry.Attribute;
import org.apache.directory.api.ldap.model.entry.DefaultEntry;
import org.apache.directory.api.ldap.model.entry.Entry;
@@@ -30,17 -30,17 +37,10 @@@ import org.apache.directory.server.core
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.directory.server.core.integ.IntegrationUtils;
--import org.junit.Test;
--import org.junit.runner.RunWith;
--
--import static org.junit.Assert.assertNotNull;
--import static org.junit.Assert.assertNull;
--import static org.junit.Assert.assertEquals;
--import static org.junit.Assert.assertTrue;
--import static org.junit.Assert.fail;
--import static org.junit.Assert.assertFalse;
++import org.junit.jupiter.api.Test;
++import org.junit.jupiter.api.extension.ExtendWith;
/**
* Test the rename operation performances
@@@ -48,7 -48,7 +48,7 @@@
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$
*/
--@RunWith(FrameworkRunner.class)
++@ExtendWith( { ApacheDSTestExtension.class } )
@CreateDS(name = "RenamePerfDS",
partitions =
{
diff --cc core-integ/src/test/java/org/apache/directory/server/core/operations/rename/RenamePerfIT.java
index bca64ce,bca64ce..7596105
--- a/core-integ/src/test/java/org/apache/directory/server/core/operations/rename/RenamePerfIT.java
+++ b/core-integ/src/test/java/org/apache/directory/server/core/operations/rename/RenamePerfIT.java
@@@ -28,10 -28,10 +28,10 @@@ import org.apache.directory.server.core
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.directory.server.core.integ.IntegrationUtils;
--import org.junit.Test;
--import org.junit.runner.RunWith;
++import org.junit.jupiter.api.Test;
++import org.junit.jupiter.api.extension.ExtendWith;
/**
* Test the rename operation performances
@@@ -39,7 -39,7 +39,7 @@@
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$
*/
--@RunWith(FrameworkRunner.class)
++@ExtendWith( { ApacheDSTestExtension.class } )
@CreateDS(name = "RenamePerfDS",
partitions =
{
diff --cc core-integ/src/test/java/org/apache/directory/server/core/operations/search/AliasSearchIT.java
index 089b9ba,089b9ba..5bbab85
--- a/core-integ/src/test/java/org/apache/directory/server/core/operations/search/AliasSearchIT.java
+++ b/core-integ/src/test/java/org/apache/directory/server/core/operations/search/AliasSearchIT.java
@@@ -20,9 -20,9 +20,9 @@@
package org.apache.directory.server.core.operations.search;
--import static org.junit.Assert.assertEquals;
--import static org.junit.Assert.assertTrue;
--import static org.junit.Assert.fail;
++import static org.junit.jupiter.api.Assertions.assertEquals;
++import static org.junit.jupiter.api.Assertions.assertTrue;
++import static org.junit.jupiter.api.Assertions.fail;
import java.util.ArrayList;
import java.util.List;
@@@ -39,10 -39,10 +39,11 @@@ import org.apache.directory.server.core
import org.apache.directory.server.core.annotations.CreateDS;
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.junit.Ignore;
--import org.junit.Test;
--import org.junit.runner.RunWith;
++import org.apache.directory.server.core.integ.ApacheDSTestExtension;
++import org.junit.jupiter.api.Assertions;
++import org.junit.jupiter.api.Disabled;
++import org.junit.jupiter.api.Test;
++import org.junit.jupiter.api.extension.ExtendWith;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@@ -52,7 -52,7 +53,7 @@@
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
--@RunWith(FrameworkRunner.class)
++@ExtendWith( { ApacheDSTestExtension.class } )
@CreateDS(name = "AliasSearchDS", partitions =
{ @CreatePartition(name = "example", suffix = "dc=example,dc=com"),
@CreatePartition(name = "acme", suffix = "o=acme") })
@@@ -81,10 -81,10 +82,13 @@@ public class AliasSearchIT extends Abst
}
-- @Test(expected = LdapNoSuchObjectException.class)
++ @Test
public void testNonexistingPartition() throws Exception
{
-- search( "dc=x", SearchScope.SUBTREE, "(objectClass=*)", AliasDerefMode.NEVER_DEREF_ALIASES );
++ Assertions.assertThrows( LdapNoSuchObjectException.class, () ->
++ {
++ search( "dc=x", SearchScope.SUBTREE, "(objectClass=*)", AliasDerefMode.NEVER_DEREF_ALIASES );
++ } );
}
@@@ -238,7 -238,7 +242,7 @@@
*
* @throws Exception
*/
-- @Ignore("fixme")
++ @Disabled("fixme")
@Test
public void testDerefDescendantOfAlias() throws Exception
{
@@@ -303,7 -303,7 +307,7 @@@
*
* @throws Exception
*/
-- @Ignore("not implemented")
++ @Disabled("not implemented")
@Test
public void testOuHr() throws Exception
{
@@@ -321,7 -321,7 +325,7 @@@
*
* @throws Exception
*/
-- @Ignore("not implemented")
++ @Disabled("not implemented")
@Test
public void testUidFoobar() throws Exception
{
@@@ -346,7 -346,7 +350,7 @@@
*
* @throws Exception
*/
-- @Ignore("not implemented")
++ @Disabled("not implemented")
@Test
public void testUidUser1OuManager() throws Exception
{
@@@ -403,7 -403,7 +407,7 @@@
*
* @throws Exception
*/
-- @Ignore("fixme")
++ @Disabled("fixme")
@Test
public void testOuUser3_Loop() throws Exception
{
@@@ -419,7 -419,7 +423,7 @@@
}
-- @Ignore("fixme")
++ @Disabled("fixme")
@Test
public void testCnDeputyOuUser3_Loop() throws Exception
{
@@@ -432,7 -432,7 +436,7 @@@
}
-- @Ignore
++ @Disabled
@Test
public void testCursorNextPrevWithReset() throws Exception
{
@@@ -479,7 -479,7 +483,7 @@@
}
-- @Ignore
++ @Disabled
@Test
public void testCursorPrevNext() throws Exception
{
diff --cc core-integ/src/test/java/org/apache/directory/server/core/operations/search/DIRSERVER759IT.java
index a76c990,a76c990..2801a3a
--- a/core-integ/src/test/java/org/apache/directory/server/core/operations/search/DIRSERVER759IT.java
+++ b/core-integ/src/test/java/org/apache/directory/server/core/operations/search/DIRSERVER759IT.java
@@@ -21,9 -21,9 +21,9 @@@ package org.apache.directory.server.cor
import static org.apache.directory.server.core.integ.IntegrationUtils.getSystemContext;
--import static org.junit.Assert.assertEquals;
--import static org.junit.Assert.assertNotNull;
--import static org.junit.Assert.assertTrue;
++import static org.junit.jupiter.api.Assertions.assertEquals;
++import static org.junit.jupiter.api.Assertions.assertNotNull;
++import static org.junit.jupiter.api.Assertions.assertTrue;
import javax.naming.NameNotFoundException;
import javax.naming.NamingException;
@@@ -39,9 -39,9 +39,9 @@@ import org.apache.directory.api.ldap.mo
import org.apache.directory.api.ldap.model.message.AliasDerefMode;
import org.apache.directory.server.core.annotations.CreateDS;
import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
--import org.apache.directory.server.core.integ.FrameworkRunner;
--import org.junit.Test;
--import org.junit.runner.RunWith;
++import org.apache.directory.server.core.integ.ApacheDSTestExtension;
++import org.junit.jupiter.api.Test;
++import org.junit.jupiter.api.extension.ExtendWith;
/**
@@@ -49,7 -49,7 +49,7 @@@
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
--@RunWith ( FrameworkRunner.class )
++@ExtendWith( { ApacheDSTestExtension.class } )
@CreateDS(name = "DIRSERVER759IT")
public class DIRSERVER759IT extends AbstractLdapTestUnit
{
diff --cc core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchBinaryIT.java
index a8551c2,a8551c2..ec8d0cc
--- a/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchBinaryIT.java
+++ b/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchBinaryIT.java
@@@ -20,7 -20,7 +20,7 @@@
package org.apache.directory.server.core.operations.search;
--import static org.junit.Assert.assertEquals;
++import static org.junit.jupiter.api.Assertions.assertEquals;
import org.apache.directory.api.ldap.model.cursor.EntryCursor;
import org.apache.directory.api.ldap.model.message.SearchScope;
@@@ -31,11 -31,11 +31,11 @@@ import org.apache.directory.server.core
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.directory.server.core.integ.IntegrationUtils;
--import org.junit.Ignore;
--import org.junit.Test;
--import org.junit.runner.RunWith;
++import org.junit.jupiter.api.Disabled;
++import org.junit.jupiter.api.Test;
++import org.junit.jupiter.api.extension.ExtendWith;
/**
@@@ -43,7 -43,7 +43,7 @@@
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
--@RunWith(FrameworkRunner.class)
++@ExtendWith( { ApacheDSTestExtension.class } )
@CreateDS(
name = "SearchBinaryIT",
partitions =
@@@ -204,7 -204,7 +204,7 @@@ public class SearchBinaryIT extends Abs
* Test search on a binary attribute
*/
@Test
-- @Ignore
++ @Disabled
// This test fails atm. Cf DIRSERVER-1389
public void testSearchSubstrOnBinaryAttribute() throws Exception
{
diff --cc core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchIT.java
index 01c8cb1,01c8cb1..80e9008
--- a/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchIT.java
+++ b/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchIT.java
@@@ -23,12 -23,12 +23,12 @@@ package org.apache.directory.server.cor
import static org.apache.directory.server.core.integ.IntegrationUtils.getAdminConnection;
import static org.apache.directory.server.core.integ.IntegrationUtils.getRootContext;
import static org.apache.directory.server.core.integ.IntegrationUtils.getSystemContext;
--import static org.junit.Assert.assertEquals;
--import static org.junit.Assert.assertFalse;
--import static org.junit.Assert.assertNotNull;
--import static org.junit.Assert.assertNull;
--import static org.junit.Assert.assertTrue;
--import static org.junit.Assert.fail;
++import static org.junit.jupiter.api.Assertions.assertEquals;
++import static org.junit.jupiter.api.Assertions.assertFalse;
++import static org.junit.jupiter.api.Assertions.assertNotNull;
++import static org.junit.jupiter.api.Assertions.assertNull;
++import static org.junit.jupiter.api.Assertions.assertTrue;
++import static org.junit.jupiter.api.Assertions.fail;
import java.util.HashMap;
import java.util.HashSet;
@@@ -65,12 -65,12 +65,12 @@@ import org.apache.directory.server.core
import org.apache.directory.server.core.annotations.LoadSchema;
import org.apache.directory.server.core.api.LdapCoreSessionConnection;
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.directory.server.core.integ.IntegrationUtils;
--import org.junit.Before;
--import org.junit.Ignore;
--import org.junit.Test;
--import org.junit.runner.RunWith;
++import org.junit.jupiter.api.BeforeEach;
++import org.junit.jupiter.api.Disabled;
++import org.junit.jupiter.api.Test;
++import org.junit.jupiter.api.extension.ExtendWith;
/**
@@@ -78,7 -78,7 +78,7 @@@
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
--@RunWith(FrameworkRunner.class)
++@ExtendWith( { ApacheDSTestExtension.class } )
@CreateDS(name = "SearchDS",
loadedSchemas =
{ @LoadSchema(name = "nis", enabled = true) })
@@@ -224,7 -224,7 +224,7 @@@ public class SearchIT extends AbstractL
* @param sysRoot the system root to add entries to
* @throws NamingException on errors
*/
-- @Before
++ @BeforeEach
public void init() throws Exception
{
sysRoot = getSystemContext( getService() );
@@@ -251,7 -251,7 +251,7 @@@
list.close();
-- assertEquals( "Expected number of results returned was incorrect!", 9, map.size() );
++ assertEquals( 9, map.size(), "Expected number of results returned was incorrect!" );
assertTrue( map.containsKey( "ou=testing00,ou=system" ) );
assertTrue( map.containsKey( "ou=testing01,ou=system" ) );
assertTrue( map.containsKey( "ou=testing02,ou=system" ) );
@@@ -278,7 -278,7 +278,7 @@@
list.close();
-- assertEquals( "Expected number of results returned was incorrect", 14, map.size() );
++ assertEquals( 14, map.size(), "Expected number of results returned was incorrect!" );
assertTrue( map.containsKey( "ou=system" ) );
assertTrue( map.containsKey( "ou=testing00,ou=system" ) );
assertTrue( map.containsKey( "ou=testing01,ou=system" ) );
@@@ -310,7 -310,7 +310,7 @@@
list.close();
-- assertEquals( "Expected number of results returned was incorrect", 1, map.size() );
++ assertEquals( 1, map.size(), "Expected number of results returned was incorrect!" );
assertTrue( map.containsKey( "ou=testing02,ou=system" ) );
Attributes attrs = map.get( "ou=testing02,ou=system" );
assertEquals( 0, attrs.size() );
@@@ -338,7 -338,7 +338,7 @@@
list.close();
// 0 because the filter does not have a SUBSTRING MR
-- assertEquals( "Expected number of results returned was incorrect", 0, map.size() );
++ assertEquals( 0, map.size(), "Expected number of results returned was incorrect!" );
//
list = sysRoot.search( "", "(ou=*es*)", controls );
@@@ -351,7 -351,7 +351,7 @@@
list.close();
-- assertEquals( "Expected number of results returned was incorrect", 8, map.size() );
++ assertEquals( 8, map.size(), "Expected number of results returned was incorrect!" );
assertTrue( map.containsKey( "ou=testing00,ou=system" ) );
assertTrue( map.containsKey( "ou=testing01,ou=system" ) );
@@@ -434,7 -434,7 +434,7 @@@
list.close();
-- assertEquals( "Expected number of results returned was incorrect!", 2, map.size() );
++ assertEquals( 2, map.size(), "Expected number of results returned was incorrect!" );
assertTrue( map.containsKey( "ou=testing00,ou=system" ) );
assertTrue( map.containsKey( "ou=testing01,ou=system" ) );
}
@@@ -460,8 -460,8 +460,8 @@@
list.close();
-- assertEquals( "size of results", 1, map.size() );
-- assertTrue( "contains ou=testing00,ou=system", map.containsKey( "ou=testing00,ou=system" ) );
++ assertEquals( 1, map.size(), "size of results" );
++ assertTrue( map.containsKey( "ou=testing00,ou=system" ), "contains ou=testing00,ou=system" );
}
@@@ -485,24 -485,24 +485,20 @@@
list.close();
-- assertEquals( "size of results", 23, map.size() );
-- assertTrue( "contains ou=testing00,ou=system", map.containsKey( "ou=testing00,ou=system" ) );
-- assertTrue( "contains ou=testing01,ou=system", map.containsKey( "ou=testing01,ou=system" ) );
-- assertTrue( "contains ou=testing02,ou=system", map.containsKey( "ou=testing01,ou=system" ) );
-- assertTrue( "contains ou=configuration,ou=system", map.containsKey( "ou=configuration,ou=system" ) );
-- assertTrue( "contains ou=groups,ou=system", map.containsKey( "ou=groups,ou=system" ) );
-- assertTrue( "contains ou=interceptors,ou=configuration,ou=system", map
-- .containsKey( "ou=interceptors,ou=configuration,ou=system" ) );
-- assertTrue( "contains ou=partitions,ou=configuration,ou=system", map
-- .containsKey( "ou=partitions,ou=configuration,ou=system" ) );
-- assertTrue( "contains ou=services,ou=configuration,ou=system", map
-- .containsKey( "ou=services,ou=configuration,ou=system" ) );
-- assertTrue( "contains ou=subtest,ou=testing01,ou=system", map.containsKey( "ou=subtest,ou=testing01,ou=system" ) );
-- assertTrue( "contains ou=system", map.containsKey( "ou=system" ) );
-- assertTrue( "contains ou=users,ou=system", map.containsKey( "ou=users,ou=system" ) );
-- assertTrue( "contains uid=admin,ou=system", map.containsKey( "uid=admin,ou=system" ) );
-- assertTrue( "contains cn=administrators,ou=groups,ou=system", map
-- .containsKey( "cn=Administrators,ou=groups,ou=system" ) );
++ assertEquals( 23, map.size(), "size of results" );
++ assertTrue( map.containsKey( "ou=testing00,ou=system" ), "contains ou=testing00,ou=system" );
++ assertTrue( map.containsKey( "ou=testing01,ou=system" ), "contains ou=testing01,ou=system" );
++ assertTrue( map.containsKey( "ou=testing01,ou=system" ), "contains ou=testing02,ou=system" );
++ assertTrue( map.containsKey( "ou=configuration,ou=system" ), "contains ou=configuration,ou=system" );
++ assertTrue( map.containsKey( "ou=groups,ou=system" ), "contains ou=groups,ou=system" );
++ assertTrue( map.containsKey( "ou=interceptors,ou=configuration,ou=system" ), "contains ou=interceptors,ou=configuration,ou=system" );
++ assertTrue( map.containsKey( "ou=partitions,ou=configuration,ou=system" ), "contains ou=partitions,ou=configuration,ou=system" );
++ assertTrue( map.containsKey( "ou=services,ou=configuration,ou=system" ), "contains ou=services,ou=configuration,ou=system" );
++ assertTrue( map.containsKey( "ou=subtest,ou=testing01,ou=system" ), "contains ou=subtest,ou=testing01,ou=system" );
++ assertTrue( map.containsKey( "ou=system" ), "contains ou=system" );
++ assertTrue( map.containsKey( "ou=users,ou=system" ), "contains ou=users,ou=system" );
++ assertTrue( map.containsKey( "uid=admin,ou=system" ), "contains uid=admin,ou=system" );
++ assertTrue( map.containsKey( "cn=Administrators,ou=groups,ou=system" ), "contains cn=administrators,ou=groups,ou=system" );
}
@@@ -526,9 -526,9 +522,9 @@@
list.close();
-- assertEquals( "size of results", 2, map.size() );
-- assertTrue( "contains ou=testing00,ou=system", map.containsKey( "ou=testing00,ou=system" ) );
-- assertTrue( "contains ou=testing01,ou=system", map.containsKey( "ou=testing01,ou=system" ) );
++ assertEquals( 2, map.size(), "size of results" );
++ assertTrue( map.containsKey( "ou=testing00,ou=system" ), "contains ou=testing00,ou=system" );
++ assertTrue( map.containsKey( "ou=testing01,ou=system" ), "contains ou=testing01,ou=system" );
}
@@@ -552,13 -552,13 +548,13 @@@
list.close();
-- assertEquals( "size of results", 6, map.size() );
-- assertTrue( "contains ou=testing00,ou=system", map.containsKey( "ou=testing00,ou=system" ) );
-- assertTrue( "contains ou=testing01,ou=system", map.containsKey( "ou=testing01,ou=system" ) );
-- assertTrue( "contains ou=testing02,ou=system", map.containsKey( "ou=testing02,ou=system" ) );
-- assertTrue( "contains ou=testing03,ou=system", map.containsKey( "ou=testing03,ou=system" ) );
-- assertTrue( "contains ou=testing04,ou=system", map.containsKey( "ou=testing04,ou=system" ) );
-- assertTrue( "contains ou=testing05,ou=system", map.containsKey( "ou=testing05,ou=system" ) );
++ assertEquals( 6, map.size(), "size of results" );
++ assertTrue( map.containsKey( "ou=testing00,ou=system" ), "contains ou=testing00,ou=system" );
++ assertTrue( map.containsKey( "ou=testing01,ou=system" ), "contains ou=testing01,ou=system" );
++ assertTrue( map.containsKey( "ou=testing02,ou=system" ), "contains ou=testing02,ou=system" );
++ assertTrue( map.containsKey( "ou=testing03,ou=system" ), "contains ou=testing03,ou=system" );
++ assertTrue( map.containsKey( "ou=testing04,ou=system" ), "contains ou=testing04,ou=system" );
++ assertTrue( map.containsKey( "ou=testing05,ou=system" ), "contains ou=testing05,ou=system" );
}
@@@ -587,13 -587,13 +583,13 @@@
list.close();
-- assertEquals( "size of results", 6, map.size() );
-- assertTrue( "contains ou=testing00,ou=system", map.containsKey( "ou=testing00,ou=system" ) );
-- assertTrue( "contains ou=testing01,ou=system", map.containsKey( "ou=testing01,ou=system" ) );
-- assertTrue( "contains ou=testing02,ou=system", map.containsKey( "ou=testing02,ou=system" ) );
-- assertTrue( "contains ou=testing03,ou=system", map.containsKey( "ou=testing03,ou=system" ) );
-- assertTrue( "contains ou=testing04,ou=system", map.containsKey( "ou=testing04,ou=system" ) );
-- assertTrue( "contains ou=testing05,ou=system", map.containsKey( "ou=testing05,ou=system" ) );
++ assertEquals( 6, map.size(), "size of results" );
++ assertTrue( map.containsKey( "ou=testing00,ou=system" ), "contains ou=testing00,ou=system" );
++ assertTrue( map.containsKey( "ou=testing01,ou=system" ), "contains ou=testing01,ou=system" );
++ assertTrue( map.containsKey( "ou=testing02,ou=system" ), "contains ou=testing02,ou=system" );
++ assertTrue( map.containsKey( "ou=testing03,ou=system" ), "contains ou=testing03,ou=system" );
++ assertTrue( map.containsKey( "ou=testing04,ou=system" ), "contains ou=testing04,ou=system" );
++ assertTrue( map.containsKey( "ou=testing05,ou=system" ), "contains ou=testing05,ou=system" );
}
@@@ -619,11 -619,11 +615,11 @@@
list.close();
-- assertEquals( "Expected number of results returned was incorrect!", 1, map.size() );
++ assertEquals( 1, map.size(), "Expected number of results returned was incorrect!" );
assertTrue( map.containsKey( "ou=testing00,ou=system" ) );
Attributes attrs = map.get( "ou=testing00,ou=system" );
-- assertEquals( "normalized creator's name", "0.9.2342.19200300.100.1.1= admin ,2.5.4.11= system ", attrs.get(
-- "creatorsName" ).get() );
++ assertEquals( "0.9.2342.19200300.100.1.1= admin ,2.5.4.11= system ", attrs.get(
++ "creatorsName" ).get(), "normalized creator's name" );
}
@@@ -650,10 -650,10 +646,10 @@@
list.close();
-- assertEquals( "Expected number of results returned was incorrect!", 1, map.size() );
++ assertEquals( 1, map.size(), "Expected number of results returned was incorrect!" );
assertTrue( map.containsKey( "ou=testing00,ou=system" ) );
Attributes attrs = map.get( "ou=testing00,ou=system" );
-- assertEquals( "normalized creator's name", "uid=admin,ou=system", attrs.get( "creatorsName" ).get() );
++ assertEquals( "uid=admin,ou=system", attrs.get( "creatorsName" ).get(), "normalized creator's name" );
}
@@@ -734,7 -734,7 +730,7 @@@
list.close();
-- assertEquals( "Expected number of results returned was incorrect!", 1, map.size() );
++ assertEquals( 1, map.size(), "Expected number of results returned was incorrect!" );
Attributes attrs = map.get( "ou=testing01,ou=system" );
@@@ -767,7 -767,7 +763,7 @@@
list.close();
-- assertEquals( "Expected number of results returned was incorrect!", 1, map.size() );
++ assertEquals( 1, map.size(), "Expected number of results returned was incorrect!" );
Attributes attrs = map.get( "ou=testing01,ou=system" );
@@@ -800,7 -800,7 +796,7 @@@
list.close();
-- assertEquals( "Expected number of results returned was incorrect!", 1, map.size() );
++ assertEquals( 1, map.size(), "Expected number of results returned was incorrect!" );
Attributes attrs = map.get( "ou=testing01,ou=system" );
@@@ -833,7 -833,7 +829,7 @@@
list.close();
-- assertEquals( "Expected number of results returned was incorrect!", 1, map.size() );
++ assertEquals( 1, map.size(), "Expected number of results returned was incorrect!" );
Attributes attrs = map.get( "ou=testing01,ou=system" );
@@@ -866,7 -866,7 +862,7 @@@
list.close();
-- assertEquals( "Expected number of results returned was incorrect!", 1, map.size() );
++ assertEquals( 1, map.size(), "Expected number of results returned was incorrect!" );
Attributes attrs = map.get( "ou=testing01,ou=system" );
@@@ -899,7 -899,7 +895,7 @@@
list.close();
-- assertEquals( "Expected number of results returned was incorrect!", 1, map.size() );
++ assertEquals( 1, map.size(), "Expected number of results returned was incorrect!" );
Attributes attrs = map.get( "ou=testing01,ou=system" );
@@@ -915,7 -915,7 +911,7 @@@
* @throws NamingException if there are errors
*/
@Test
-- @Ignore("We don't support options")
++ @Disabled("We don't support options")
public void testSearchFetchNonExistingAttributeOption() throws Exception
{
SearchControls ctls = new SearchControls();
@@@ -1319,7 -1319,7 +1315,7 @@@
list.close();
-- assertEquals( "Expected number of results returned was incorrect!", 1, map.size() );
++ assertEquals( 1, map.size(), "Expected number of results returned was incorrect!" );
Attributes attrs = map.get( "cn=Sid Vicious,ou=system" );
@@@ -1371,7 -1371,7 +1367,7 @@@
list.close();
-- assertEquals( "Expected number of results returned was incorrect!", 1, map.size() );
++ assertEquals( 1, map.size(), "Expected number of results returned was incorrect!" );
Attributes attrs = map.get( "cn=Sid Vicious,ou=system" );
@@@ -1573,7 -1573,7 +1569,7 @@@
list.close();
-- assertEquals( "Expected number of results returned was incorrect!", 2, map.size() );
++ assertEquals( 2, map.size(), "Expected number of results returned was incorrect!" );
assertTrue( map.containsKey( "cn=Heather Nova, ou=system" ) || map.containsKey( "cn=Heather Nova,ou=system" ) );
}
@@@ -1599,7 -1599,7 +1595,7 @@@
list.close();
-- assertEquals( "Expected number of results returned was incorrect", 1, map.size() );
++ assertEquals( 1, map.size(), "Expected number of results returned was incorrect!" );
assertTrue( map.containsKey( "cn=with-dn, ou=system" ) || map.containsKey( "cn=with-dn,ou=system" ) );
}
@@@ -1631,7 -1631,7 +1627,7 @@@
list.close();
-- assertEquals( "size of results", 5, map.size() );
++ assertEquals( 5, map.size(), "size of results" );
assertTrue( map.containsKey( "cn=testGroup0,ou=groups,ou=system" ) );
assertTrue( map.containsKey( "cn=testGroup1,ou=groups,ou=system" ) );
assertTrue( map.containsKey( "cn=testGroup2,ou=groups,ou=system" ) );
@@@ -1668,7 -1668,7 +1664,7 @@@
list.close();
-- assertEquals( "Expected number of results returned was incorrect!", 1, map.size() );
++ assertEquals( 1, map.size(), "Expected number of results returned was incorrect!" );
Attributes attrs = map.get( "ou=testing01,ou=system" );
@@@ -1703,7 -1703,7 +1699,7 @@@
list.close();
-- assertEquals( "Expected number of results returned was incorrect!", 1, map.size() );
++ assertEquals( 1, map.size(), "Expected number of results returned was incorrect!" );
Attributes attrs = map.get( "ou=testing01,ou=system" );
@@@ -1740,7 -1740,7 +1736,7 @@@
list.close();
-- assertEquals( "Expected number of results returned was incorrect!", 1, map.size() );
++ assertEquals( 1, map.size(), "Expected number of results returned was incorrect!" );
Attributes attrs = map.get( "ou=testing01,ou=system" );
@@@ -2007,7 -2007,7 +2003,7 @@@
list.close();
-- assertEquals( "Expected number of results returned was incorrect!", 1, map.size() );
++ assertEquals( 1, map.size(), "Expected number of results returned was incorrect!" );
assertTrue( map.containsKey( "ou=testing01,ou=system" ) );
}
@@@ -2032,7 -2032,7 +2028,7 @@@
list.close();
-- assertEquals( "Expected number of results returned was incorrect!", 0, map.size() );
++ assertEquals( 0, map.size(), "Expected number of results returned was incorrect!" );
}
@@@ -2169,7 -2169,7 +2165,7 @@@
list.close();
-- assertEquals( "Expected number of results returned was incorrect!", 1, map.size() );
++ assertEquals( 1, map.size(), "Expected number of results returned was incorrect!" );
Attributes attrs = map.get( "ou=testing01,ou=system" );
diff --cc core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchMavibotPerfIT.java
index efcf225,efcf225..44b24e2
--- a/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchMavibotPerfIT.java
+++ b/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchMavibotPerfIT.java
@@@ -38,12 -38,12 +38,12 @@@ import org.apache.directory.server.core
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.directory.server.core.integ.IntegrationUtils;
import org.apache.directory.server.core.partition.impl.btree.mavibot.MavibotIndex;
import org.apache.directory.server.core.partition.impl.btree.mavibot.MavibotPartition;
--import org.junit.Test;
--import org.junit.runner.RunWith;
++import org.junit.jupiter.api.Test;
++import org.junit.jupiter.api.extension.ExtendWith;
/**
@@@ -51,7 -51,7 +51,7 @@@
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
--@RunWith(FrameworkRunner.class)
++@ExtendWith( { ApacheDSTestExtension.class } )
@CreateDS(
name = "SearchPerfDS",
partitions =
diff --cc core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchPerfIT.java
index 5b45fa7,5b45fa7..a0bf91b
--- a/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchPerfIT.java
+++ b/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchPerfIT.java
@@@ -20,7 -20,7 +20,7 @@@
package org.apache.directory.server.core.operations.search;
--import static org.junit.Assert.assertEquals;
++import static org.junit.jupiter.api.Assertions.assertEquals;
import java.util.Random;
@@@ -42,10 -42,10 +42,10 @@@ import org.apache.directory.server.core
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.directory.server.core.integ.IntegrationUtils;
--import org.junit.Test;
--import org.junit.runner.RunWith;
++import org.junit.jupiter.api.Test;
++import org.junit.jupiter.api.extension.ExtendWith;
/**
@@@ -53,7 -53,7 +53,7 @@@
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
--@RunWith(FrameworkRunner.class)
++@ExtendWith( { ApacheDSTestExtension.class } )
@CreateDS(
name = "SearchPerfDS",
partitions =
diff --cc core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchWithAddDelete.java
index 5657849,5657849..9014104
--- a/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchWithAddDelete.java
+++ b/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchWithAddDelete.java
@@@ -20,8 -20,8 +20,8 @@@
package org.apache.directory.server.core.operations.search;
--import static org.junit.Assert.assertTrue;
--import static org.junit.Assert.assertEquals;
++import static org.junit.jupiter.api.Assertions.assertTrue;
++import static org.junit.jupiter.api.Assertions.assertEquals;
import org.apache.directory.api.ldap.model.cursor.SearchCursor;
import org.apache.directory.api.ldap.model.entry.DefaultEntry;
@@@ -37,10 -37,10 +37,10 @@@ import org.apache.directory.server.core
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.directory.server.core.integ.IntegrationUtils;
--import org.junit.Test;
--import org.junit.runner.RunWith;
++import org.junit.jupiter.api.Test;
++import org.junit.jupiter.api.extension.ExtendWith;
/**
@@@ -48,7 -48,7 +48,7 @@@
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
--@RunWith(FrameworkRunner.class)
++@ExtendWith( { ApacheDSTestExtension.class } )
@CreateDS(
name = "SearchAddDS",
partitions =
@@@ -71,8 -71,8 +71,7 @@@
@CreateIndex(attribute = "displayName", cacheSize = 2000)
})
-- },
-- enableChangeLog = false)
++ })
public class SearchWithAddDelete extends AbstractLdapTestUnit
{
@Test
diff --cc core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchWithIndexedMVAttributeIT.java
index 88af64a,88af64a..83517d1
--- a/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchWithIndexedMVAttributeIT.java
+++ b/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchWithIndexedMVAttributeIT.java
@@@ -20,7 -20,7 +20,7 @@@
package org.apache.directory.server.core.operations.search;
--import static org.junit.Assert.assertEquals;
++import static org.junit.jupiter.api.Assertions.assertEquals;
import org.apache.directory.api.ldap.model.cursor.EntryCursor;
import org.apache.directory.api.ldap.model.entry.DefaultEntry;
@@@ -34,11 -34,11 +34,11 @@@ import org.apache.directory.server.core
import org.apache.directory.server.core.factory.DefaultDirectoryServiceFactory;
import org.apache.directory.server.core.factory.DirectoryServiceFactory;
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.directory.server.core.integ.IntegrationUtils;
--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;
/**
@@@ -46,14 -46,14 +46,14 @@@
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
--@RunWith(FrameworkRunner.class)
++@ExtendWith( { ApacheDSTestExtension.class } )
@CreateDS(name = "SearchMVWithIndicesIT")
public class SearchWithIndexedMVAttributeIT extends AbstractLdapTestUnit
{
private static LdapConnection connection;
-- @Before
++ @BeforeEach
public void createData() throws Exception
{
connection = IntegrationUtils.getAdminConnection( getService() );
diff --cc core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchWithIndicesIT.java
index ce149f5,ce149f5..ff8629c
--- a/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchWithIndicesIT.java
+++ b/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchWithIndicesIT.java
@@@ -20,10 -20,10 +20,10 @@@
package org.apache.directory.server.core.operations.search;
--import static org.junit.Assert.assertFalse;
--import static org.junit.Assert.assertEquals;
--import static org.junit.Assert.assertTrue;
--import static org.junit.Assert.fail;
++import static org.junit.jupiter.api.Assertions.assertFalse;
++import static org.junit.jupiter.api.Assertions.assertEquals;
++import static org.junit.jupiter.api.Assertions.assertTrue;
++import static org.junit.jupiter.api.Assertions.fail;
import java.util.HashSet;
import java.util.Set;
@@@ -41,11 -41,11 +41,11 @@@ import org.apache.directory.server.core
import org.apache.directory.server.core.factory.DefaultDirectoryServiceFactory;
import org.apache.directory.server.core.factory.DirectoryServiceFactory;
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.directory.server.core.integ.IntegrationUtils;
--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;
/**
@@@ -53,14 -53,14 +53,14 @@@
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
--@RunWith(FrameworkRunner.class)
++@ExtendWith( { ApacheDSTestExtension.class } )
@CreateDS( name = "SearchWithIndicesIT" )
public class SearchWithIndicesIT extends AbstractLdapTestUnit
{
private static LdapConnection connection;
public static final String TEST_INT_OID = "1.1.1.1.1.1";
-- @Before
++ @BeforeEach
public void createData() throws Exception
{
// -------------------------------------------------------------------
diff --cc core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchWithIndicesPersonIT.java
index 9d8d0ff,9d8d0ff..ffe9181
--- a/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchWithIndicesPersonIT.java
+++ b/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchWithIndicesPersonIT.java
@@@ -34,13 -34,13 +34,13 @@@ import org.apache.directory.server.core
import org.apache.directory.server.core.factory.DefaultDirectoryServiceFactory;
import org.apache.directory.server.core.factory.DirectoryServiceFactory;
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.directory.server.core.integ.IntegrationUtils;
--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 static org.junit.Assert.assertTrue;
++import static org.junit.jupiter.api.Assertions.assertTrue;
/**
@@@ -48,13 -48,13 +48,13 @@@
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
--@RunWith(FrameworkRunner.class)
++@ExtendWith( { ApacheDSTestExtension.class } )
@CreateDS( name = "SearchWithIndicesIT", enableChangeLog = false )
public class SearchWithIndicesPersonIT extends AbstractLdapTestUnit
{
private static LdapConnection connection;
-- @Before
++ @BeforeEach
public void createData() throws Exception
{
connection = IntegrationUtils.getAdminConnection( getService() );
diff --cc core-integ/src/test/java/org/apache/directory/server/core/operations/search/SortedSearchIT.java
index 66f4ab7,66f4ab7..f3201f1
--- a/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SortedSearchIT.java
+++ b/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SortedSearchIT.java
@@@ -20,10 -20,10 +20,10 @@@
package org.apache.directory.server.core.operations.search;
--import static org.junit.Assert.assertEquals;
--import static org.junit.Assert.assertFalse;
--import static org.junit.Assert.assertNotNull;
--import static org.junit.Assert.assertNull;
++import static org.junit.jupiter.api.Assertions.assertEquals;
++import static org.junit.jupiter.api.Assertions.assertFalse;
++import static org.junit.jupiter.api.Assertions.assertNotNull;
++import static org.junit.jupiter.api.Assertions.assertNull;
import java.util.ArrayList;
import java.util.List;
@@@ -50,12 -50,12 +50,12 @@@ import org.apache.directory.server.core
import org.apache.directory.server.core.annotations.CreateDS;
import org.apache.directory.server.core.annotations.LoadSchema;
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.directory.server.core.integ.IntegrationUtils;
--import org.junit.AfterClass;
--import org.junit.Before;
--import org.junit.Test;
--import org.junit.runner.RunWith;
++import org.junit.jupiter.api.AfterAll;
++import org.junit.jupiter.api.BeforeEach;
++import org.junit.jupiter.api.Test;
++import org.junit.jupiter.api.extension.ExtendWith;
/**
@@@ -63,7 -63,7 +63,7 @@@
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
--@RunWith(FrameworkRunner.class)
++@ExtendWith( { ApacheDSTestExtension.class } )
@CreateDS(name = "SearchDS",
loadedSchemas =
{ @LoadSchema(name = "nis", enabled = true) })
@@@ -85,7 -85,7 +85,7 @@@ public class SortedSearchIT extends Abs
private SortRequest ctrl;
-- @Before
++ @BeforeEach
public void createConnection() throws Exception
{
connection = IntegrationUtils.getAdminConnection( getService() );
@@@ -110,7 -110,7 +110,7 @@@
}
-- @AfterClass
++ @AfterAll
public static void closeConnection() throws Exception
{
connection.close();
diff --cc core-integ/src/test/java/org/apache/directory/server/core/partition/PartitionIT.java
index a796bdf,a796bdf..665f520
--- a/core-integ/src/test/java/org/apache/directory/server/core/partition/PartitionIT.java
+++ b/core-integ/src/test/java/org/apache/directory/server/core/partition/PartitionIT.java
@@@ -21,9 -21,9 +21,9 @@@ package org.apache.directory.server.cor
import static org.apache.directory.server.core.integ.IntegrationUtils.getRootContext;
--import static org.junit.Assert.assertNotNull;
--import static org.junit.Assert.assertTrue;
--import static org.junit.Assert.fail;
++import static org.junit.jupiter.api.Assertions.assertNotNull;
++import static org.junit.jupiter.api.Assertions.assertTrue;
++import static org.junit.jupiter.api.Assertions.fail;
import java.util.HashMap;
@@@ -38,9 -38,9 +38,9 @@@ import org.apache.directory.server.core
import org.apache.directory.server.core.annotations.CreatePartition;
import org.apache.directory.server.core.api.partition.Partition;
import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
--import org.apache.directory.server.core.integ.FrameworkRunner;
--import org.junit.Test;
--import org.junit.runner.RunWith;
++import org.apache.directory.server.core.integ.ApacheDSTestExtension;
++import org.junit.jupiter.api.Test;
++import org.junit.jupiter.api.extension.ExtendWith;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@@ -50,7 -50,7 +50,7 @@@
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
--@RunWith(FrameworkRunner.class)
++@ExtendWith( ApacheDSTestExtension.class )
/*
* Creates a DirectoryService configured with two separate dc=com based
* domains to test multiple partitions.
diff --cc core-integ/src/test/java/org/apache/directory/server/core/schema/MetaAttributeTypeHandlerIT.java
index 908232f,908232f..3c2d9e6
--- a/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaAttributeTypeHandlerIT.java
+++ b/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaAttributeTypeHandlerIT.java
@@@ -20,10 -20,10 +20,10 @@@
package org.apache.directory.server.core.schema;
--import static org.junit.Assert.assertEquals;
--import static org.junit.Assert.assertFalse;
--import static org.junit.Assert.assertTrue;
--import static org.junit.Assert.fail;
++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 static org.junit.jupiter.api.Assertions.fail;
import org.apache.directory.api.ldap.model.constants.SchemaConstants;
import org.apache.directory.api.ldap.model.entry.Attribute;
@@@ -43,12 -43,12 +43,12 @@@ import org.apache.directory.api.ldap.mo
import org.apache.directory.api.ldap.model.schema.SchemaManager;
import org.apache.directory.ldap.client.api.LdapConnection;
import org.apache.directory.server.core.annotations.CreateDS;
--import org.apache.directory.server.core.integ.FrameworkRunner;
++import org.apache.directory.server.core.integ.ApacheDSTestExtension;
import org.apache.directory.server.core.integ.IntegrationUtils;
--import org.junit.Before;
--import org.junit.Ignore;
--import org.junit.Test;
--import org.junit.runner.RunWith;
++import org.junit.jupiter.api.BeforeEach;
++import org.junit.jupiter.api.Disabled;
++import org.junit.jupiter.api.Test;
++import org.junit.jupiter.api.extension.ExtendWith;
/**
@@@ -57,7 -57,7 +57,7 @@@
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
--@RunWith(FrameworkRunner.class)
++@ExtendWith( ApacheDSTestExtension.class )
@CreateDS(name = "MetaAttributeTypeHandlerIT")
public class MetaAttributeTypeHandlerIT extends AbstractMetaSchemaObjectHandler
{
@@@ -72,7 -72,7 +72,7 @@@
private SchemaManager schemaManager;
-- @Before
++ @BeforeEach
public void init() throws Exception
{
super.init();
@@@ -176,8 -176,8 +176,8 @@@
// Expected result.
}
-- assertFalse( "adding new attributeType to disabled schema should not register it into the registries",
-- schemaManager.getAttributeTypeRegistry().contains( OID ) );
++ assertFalse( schemaManager.getAttributeTypeRegistry().contains( OID ),
++ "adding new attributeType to disabled schema should not register it into the registries" );
// The added entry must not be present on disk
assertFalse( isOnDisk( dn ) );
@@@ -202,8 -202,8 +202,8 @@@
connection.add( entry );
-- assertFalse( "adding new attributeType to disabled schema should not register it into the registries",
-- schemaManager.getAttributeTypeRegistry().contains( OID ) );
++ assertFalse( schemaManager.getAttributeTypeRegistry().contains( OID ),
++ "adding new attributeType to disabled schema should not register it into the registries" );
// The GlobalOidRegistries must not contain the AT
assertFalse( schemaManager.getGlobalOidRegistry().contains( OID ) );
@@@ -261,8 -261,8 +261,8 @@@
Dn dn = new Dn( "m-oid=" + OID + ",ou=attributeTypes,cn=apachemeta,ou=schema" );
// Check in Registries
-- assertTrue( "attributeType should be removed from the registry after being deleted",
-- schemaManager.getAttributeTypeRegistry().contains( OID ) );
++ assertTrue( schemaManager.getAttributeTypeRegistry().contains( OID ),
++ "attributeType should be removed from the registry after being deleted" );
// Check on disk that the added SchemaObject exist
assertTrue( isOnDisk( dn ) );
@@@ -270,8 -270,8 +270,8 @@@
connection.delete( dn );
// Check in Registries
-- assertFalse( "attributeType should be removed from the registry after being deleted",
-- schemaManager.getAttributeTypeRegistry().contains( OID ) );
++ assertFalse( schemaManager.getAttributeTypeRegistry().contains( OID ),
++ "attributeType should be removed from the registry after being deleted" );
// Check on disk that the deleted SchemaObject does not exist anymore
assertFalse( isOnDisk( dn ) );
@@@ -292,8 -292,8 +292,8 @@@
Dn dn = new Dn( "m-oid=" + OID + ",ou=attributeTypes,cn=nis,ou=schema" );
// Check in Registries
-- assertFalse( "attributeType should be removed from the registry after being deleted",
-- schemaManager.getAttributeTypeRegistry().contains( OID ) );
++ assertFalse( schemaManager.getAttributeTypeRegistry().contains( OID ),
++ "attributeType should be removed from the registry after being deleted" );
// Check on disk that the added SchemaObject exists
assertTrue( isOnDisk( dn ) );
@@@ -302,8 -302,8 +302,8 @@@
connection.delete( dn );
// Check in Registries
-- assertFalse( "attributeType should be removed from the registry after being deleted",
-- schemaManager.getAttributeTypeRegistry().contains( OID ) );
++ assertFalse( schemaManager.getAttributeTypeRegistry().contains( OID ),
++ "attributeType should be removed from the registry after being deleted" );
assertFalse( schemaManager.getGlobalOidRegistry().contains( OID ) );
// Check on disk that the deleted SchemaObject does not exist anymore
@@@ -328,8 -328,8 +328,8 @@@
{
}
-- assertTrue( "attributeType should still be in the registry after delete failure",
-- schemaManager.getAttributeTypeRegistry().contains( OID ) );
++ assertTrue( schemaManager.getAttributeTypeRegistry().contains( OID ),
++ "attributeType should still be in the registry after delete failure" );
}
@@@ -337,7 -337,7 +337,7 @@@
// Test Modify operation
// ----------------------------------------------------------------------
@Test
-- @Ignore
++ @Disabled
public void testModifyAttributeTypeWithModificationItems() throws Exception
{
testAddAttributeTypeToEnabledSchema();
@@@ -355,8 -355,8 +355,8 @@@
connection.modify( dn, mod1, mod2 );
-- assertTrue( "attributeType OID should still be present",
-- schemaManager.getAttributeTypeRegistry().contains( OID ) );
++ assertTrue( schemaManager.getAttributeTypeRegistry().contains( OID ),
++ "attributeType OID should still be present" );
assertEquals( "attributeType schema should be set to apachemeta", "apachemeta",
schemaManager.getAttributeTypeRegistry().getSchemaName( OID ) );
@@@ -368,7 -368,7 +368,7 @@@
@Test
-- @Ignore
++ @Disabled
public void testModifyAttributeTypeWithAttributes() throws Exception
{
testAddAttributeTypeToEnabledSchema();
@@@ -387,8 -387,8 +387,8 @@@
connection.modify( dn, mod1, mod2 );
-- assertTrue( "attributeType OID should still be present",
-- schemaManager.getAttributeTypeRegistry().contains( OID ) );
++ assertTrue( schemaManager.getAttributeTypeRegistry().contains( OID ),
++ "attributeType OID should still be present" );
assertEquals( "attributeType schema should be set to apachemeta", "apachemeta",
schemaManager.getAttributeTypeRegistry().getSchemaName( OID ) );
@@@ -403,7 -403,7 +403,7 @@@
// Test Rename operation
// ----------------------------------------------------------------------
@Test
-- @Ignore
++ @Disabled
public void testRenameAttributeType() throws Exception
{
testAddAttributeTypeToEnabledSchema();
@@@ -414,8 -414,8 +414,8 @@@
connection.rename( dn, rdn );
-- assertFalse( "old attributeType OID should be removed from the registry after being renamed",
-- schemaManager.getAttributeTypeRegistry().contains( OID ) );
++ assertFalse( schemaManager.getAttributeTypeRegistry().contains( OID ),
++ "old attributeType OID should be removed from the registry after being renamed" );
schemaManager.lookupAttributeTypeRegistry( OID );
fail( "attributeType lookup should fail after renaming the attributeType" );
@@@ -425,7 -425,7 +425,7 @@@
@Test
-- @Ignore
++ @Disabled
public void testRenameAttributeTypeWhenInUse() throws Exception
{
testAddAttributeTypeToEnabledSchema();
@@@ -445,8 -445,8 +445,8 @@@
assertEquals( ResultCodeEnum.UNWILLING_TO_PERFORM, e.getResultCode() );
}
-- assertTrue( "attributeType should still be in the registry after rename failure",
-- schemaManager.getAttributeTypeRegistry().contains( OID ) );
++ assertTrue( schemaManager.getAttributeTypeRegistry().contains( OID ),
++ "attributeType should still be in the registry after rename failure" );
}
@@@ -454,7 -454,7 +454,7 @@@
// Test Move operation
// ----------------------------------------------------------------------
@Test
-- @Ignore
++ @Disabled
public void testMoveAttributeType() throws Exception
{
testAddAttributeTypeToEnabledSchema();
@@@ -465,8 -465,8 +465,7 @@@
connection.move( dn, newDn );
-- assertTrue( "attributeType OID should still be present",
-- schemaManager.getAttributeTypeRegistry().contains( OID ) );
++ assertTrue( schemaManager.getAttributeTypeRegistry().contains( OID ), "attributeType OID should still be present" );
assertEquals( "attributeType schema should be set to apache not apachemeta", "apachemeta",
schemaManager.getAttributeTypeRegistry().getSchemaName( OID ) );
@@@ -474,7 -474,7 +473,7 @@@
@Test
-- @Ignore
++ @Disabled
public void testMoveAttributeTypeAndChangeRdn() throws Exception
{
testAddAttributeTypeToEnabledSchema();
@@@ -485,11 -485,11 +484,9 @@@
connection.move( dn, newDn );
-- assertFalse( "old attributeType OID should NOT be present",
-- schemaManager.getAttributeTypeRegistry().contains( OID ) );
++ assertFalse( schemaManager.getAttributeTypeRegistry().contains( OID ), "old attributeType OID should NOT be present" );
-- assertTrue( "new attributeType OID should be present",
-- schemaManager.getAttributeTypeRegistry().contains( NEW_OID ) );
++ assertTrue( schemaManager.getAttributeTypeRegistry().contains( NEW_OID ), "new attributeType OID should be present" );
assertEquals( "attributeType with new oid should have schema set to apache NOT apachemeta", "apachemeta",
schemaManager.getAttributeTypeRegistry().getSchemaName( NEW_OID ) );
@@@ -497,7 -497,7 +494,7 @@@
@Test
-- @Ignore
++ @Disabled
public void testMoveAttributeTypeToTop() throws Exception
{
testAddAttributeTypeToEnabledSchema();
@@@ -517,13 -517,13 +514,13 @@@
assertEquals( ResultCodeEnum.NAMING_VIOLATION, e.getResultCode() );
}
-- assertTrue( "attributeType should still be in the registry after move failure",
-- schemaManager.getAttributeTypeRegistry().contains( OID ) );
++ assertTrue( schemaManager.getAttributeTypeRegistry().contains( OID ),
++ "attributeType should still be in the registry after move failure" );
}
@Test
-- @Ignore
++ @Disabled
public void testMoveAttributeTypeToComparatorContainer() throws Exception
{
testAddAttributeTypeToEnabledSchema();
@@@ -542,13 -542,13 +539,13 @@@
assertEquals( ResultCodeEnum.NAMING_VIOLATION, e.getResultCode() );
}
-- assertTrue( "attributeType should still be in the registry after move failure",
-- schemaManager.getAttributeTypeRegistry().contains( OID ) );
++ assertTrue( schemaManager.getAttributeTypeRegistry().contains( OID ),
++ "attributeType should still be in the registry after move failure" );
}
@Test
-- @Ignore
++ @Disabled
public void testMoveAttributeTypeToDisabledSchema() throws Exception
{
testAddAttributeTypeToEnabledSchema();
@@@ -560,13 -560,13 +557,13 @@@
connection.move( dn, newDn );
-- assertFalse( "attributeType OID should no longer be present",
-- schemaManager.getAttributeTypeRegistry().contains( OID ) );
++ assertFalse( schemaManager.getAttributeTypeRegistry().contains( OID ),
++ "attributeType OID should no longer be present" );
}
@Test
-- @Ignore
++ @Disabled
public void testMoveAttributeTypeWhenInUse() throws Exception
{
testAddAttributeTypeToEnabledSchema();
@@@ -586,13 -586,13 +583,13 @@@
assertEquals( ResultCodeEnum.UNWILLING_TO_PERFORM, e.getResultCode() );
}
-- assertTrue( "attributeType should still be in the registry after move failure",
-- schemaManager.getAttributeTypeRegistry().contains( OID ) );
++ assertTrue( schemaManager.getAttributeTypeRegistry().contains( OID ),
++ "attributeType should still be in the registry after move failure" );
}
@Test
-- @Ignore
++ @Disabled
public void testMoveAttributeTypeAndChangeRdnWhenInUse() throws Exception
{
testAddAttributeTypeToEnabledSchema();
@@@ -612,8 -612,8 +609,8 @@@
assertEquals( ResultCodeEnum.UNWILLING_TO_PERFORM, e.getResultCode() );
}
-- assertTrue( "attributeType should still be in the registry after move failure",
-- schemaManager.getAttributeTypeRegistry().contains( OID ) );
++ assertTrue( schemaManager.getAttributeTypeRegistry().contains( OID ),
++ "attributeType should still be in the registry after move failure" );
}
@@@ -647,7 -647,7 +644,7 @@@
// ----------------------------------------------------------------------
/*
@Test
-- @Ignore
++ @Disabled
public void testMoveMatchingRuleToEnabledSchema() throws Exception
{
testAddAttributeTypeToDisabledSchema();
diff --cc core-integ/src/test/java/org/apache/directory/server/core/schema/MetaComparatorHandlerIT.java
index 62d0aac,62d0aac..24c5087
--- a/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaComparatorHandlerIT.java
+++ b/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaComparatorHandlerIT.java
@@@ -20,10 -20,10 +20,10 @@@
package org.apache.directory.server.core.schema;
--import static org.junit.Assert.assertEquals;
--import static org.junit.Assert.assertFalse;
--import static org.junit.Assert.assertTrue;
--import static org.junit.Assert.fail;
++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 static org.junit.jupiter.api.Assertions.fail;
import java.io.ByteArrayOutputStream;
import java.io.InputStream;
@@@ -45,12 -45,12 +45,12 @@@ import org.apache.directory.api.ldap.mo
import org.apache.directory.api.ldap.model.schema.comparators.StringComparator;
import org.apache.directory.ldap.client.api.LdapConnection;
import org.apache.directory.server.core.annotations.CreateDS;
--import org.apache.directory.server.core.integ.FrameworkRunner;
++import org.apache.directory.server.core.integ.ApacheDSTestExtension;
import org.apache.directory.server.core.integ.IntegrationUtils;
--import org.junit.Before;
--import org.junit.Ignore;
--import org.junit.Test;
--import org.junit.runner.RunWith;
++import org.junit.jupiter.api.BeforeEach;
++import org.junit.jupiter.api.Disabled;
++import org.junit.jupiter.api.Test;
++import org.junit.jupiter.api.extension.ExtendWith;
/**
@@@ -59,7 -59,7 +59,7 @@@
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
--@RunWith(FrameworkRunner.class)
++@ExtendWith( ApacheDSTestExtension.class )
@CreateDS(name = "MetaComparatorHandlerIT")
public class MetaComparatorHandlerIT extends AbstractMetaSchemaObjectHandler
{
@@@ -79,7 -79,7 +79,7 @@@
}
-- @Before
++ @BeforeEach
public void init() throws Exception
{
super.init();
@@@ -145,8 -145,8 +145,8 @@@
connection.add( entry );
// Post-checks
-- assertFalse( "adding new comparator to disabled schema should not register it into the registries",
-- schemaManager.getComparatorRegistry().contains( OID ) );
++ assertFalse( schemaManager.getComparatorRegistry().contains( OID ) ,
++ "adding new comparator to disabled schema should not register it into the registries" );
assertTrue( isOnDisk( dn ) );
}
@@@ -181,8 -181,8 +181,8 @@@
}
// Post-checks
-- assertFalse( "adding new comparator to disabled schema should not register it into the registries",
-- schemaManager.getComparatorRegistry().contains( OID ) );
++ assertFalse( schemaManager.getComparatorRegistry().contains( OID ) ,
++ "adding new comparator to disabled schema should not register it into the registries" );
assertFalse( isOnDisk( dn ) );
}
@@@ -262,8 -262,8 +262,8 @@@
connection.add( entry );
// Post-checks
-- assertFalse( "adding new comparator to disabled schema should not register it into the registries",
-- schemaManager.getComparatorRegistry().contains( OID ) );
++ assertFalse( schemaManager.getComparatorRegistry().contains( OID ) ,
++ "adding new comparator to disabled schema should not register it into the registries" );
assertTrue( isOnDisk( dn ) );
}
@@@ -287,8 -287,8 +287,8 @@@
connection.delete( dn );
// Post-checks
-- assertFalse( "comparator should be removed from the registry after being deleted", schemaManager
-- .getComparatorRegistry().contains( OID ) );
++ assertFalse( schemaManager.getComparatorRegistry().contains( OID ) ,
++ "comparator should be removed from the registry after being deleted" );
try
{
@@@ -311,16 -311,16 +311,16 @@@
testAddComparatorToDisabledSchema();
// Pre-checks
-- assertFalse( "comparator should be removed from the registry after being deleted", schemaManager
-- .getComparatorRegistry().contains( OID ) );
++ assertFalse( schemaManager.getComparatorRegistry().contains( OID ) ,
++ "comparator should be removed from the registry after being deleted" );
assertTrue( isOnDisk( dn ) );
// Deletion
connection.delete( dn );
// Post-checks
-- assertFalse( "comparator should be removed from the registry after being deleted", schemaManager
-- .getComparatorRegistry().contains( OID ) );
++ assertFalse( schemaManager.getComparatorRegistry().contains( OID ) ,
++ "comparator should be removed from the registry after being deleted" );
try
{
@@@ -376,8 -376,8 +376,8 @@@
{
}
-- assertTrue( "comparator should still be in the registry after delete failure", schemaManager
-- .getComparatorRegistry().contains( OID ) );
++ assertTrue( schemaManager.getComparatorRegistry().contains( OID ) ,
++ "comparator should still be in the registry after delete failure" );
}
@@@ -385,7 -385,7 +385,7 @@@
// Test Modify operation
// ----------------------------------------------------------------------
@Test
-- @Ignore
++ @Disabled
public void testModifyComparatorWithModificationItems() throws Exception
{
testAddComparatorToEnabledSchema();
@@@ -395,7 -395,7 +395,8 @@@
connection.modify( dn, new DefaultModification(
ModificationOperation.REPLACE_ATTRIBUTE, "m-fqcn", BooleanComparator.class.getName() ) );
-- assertTrue( "comparator OID should still be present", schemaManager.getComparatorRegistry().contains( OID ) );
++ assertTrue( schemaManager.getComparatorRegistry().contains( OID ),
++ "comparator OID should still be present" );
assertEquals( "comparator schema should be set to apachemeta", "apachemeta",
schemaManager.getComparatorRegistry().getSchemaName( OID ) );
@@@ -406,7 -406,7 +407,7 @@@
@Test
-- @Ignore
++ @Disabled
public void testModifyComparatorWithAttributes() throws Exception
{
testAddComparatorToEnabledSchema();
@@@ -416,7 -416,7 +417,8 @@@
connection.modify( dn, new DefaultModification(
ModificationOperation.REPLACE_ATTRIBUTE, "m-fqcn", BooleanComparator.class.getName() ) );
-- assertTrue( "comparator OID should still be present", schemaManager.getComparatorRegistry().contains( OID ) );
++ assertTrue( schemaManager.getComparatorRegistry().contains( OID ),
++ "comparator OID should still be present" );
assertEquals( "comparator schema should be set to apachemeta", "apachemeta",
schemaManager.getComparatorRegistry().getSchemaName( OID ) );
@@@ -430,7 -430,7 +432,7 @@@
// Test Rename operation
// ----------------------------------------------------------------------
@Test
-- @Ignore
++ @Disabled
public void testRenameComparator() throws Exception
{
Dn dn = new Dn( "m-oid=" + OID + ",ou=comparators,cn=apachemeta,ou=schema" );
@@@ -441,8 -441,8 +443,8 @@@
connection.rename( dn, rdn );
-- assertFalse( "old comparator OID should be removed from the registry after being renamed", schemaManager
-- .getComparatorRegistry().contains( OID ) );
++ assertFalse( schemaManager.getComparatorRegistry().contains( OID ) ,
++ "old comparator OID should be removed from the registry after being renamed" );
try
{
@@@ -460,7 -460,7 +462,7 @@@
@Test
-- @Ignore
++ @Disabled
public void testRenameComparatorWhenInUse() throws Exception
{
Dn dn = new Dn( "m-oid=" + OID + ",ou=comparators,cn=apachemeta,ou=schema" );
@@@ -480,8 -480,8 +482,8 @@@
assertEquals( ResultCodeEnum.UNWILLING_TO_PERFORM, e.getResultCode() );
}
-- assertTrue( "comparator should still be in the registry after rename failure", schemaManager
-- .getComparatorRegistry().contains( OID ) );
++ assertTrue( schemaManager.getComparatorRegistry().contains( OID ) ,
++ "comparator should still be in the registry after rename failure" );
schemaManager.getMatchingRuleRegistry().unregister( OID );
schemaManager.getGlobalOidRegistry().unregister( OID );
}
@@@ -491,7 -491,7 +493,7 @@@
// Test Move operation
// ----------------------------------------------------------------------
@Test
-- @Ignore
++ @Disabled
public void testMoveComparator() throws Exception
{
testAddComparatorToEnabledSchema();
@@@ -502,7 -502,7 +504,8 @@@
connection.move( dn, newDn );
-- assertTrue( "comparator OID should still be present", schemaManager.getComparatorRegistry().contains( OID ) );
++ assertTrue( schemaManager.getComparatorRegistry().contains( OID ),
++ "comparator OID should still be present" );
assertEquals( "comparator schema should be set to apache not apachemeta", "apachemeta",
schemaManager.getComparatorRegistry().getSchemaName( OID ) );
@@@ -513,7 -513,7 +516,7 @@@
@Test
-- @Ignore
++ @Disabled
public void testMoveComparatorAndChangeRdn() throws Exception
{
testAddComparatorToEnabledSchema();
@@@ -524,9 -524,9 +527,11 @@@
connection.moveAndRename( dn, newDn );
-- assertFalse( "old comparator OID should NOT be present", schemaManager.getComparatorRegistry().contains( OID ) );
++ assertFalse( schemaManager.getComparatorRegistry().contains( OID ),
++ "old comparator OID should NOT be present" );
-- assertTrue( "new comparator OID should be present", schemaManager.getComparatorRegistry().contains( NEW_OID ) );
++ assertTrue( schemaManager.getComparatorRegistry().contains( NEW_OID ),
++ "new comparator OID should be present" );
assertEquals( "comparator with new oid should have schema set to apache NOT apachemeta", "apachemeta",
schemaManager.getComparatorRegistry().getSchemaName( NEW_OID ) );
@@@ -540,7 -540,7 +545,7 @@@
// Test move, rename, and delete when a MR exists and uses the Comparator
// ----------------------------------------------------------------------
@Test
-- @Ignore
++ @Disabled
public void testMoveComparatorWhenInUse() throws Exception
{
testAddComparatorToEnabledSchema();
@@@ -560,15 -560,15 +565,15 @@@
assertEquals( ResultCodeEnum.UNWILLING_TO_PERFORM, e.getResultCode() );
}
-- assertTrue( "comparator should still be in the registry after move failure", schemaManager
-- .getComparatorRegistry().contains( OID ) );
++ assertTrue( schemaManager.getComparatorRegistry().contains( OID ) ,
++ "comparator should still be in the registry after move failure" );
schemaManager.getMatchingRuleRegistry().unregister( OID );
schemaManager.getGlobalOidRegistry().unregister( OID );
}
@Test
-- @Ignore
++ @Disabled
public void testMoveComparatorAndChangeRdnWhenInUse() throws Exception
{
testAddComparatorToEnabledSchema();
@@@ -588,8 -588,8 +593,8 @@@
assertEquals( ResultCodeEnum.UNWILLING_TO_PERFORM, e.getResultCode() );
}
-- assertTrue( "comparator should still be in the registry after move failure", schemaManager
-- .getComparatorRegistry().contains( OID ) );
++ assertTrue( schemaManager.getComparatorRegistry().contains( OID ) ,
++ "comparator should still be in the registry after move failure" );
schemaManager.getMatchingRuleRegistry().unregister( OID );
schemaManager.getGlobalOidRegistry().unregister( OID );
}
@@@ -600,7 -600,7 +605,7 @@@
// ----------------------------------------------------------------------
@Test
-- @Ignore
++ @Disabled
public void testMoveComparatorToTop() throws Exception
{
testAddComparatorToEnabledSchema();
@@@ -620,13 -620,13 +625,13 @@@
assertEquals( ResultCodeEnum.NAMING_VIOLATION, e.getResultCode() );
}
-- assertTrue( "comparator should still be in the registry after move failure", schemaManager
-- .getComparatorRegistry().contains( OID ) );
++ assertTrue( schemaManager.getComparatorRegistry().contains( OID ) ,
++ "comparator should still be in the registry after move failure" );
}
@Test
-- @Ignore
++ @Disabled
public void testMoveComparatorToNormalizers() throws Exception
{
testAddComparatorToEnabledSchema();
@@@ -645,13 -645,13 +650,13 @@@
assertEquals( ResultCodeEnum.NAMING_VIOLATION, e.getResultCode() );
}
-- assertTrue( "comparator should still be in the registry after move failure", schemaManager
-- .getComparatorRegistry().contains( OID ) );
++ assertTrue( schemaManager.getComparatorRegistry().contains( OID ) ,
++ "comparator should still be in the registry after move failure" );
}
@Test
-- @Ignore
++ @Disabled
public void testMoveComparatorToDisabledSchema() throws Exception
{
testAddComparatorToEnabledSchema();
@@@ -663,12 -663,12 +668,13 @@@
connection.move( dn, newDn );
-- assertFalse( "comparator OID should no longer be present", schemaManager.getComparatorRegistry().contains( OID ) );
++ assertFalse( schemaManager.getComparatorRegistry().contains( OID ),
++ "comparator OID should no longer be present" );
}
@Test
-- @Ignore
++ @Disabled
public void testMoveComparatorToEnabledSchema() throws Exception
{
testAddComparatorToDisabledSchema();
@@@ -676,15 -676,15 +682,15 @@@
// nis is inactive by default
Dn dn = new Dn( "m-oid=" + OID + ",ou=comparators,cn=nis,ou=schema" );
-- assertFalse( "comparator OID should NOT be present when added to disabled nis schema", schemaManager
-- .getComparatorRegistry().contains( OID ) );
++ assertFalse( schemaManager.getComparatorRegistry().contains( OID ) ,
++ "comparator OID should NOT be present when added to disabled nis schema" );
Dn newDn = new Dn( "m-oid=" + OID + ",ou=comparators,cn=apachemeta,ou=schema" );
connection.move( dn, newDn );
-- assertTrue( "comparator OID should be present when moved to enabled schema", schemaManager
-- .getComparatorRegistry().contains( OID ) );
++ assertTrue( schemaManager.getComparatorRegistry().contains( OID ) ,
++ "comparator OID should be present when moved to enabled schema" );
assertEquals( "comparator should be in apachemeta schema after move", "apachemeta",
schemaManager.getComparatorRegistry().getSchemaName( OID ) );
diff --cc core-integ/src/test/java/org/apache/directory/server/core/schema/MetaMatchingRuleHandlerIT.java
index a217f8c,a217f8c..1461591
--- a/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaMatchingRuleHandlerIT.java
+++ b/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaMatchingRuleHandlerIT.java
@@@ -20,10 -20,10 +20,10 @@@
package org.apache.directory.server.core.schema;
--import static org.junit.Assert.assertEquals;
--import static org.junit.Assert.assertFalse;
--import static org.junit.Assert.assertTrue;
--import static org.junit.Assert.fail;
++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 static org.junit.jupiter.api.Assertions.fail;
import org.apache.directory.api.ldap.model.constants.SchemaConstants;
import org.apache.directory.api.ldap.model.entry.DefaultEntry;
@@@ -41,12 -41,12 +41,12 @@@ import org.apache.directory.api.ldap.mo
import org.apache.directory.api.ldap.model.schema.comparators.StringComparator;
import org.apache.directory.ldap.client.api.LdapConnection;
import org.apache.directory.server.core.annotations.CreateDS;
--import org.apache.directory.server.core.integ.FrameworkRunner;
++import org.apache.directory.server.core.integ.ApacheDSTestExtension;
import org.apache.directory.server.core.integ.IntegrationUtils;
--import org.junit.Before;
--import org.junit.Ignore;
--import org.junit.Test;
--import org.junit.runner.RunWith;
++import org.junit.jupiter.api.BeforeEach;
++import org.junit.jupiter.api.Disabled;
++import org.junit.jupiter.api.Test;
++import org.junit.jupiter.api.extension.ExtendWith;
/**
@@@ -55,7 -55,7 +55,7 @@@
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
--@RunWith(FrameworkRunner.class)
++@ExtendWith( ApacheDSTestExtension.class )
@CreateDS(name = "MetaMatchingRuleHandlerIT")
public class MetaMatchingRuleHandlerIT extends AbstractMetaSchemaObjectHandler
{
@@@ -69,7 -69,7 +69,7 @@@
private static LdapConnection connection;
-- @Before
++ @BeforeEach
public void setup() throws Exception
{
super.init();
@@@ -150,8 -150,8 +150,8 @@@
connection.add( entry );
-- assertFalse( "adding new matchingRule to disabled schema should not register it into the registries",
-- schemaManager.getMatchingRuleRegistry().contains( OID ) );
++ assertFalse( schemaManager.getMatchingRuleRegistry().contains( OID ) ,
++ "adding new matchingRule to disabled schema should not register it into the registries" );
assertTrue( isOnDisk( dn ) );
}
@@@ -181,8 -181,8 +181,8 @@@
// Expected result
}
-- assertFalse( "adding new matchingRule to disabled schema should not register it into the registries",
-- schemaManager.getMatchingRuleRegistry().contains( OID ) );
++ assertFalse( schemaManager.getMatchingRuleRegistry().contains( OID ) ,
++ "adding new matchingRule to disabled schema should not register it into the registries" );
assertFalse( isOnDisk( dn ) );
}
@@@ -197,14 -197,14 +197,14 @@@
testAddMatchingRuleToEnabledSchema();
-- assertTrue( "matchingRule should be removed from the registry after being deleted",
-- schemaManager.getMatchingRuleRegistry().contains( OID ) );
++ assertTrue( schemaManager.getMatchingRuleRegistry().contains( OID ) ,
++ "matchingRule should be removed from the registry after being deleted" );
assertTrue( isOnDisk( dn ) );
connection.delete( dn );
-- assertFalse( "matchingRule should be removed from the registry after being deleted",
-- schemaManager.getMatchingRuleRegistry().contains( OID ) );
++ assertFalse( schemaManager.getMatchingRuleRegistry().contains( OID ) ,
++ "matchingRule should be removed from the registry after being deleted" );
try
{
@@@ -226,14 -226,14 +226,14 @@@
testAddMatchingRuleToDisabledSchema();
-- assertFalse( "matchingRule should be removed from the registry after being deleted",
-- schemaManager.getMatchingRuleRegistry().contains( OID ) );
++ assertFalse( schemaManager.getMatchingRuleRegistry().contains( OID ) ,
++ "matchingRule should be removed from the registry after being deleted" );
assertTrue( isOnDisk( dn ) );
connection.delete( dn );
-- assertFalse( "matchingRule should be removed from the registry after being deleted",
-- schemaManager.getMatchingRuleRegistry().contains( OID ) );
++ assertFalse( schemaManager.getMatchingRuleRegistry().contains( OID ) ,
++ "matchingRule should be removed from the registry after being deleted" );
assertFalse( isOnDisk( dn ) );
}
@@@ -242,7 -242,7 +242,7 @@@
// Test Modify operation
// ----------------------------------------------------------------------
@Test
-- @Ignore
++ @Disabled
public void testModifyMatchingRuleWithModificationItems() throws Exception
{
testAddMatchingRuleToEnabledSchema();
@@@ -260,8 -260,8 +260,8 @@@
connection.modify( dn, mod1, mod2 );
-- assertTrue( "matchingRule OID should still be present",
-- schemaManager.getMatchingRuleRegistry().contains( OID ) );
++ assertTrue( schemaManager.getMatchingRuleRegistry().contains( OID ) ,
++ "matchingRule OID should still be present" );
assertEquals( "matchingRule schema should be set to apachemeta", "apachemeta",
schemaManager.getMatchingRuleRegistry().getSchemaName( OID ) );
@@@ -273,7 -273,7 +273,7 @@@
@Test
-- @Ignore
++ @Disabled
public void testModifyMatchingRuleWithAttributes() throws Exception
{
testAddMatchingRuleToEnabledSchema();
@@@ -291,8 -291,8 +291,8 @@@
connection.modify( dn, mod1, mod2 );
-- assertTrue( "matchingRule OID should still be present",
-- schemaManager.getMatchingRuleRegistry().contains( OID ) );
++ assertTrue( schemaManager.getMatchingRuleRegistry().contains( OID ) ,
++ "matchingRule OID should still be present" );
assertEquals( "matchingRule schema should be set to apachemeta", "apachemeta",
schemaManager.getMatchingRuleRegistry().getSchemaName( OID ) );
@@@ -307,7 -307,7 +307,7 @@@
// Test Rename operation
// ----------------------------------------------------------------------
@Test
-- @Ignore
++ @Disabled
public void testRenameMatchingRule() throws Exception
{
Dn dn = new Dn( "m-oid=" + OID + ",ou=matchingRules,cn=apachemeta,ou=schema" );
@@@ -317,8 -317,8 +317,8 @@@
Rdn rdn = new Rdn( "m-oid=" + NEW_OID );
connection.rename( dn, rdn );
-- assertFalse( "old matchingRule OID should be removed from the registry after being renamed",
-- schemaManager.getMatchingRuleRegistry().contains( OID ) );
++ assertFalse( schemaManager.getMatchingRuleRegistry().contains( OID ) ,
++ "old matchingRule OID should be removed from the registry after being renamed" );
try
{
@@@ -337,7 -337,7 +337,7 @@@
// Test Move operation
// ----------------------------------------------------------------------
@Test
-- @Ignore
++ @Disabled
public void testMoveMatchingRule() throws Exception
{
testAddMatchingRuleToEnabledSchema();
@@@ -348,8 -348,8 +348,8 @@@
connection.move( dn, newDn );
-- assertTrue( "matchingRule OID should still be present",
-- schemaManager.getMatchingRuleRegistry().contains( OID ) );
++ assertTrue( schemaManager.getMatchingRuleRegistry().contains( OID ) ,
++ "matchingRule OID should still be present" );
assertEquals( "matchingRule schema should be set to apache not apachemeta", "apache",
schemaManager.getMatchingRuleRegistry().getSchemaName( OID ) );
@@@ -357,7 -357,7 +357,7 @@@
@Test
-- @Ignore
++ @Disabled
public void testMoveMatchingRuleAndChangeRdn() throws Exception
{
testAddMatchingRuleToEnabledSchema();
@@@ -368,11 -368,11 +368,11 @@@
connection.moveAndRename( dn, newDn );
-- assertFalse( "old matchingRule OID should NOT be present",
-- schemaManager.getMatchingRuleRegistry().contains( OID ) );
++ assertFalse( schemaManager.getMatchingRuleRegistry().contains( OID ) ,
++ "old matchingRule OID should NOT be present" );
-- assertTrue( "new matchingRule OID should be present",
-- schemaManager.getMatchingRuleRegistry().contains( NEW_OID ) );
++ assertTrue( schemaManager.getMatchingRuleRegistry().contains( NEW_OID ) ,
++ "new matchingRule OID should be present" );
assertEquals( "matchingRule with new oid should have schema set to apache NOT apachemeta", "apache",
schemaManager.getMatchingRuleRegistry().getSchemaName( NEW_OID ) );
@@@ -400,8 -400,8 +400,8 @@@
// //assertEquals( e.@getResultCode(), ResultCodeEnum.UNWILLING_TO_PERFORM );
// }
//
-- // assertTrue( "syntax should still be in the registry after delete failure",
-- // getLdapSyntaxRegistry().hasSyntax( OID ) );
++ // assertTrue( getLdapSyntaxRegistry().hasSyntax( OID ) ,
++ // "syntax should still be in the registry after delete failure" );
// }
// public void testMoveSyntaxWhenInUse() throws NamingException
@@@ -422,8 -422,8 +422,8 @@@
// assertEquals( e.getResultCode(), ResultCodeEnum.UNWILLING_TO_PERFORM );
// }
//
-- // assertTrue( "syntax should still be in the registry after move failure",
-- // registries.getLdapSyntaxRegistry().hasSyntax( OID ) );
++ // assertTrue( registries.getLdapSyntaxRegistry().hasSyntax( OID ) ,
++ // "syntax should still be in the registry after move failure" );
// }
//
//
@@@ -446,8 -446,8 +446,8 @@@
// assertEquals( e.getResultCode(), ResultCodeEnum.UNWILLING_TO_PERFORM );
// }
//
-- // assertTrue( "syntax should still be in the registry after move failure",
-- // registries.getSyntaxRegistry().hasSyntax( OID ) );
++ // assertTrue( registries.getSyntaxRegistry().hasSyntax( OID ) ,
++ // "syntax should still be in the registry after move failure" );
// }
//
//
@@@ -479,8 -479,8 +479,8 @@@
// assertEquals( e.getResultCode(), ResultCodeEnum.UNWILLING_TO_PERFORM );
// }
//
-- // assertTrue( "syntax should still be in the registry after rename failure",
-- // registries.getSyntaxRegistry().hasSyntax( OID ) );
++ // assertTrue( registries.getSyntaxRegistry().hasSyntax( OID ) ,
++ // "syntax should still be in the registry after rename failure" );
// }
// ----------------------------------------------------------------------
@@@ -488,7 -488,7 +488,7 @@@
// ----------------------------------------------------------------------
@Test
-- @Ignore
++ @Disabled
public void testMoveMatchingRuleToTop() throws Exception
{
testAddMatchingRuleToEnabledSchema();
@@@ -507,13 -507,13 +507,13 @@@
assertEquals( ResultCodeEnum.NAMING_VIOLATION, e.getResultCode() );
}
-- assertTrue( "matchingRule should still be in the registry after move failure",
-- schemaManager.getMatchingRuleRegistry().contains( OID ) );
++ assertTrue( schemaManager.getMatchingRuleRegistry().contains( OID ) ,
++ "matchingRule should still be in the registry after move failure" );
}
@Test
-- @Ignore
++ @Disabled
public void testMoveMatchingRuleToComparatorContainer() throws Exception
{
testAddMatchingRuleToEnabledSchema();
@@@ -532,13 -532,13 +532,13 @@@
assertEquals( ResultCodeEnum.NAMING_VIOLATION, e.getResultCode() );
}
-- assertTrue( "matchingRule should still be in the registry after move failure",
-- schemaManager.getMatchingRuleRegistry().contains( OID ) );
++ assertTrue( schemaManager.getMatchingRuleRegistry().contains( OID ) ,
++ "matchingRule should still be in the registry after move failure" );
}
@Test
-- @Ignore
++ @Disabled
public void testMoveMatchingRuleToDisabledSchema() throws Exception
{
testAddMatchingRuleToEnabledSchema();
@@@ -550,13 -550,13 +550,13 @@@
connection.move( dn, newDn );
-- assertFalse( "matchingRule OID should no longer be present",
-- schemaManager.getMatchingRuleRegistry().contains( OID ) );
++ assertFalse( schemaManager.getMatchingRuleRegistry().contains( OID ) ,
++ "matchingRule OID should no longer be present" );
}
@Test
-- @Ignore
++ @Disabled
public void testMoveMatchingRuleToEnabledSchema() throws Exception
{
testAddMatchingRuleToDisabledSchema();
@@@ -564,15 -564,15 +564,15 @@@
// nis is inactive by default
Dn dn = new Dn( "m-oid=" + OID + ",ou=matchingRules,cn=nis,ou=schema" );
-- assertFalse( "matchingRule OID should NOT be present when added to disabled nis schema",
-- schemaManager.getMatchingRuleRegistry().contains( OID ) );
++ assertFalse( schemaManager.getMatchingRuleRegistry().contains( OID ) ,
++ "matchingRule OID should NOT be present when added to disabled nis schema" );
Dn newDn = new Dn( "m-oid=" + OID + ",ou=matchingRules,cn=apachemeta,ou=schema" );
connection.move( dn, newDn );
-- assertTrue( "matchingRule OID should be present when moved to enabled schema",
-- schemaManager.getMatchingRuleRegistry().contains( OID ) );
++ assertTrue( schemaManager.getMatchingRuleRegistry().contains( OID ) ,
++ "matchingRule OID should be present when moved to enabled schema" );
assertEquals( "matchingRule should be in apachemeta schema after move", "apachemeta",
schemaManager.getMatchingRuleRegistry().getSchemaName( OID ) );
diff --cc core-integ/src/test/java/org/apache/directory/server/core/schema/MetaNormalizerHandlerIT.java
index eba7a1f,eba7a1f..1b335bc
--- a/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaNormalizerHandlerIT.java
+++ b/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaNormalizerHandlerIT.java
@@@ -20,10 -20,10 +20,10 @@@
package org.apache.directory.server.core.schema;
--import static org.junit.Assert.assertEquals;
--import static org.junit.Assert.assertFalse;
--import static org.junit.Assert.assertTrue;
--import static org.junit.Assert.fail;
++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 static org.junit.jupiter.api.Assertions.fail;
import java.io.ByteArrayOutputStream;
import java.io.InputStream;
@@@ -45,12 -45,12 +45,12 @@@ import org.apache.directory.api.ldap.mo
import org.apache.directory.api.ldap.model.schema.normalizers.NoOpNormalizer;
import org.apache.directory.ldap.client.api.LdapConnection;
import org.apache.directory.server.core.annotations.CreateDS;
--import org.apache.directory.server.core.integ.FrameworkRunner;
++import org.apache.directory.server.core.integ.ApacheDSTestExtension;
import org.apache.directory.server.core.integ.IntegrationUtils;
--import org.junit.Before;
--import org.junit.Ignore;
--import org.junit.Test;
--import org.junit.runner.RunWith;
++import org.junit.jupiter.api.BeforeEach;
++import org.junit.jupiter.api.Disabled;
++import org.junit.jupiter.api.Test;
++import org.junit.jupiter.api.extension.ExtendWith;
/**
@@@ -59,7 -59,7 +59,7 @@@
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
--@RunWith(FrameworkRunner.class)
++@ExtendWith( ApacheDSTestExtension.class )
@CreateDS(name = "MetaNormalizerHandlerIT")
public class MetaNormalizerHandlerIT extends AbstractMetaSchemaObjectHandler
{
@@@ -70,7 -70,7 +70,7 @@@
private static LdapConnection connection;
-- @Before
++ @BeforeEach
public void init() throws Exception
{
super.init();
@@@ -123,8 -123,8 +123,8 @@@
connection.add( entry );
-- assertFalse( "adding new normalizer to disabled schema should not register it into the registries",
-- schemaManager.getNormalizerRegistry().contains( OID ) );
++ assertFalse( schemaManager.getNormalizerRegistry().contains( OID ) ,
++ "adding new normalizer to disabled schema should not register it into the registries" );
assertTrue( isOnDisk( dn ) );
}
@@@ -154,8 -154,8 +154,8 @@@
// Expected result.
}
-- assertFalse( "adding new normalizer to disabled schema should not register it into the registries",
-- schemaManager.getNormalizerRegistry().contains( OID ) );
++ assertFalse( schemaManager.getNormalizerRegistry().contains( OID ) ,
++ "adding new normalizer to disabled schema should not register it into the registries" );
assertFalse( isOnDisk( dn ) );
}
@@@ -234,14 -234,14 +234,14 @@@
testAddNormalizerToEnabledSchema();
-- assertTrue( "normalizer should be removed from the registry after being deleted",
-- schemaManager.getNormalizerRegistry().contains( OID ) );
++ assertTrue( schemaManager.getNormalizerRegistry().contains( OID ) ,
++ "normalizer should be removed from the registry after being deleted" );
assertTrue( isOnDisk( dn ) );
connection.delete( dn );
-- assertFalse( "normalizer should be removed from the registry after being deleted",
-- schemaManager.getNormalizerRegistry().contains( OID ) );
++ assertFalse( schemaManager.getNormalizerRegistry().contains( OID ) ,
++ "normalizer should be removed from the registry after being deleted" );
try
{
@@@ -263,14 -263,14 +263,14 @@@
testAddNormalizerToEnabledSchema();
-- assertTrue( "normalizer should be removed from the registry after being deleted",
-- schemaManager.getNormalizerRegistry().contains( OID ) );
++ assertTrue( schemaManager.getNormalizerRegistry().contains( OID ) ,
++ "normalizer should be removed from the registry after being deleted" );
assertTrue( isOnDisk( dn ) );
connection.delete( dn );
-- assertFalse( "normalizer should be removed from the registry after being deleted",
-- schemaManager.getNormalizerRegistry().contains( OID ) );
++ assertFalse( schemaManager.getNormalizerRegistry().contains( OID ) ,
++ "normalizer should be removed from the registry after being deleted" );
try
{
@@@ -286,7 -286,7 +286,7 @@@
@Test
-- @Ignore
++ @Disabled
public void testRenameNormalizer() throws Exception
{
Dn dn = new Dn( "m-oid=" + OID + ",ou=normalizers,cn=apacheMeta,ou=schema" );
@@@ -296,8 -296,8 +296,8 @@@
connection.rename( dn, rdn );
-- assertFalse( "old normalizer OID should be removed from the registry after being renamed",
-- schemaManager.getNormalizerRegistry().contains( OID ) );
++ assertFalse( schemaManager.getNormalizerRegistry().contains( OID ) ,
++ "old normalizer OID should be removed from the registry after being renamed" );
//noinspection EmptyCatchBlock
try
@@@ -316,7 -316,7 +316,7 @@@
@Test
-- @Ignore
++ @Disabled
public void testMoveNormalizer() throws Exception
{
testAddNormalizerToEnabledSchema();
@@@ -327,8 -327,8 +327,8 @@@
connection.move( dn, newDn );
-- assertTrue( "normalizer OID should still be present",
-- schemaManager.getNormalizerRegistry().contains( OID ) );
++ assertTrue( schemaManager.getNormalizerRegistry().contains( OID ) ,
++ "normalizer OID should still be present" );
assertEquals( "normalizer schema should be set to apache not apachemeta", "apache",
schemaManager.getNormalizerRegistry().getSchemaName( OID ) );
@@@ -339,7 -339,7 +339,7 @@@
@Test
-- @Ignore
++ @Disabled
public void testMoveNormalizerAndChangeRdn() throws Exception
{
testAddNormalizerToEnabledSchema();
@@@ -349,11 -349,11 +349,11 @@@
connection.moveAndRename( dn, newDn );
-- assertFalse( "old normalizer OID should NOT be present",
-- schemaManager.getNormalizerRegistry().contains( OID ) );
++ assertFalse( schemaManager.getNormalizerRegistry().contains( OID ) ,
++ "old normalizer OID should NOT be present" );
-- assertTrue( "new normalizer OID should be present",
-- schemaManager.getNormalizerRegistry().contains( NEW_OID ) );
++ assertTrue( schemaManager.getNormalizerRegistry().contains( NEW_OID ) ,
++ "new normalizer OID should be present" );
assertEquals( "normalizer with new oid should have schema set to apache NOT apachemeta", "apache",
schemaManager.getNormalizerRegistry().getSchemaName( NEW_OID ) );
@@@ -364,7 -364,7 +364,7 @@@
@Test
-- @Ignore
++ @Disabled
public void testModifyNormalizerWithModificationItems() throws Exception
{
testAddNormalizerToEnabledSchema();
@@@ -376,8 -376,8 +376,8 @@@
connection.modify( dn, mod );
-- assertTrue( "normalizer OID should still be present",
-- schemaManager.getNormalizerRegistry().contains( OID ) );
++ assertTrue( schemaManager.getNormalizerRegistry().contains( OID ) ,
++ "normalizer OID should still be present" );
assertEquals( "normalizer schema should be set to apachemeta", "apachemeta",
schemaManager.getNormalizerRegistry().getSchemaName( OID ) );
@@@ -388,7 -388,7 +388,7 @@@
@Test
-- @Ignore
++ @Disabled
public void testModifyNormalizerWithAttributes() throws Exception
{
testAddNormalizerToEnabledSchema();
@@@ -399,8 -399,8 +399,8 @@@
ModificationOperation.REPLACE_ATTRIBUTE, "m-fqcn", DeepTrimNormalizer.class.getName() );
connection.modify( dn, mod );
-- assertTrue( "normalizer OID should still be present",
-- schemaManager.getNormalizerRegistry().contains( OID ) );
++ assertTrue( schemaManager.getNormalizerRegistry().contains( OID ) ,
++ "normalizer OID should still be present" );
assertEquals( "normalizer schema should be set to apachemeta", "apachemeta",
schemaManager.getNormalizerRegistry().getSchemaName( OID ) );
@@@ -455,13 -455,13 +455,13 @@@
{
}
-- assertTrue( "Normalizer should still be in the registry after delete failure", schemaManager
-- .getNormalizerRegistry().contains( OID ) );
++ assertTrue( schemaManager.getNormalizerRegistry().contains( OID ),
++ "Normalizer should still be in the registry after delete failure" );
}
@Test
-- @Ignore
++ @Disabled
public void testMoveNormalizerWhenInUse() throws Exception
{
testAddNormalizerToEnabledSchema();
@@@ -479,15 -479,15 +479,15 @@@
{
}
-- assertTrue( "normalizer should still be in the registry after move failure",
-- schemaManager.getNormalizerRegistry().contains( OID ) );
++ assertTrue( schemaManager.getNormalizerRegistry().contains( OID ) ,
++ "normalizer should still be in the registry after move failure" );
schemaManager.getMatchingRuleRegistry().unregister( OID );
schemaManager.getGlobalOidRegistry().unregister( OID );
}
@Test
-- @Ignore
++ @Disabled
public void testMoveNormalizerAndChangeRdnWhenInUse() throws Exception
{
testAddNormalizerToEnabledSchema();
@@@ -505,15 -505,15 +505,15 @@@
{
}
-- assertTrue( "normalizer should still be in the registry after move failure",
-- schemaManager.getNormalizerRegistry().contains( OID ) );
++ assertTrue( schemaManager.getNormalizerRegistry().contains( OID ) ,
++ "normalizer should still be in the registry after move failure" );
schemaManager.getMatchingRuleRegistry().unregister( OID );
schemaManager.getGlobalOidRegistry().unregister( OID );
}
@Test
-- @Ignore
++ @Disabled
public void testRenameNormalizerWhenInUse() throws Exception
{
Dn dn = new Dn( "m-oid=" + OID + ",ou=normalizers,cn=apacheMeta,ou=schema" );
@@@ -532,8 -532,8 +532,8 @@@
{
}
-- assertTrue( "normalizer should still be in the registry after rename failure",
-- schemaManager.getNormalizerRegistry().contains( OID ) );
++ assertTrue( schemaManager.getNormalizerRegistry().contains( OID ) ,
++ "normalizer should still be in the registry after rename failure" );
schemaManager.getMatchingRuleRegistry().unregister( OID );
schemaManager.getGlobalOidRegistry().unregister( OID );
}
@@@ -544,7 -544,7 +544,7 @@@
// ----------------------------------------------------------------------
@Test
-- @Ignore
++ @Disabled
public void testMoveNormalizerToTop() throws Exception
{
testAddNormalizerToEnabledSchema();
@@@ -563,13 -563,13 +563,13 @@@
assertEquals( ResultCodeEnum.NAMING_VIOLATION, e.getResultCode() );
}
-- assertTrue( "normalizer should still be in the registry after move failure",
-- schemaManager.getNormalizerRegistry().contains( OID ) );
++ assertTrue( schemaManager.getNormalizerRegistry().contains( OID ) ,
++ "normalizer should still be in the registry after move failure" );
}
@Test
-- @Ignore
++ @Disabled
public void testMoveNormalizerToComparatorContainer() throws Exception
{
testAddNormalizerToEnabledSchema();
@@@ -588,13 -588,13 +588,13 @@@
assertEquals( ResultCodeEnum.NAMING_VIOLATION, e.getResultCode() );
}
-- assertTrue( "normalizer should still be in the registry after move failure",
-- schemaManager.getNormalizerRegistry().contains( OID ) );
++ assertTrue( schemaManager.getNormalizerRegistry().contains( OID ) ,
++ "normalizer should still be in the registry after move failure" );
}
@Test
-- @Ignore
++ @Disabled
public void testMoveNormalizerToDisabledSchema() throws Exception
{
testAddNormalizerToEnabledSchema();
@@@ -606,13 -606,13 +606,13 @@@
connection.move( dn, newDn );
-- assertFalse( "normalizer OID should no longer be present",
-- schemaManager.getNormalizerRegistry().contains( OID ) );
++ assertFalse( schemaManager.getNormalizerRegistry().contains( OID ) ,
++ "normalizer OID should no longer be present" );
}
@Test
-- @Ignore
++ @Disabled
public void testMoveNormalizerToEnabledSchema() throws Exception
{
testAddNormalizerToDisabledSchema();
@@@ -620,15 -620,15 +620,15 @@@
// nis is inactive by default
Dn dn = new Dn( "m-oid=" + OID + ",ou=normalizers,cn=nis,ou=schema" );
-- assertFalse( "normalizer OID should NOT be present when added to disabled nis schema",
-- schemaManager.getNormalizerRegistry().contains( OID ) );
++ assertFalse( schemaManager.getNormalizerRegistry().contains( OID ) ,
++ "normalizer OID should NOT be present when added to disabled nis schema" );
Dn newDn = new Dn( "m-oid=" + OID + ",ou=normalizers,cn=apacheMeta,ou=schema" );
connection.move( dn, newDn );
-- assertTrue( "normalizer OID should be present when moved to enabled schema",
-- schemaManager.getNormalizerRegistry().contains( OID ) );
++ assertTrue( schemaManager.getNormalizerRegistry().contains( OID ) ,
++ "normalizer OID should be present when moved to enabled schema" );
assertEquals( "normalizer should be in apachemeta schema after move", "apachemeta",
schemaManager.getNormalizerRegistry().getSchemaName( OID ) );
diff --cc core-integ/src/test/java/org/apache/directory/server/core/schema/MetaObjectClassHandlerIT.java
index 93366e8,93366e8..d61e6a2
--- a/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaObjectClassHandlerIT.java
+++ b/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaObjectClassHandlerIT.java
@@@ -20,10 -20,10 +20,10 @@@
package org.apache.directory.server.core.schema;
--import static org.junit.Assert.assertEquals;
--import static org.junit.Assert.assertFalse;
--import static org.junit.Assert.assertTrue;
--import static org.junit.Assert.fail;
++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 static org.junit.jupiter.api.Assertions.fail;
import org.apache.directory.api.ldap.model.entry.DefaultEntry;
import org.apache.directory.api.ldap.model.entry.DefaultModification;
@@@ -38,12 -38,12 +38,12 @@@ import org.apache.directory.api.ldap.mo
import org.apache.directory.api.ldap.model.schema.registries.ObjectClassRegistry;
import org.apache.directory.ldap.client.api.LdapConnection;
import org.apache.directory.server.core.annotations.CreateDS;
--import org.apache.directory.server.core.integ.FrameworkRunner;
++import org.apache.directory.server.core.integ.ApacheDSTestExtension;
import org.apache.directory.server.core.integ.IntegrationUtils;
--import org.junit.Before;
--import org.junit.Ignore;
--import org.junit.Test;
--import org.junit.runner.RunWith;
++import org.junit.jupiter.api.BeforeEach;
++import org.junit.jupiter.api.Disabled;
++import org.junit.jupiter.api.Test;
++import org.junit.jupiter.api.extension.ExtendWith;
/**
@@@ -52,7 -52,7 +52,7 @@@
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
--@RunWith(FrameworkRunner.class)
++@ExtendWith( ApacheDSTestExtension.class )
@CreateDS(name = "MetaObjectClassHandlerIT")
public class MetaObjectClassHandlerIT extends AbstractMetaSchemaObjectHandler
{
@@@ -71,7 -71,7 +71,7 @@@
private static LdapConnection connection;
-- @Before
++ @BeforeEach
public void setup() throws Exception
{
super.init();
@@@ -127,8 -127,8 +127,8 @@@
{
Dn dn = addObjectClassToDisabledSchema();
-- assertFalse( "adding new objectClass to disabled schema should not register it into the registries",
-- getObjectClassRegistry().contains( OID ) );
++ assertFalse( getObjectClassRegistry().contains( OID ) ,
++ "adding new objectClass to disabled schema should not register it into the registries" );
assertTrue( isOnDisk( dn ) );
}
@@@ -160,8 -160,8 +160,8 @@@
// Excpected result
}
-- assertFalse( "adding new objectClass to disabled schema should not register it into the registries",
-- getObjectClassRegistry().contains( OID ) );
++ assertFalse( getObjectClassRegistry().contains( OID ) ,
++ "adding new objectClass to disabled schema should not register it into the registries" );
assertFalse( isOnDisk( dn ) );
}
@@@ -173,14 -173,14 +173,14 @@@
addObjectClass();
-- assertTrue( "objectClass should be removed from the registry after being deleted",
-- getObjectClassRegistry().contains( OID ) );
++ assertTrue( getObjectClassRegistry().contains( OID ) ,
++ "objectClass should be removed from the registry after being deleted" );
assertTrue( isOnDisk( dn ) );
connection.delete( dn );
-- assertFalse( "objectClass should be removed from the registry after being deleted",
-- getObjectClassRegistry().contains( OID ) );
++ assertFalse( getObjectClassRegistry().contains( OID ) ,
++ "objectClass should be removed from the registry after being deleted" );
try
{
@@@ -202,14 -202,14 +202,14 @@@
addObjectClassToDisabledSchema();
-- assertFalse( "objectClass should be removed from the registry after being deleted",
-- getObjectClassRegistry().contains( OID ) );
++ assertFalse( getObjectClassRegistry().contains( OID ) ,
++ "objectClass should be removed from the registry after being deleted" );
assertTrue( isOnDisk( dn ) );
connection.delete( dn );
-- assertFalse( "objectClass should be removed from the registry after being deleted",
-- getObjectClassRegistry().contains( OID ) );
++ assertFalse( getObjectClassRegistry().contains( OID ) ,
++ "objectClass should be removed from the registry after being deleted" );
try
{
@@@ -225,7 -225,7 +225,7 @@@
@Test
-- @Ignore
++ @Disabled
public void testRenameObjectClassType() throws Exception
{
Dn dn = new Dn( "m-oid=" + OID + ",ou=objectClasses,cn=nis,ou=schema" );
@@@ -236,8 -236,8 +236,8 @@@
connection.move( dn, newDn );
-- assertFalse( "old objectClass OID should be removed from the registry after being renamed",
-- getObjectClassRegistry().contains( OID ) );
++ assertFalse( getObjectClassRegistry().contains( OID ) ,
++ "old objectClass OID should be removed from the registry after being renamed" );
//noinspection EmptyCatchBlock
try
@@@ -254,7 -254,7 +254,7 @@@
@Test
-- @Ignore
++ @Disabled
public void testMoveObjectClass() throws Exception
{
addObjectClass();
@@@ -265,8 -265,8 +265,8 @@@
connection.move( dn, newDn );
-- assertTrue( "objectClass OID should still be present",
-- getObjectClassRegistry().contains( OID ) );
++ assertTrue( getObjectClassRegistry().contains( OID ) ,
++ "objectClass OID should still be present" );
assertEquals( "objectClass schema should be set to apache not apachemeta", "apache",
getObjectClassRegistry().getSchemaName( OID ) );
@@@ -274,7 -274,7 +274,7 @@@
@Test
-- @Ignore
++ @Disabled
public void testMoveObjectClassAndChangeRdn() throws Exception
{
addObjectClass();
@@@ -285,11 -285,11 +285,11 @@@
connection.move( dn, newDn );
-- assertFalse( "old objectClass OID should NOT be present",
-- getObjectClassRegistry().contains( OID ) );
++ assertFalse( getObjectClassRegistry().contains( OID ) ,
++ "old objectClass OID should NOT be present" );
-- assertTrue( "new objectClass OID should be present",
-- getObjectClassRegistry().contains( NEW_OID ) );
++ assertTrue( getObjectClassRegistry().contains( NEW_OID ) ,
++ "new objectClass OID should be present" );
assertEquals( "objectClass with new oid should have schema set to apache NOT apachemeta","apache",
getObjectClassRegistry().getSchemaName( NEW_OID ) );
@@@ -297,7 -297,7 +297,7 @@@
@Test
-- @Ignore
++ @Disabled
public void testModifyObjectClassWithModificationItems() throws Exception
{
addObjectClass();
@@@ -315,8 -315,8 +315,8 @@@
connection.modify( dn, mod1, mod2 );
-- assertTrue( "objectClass OID should still be present",
-- getObjectClassRegistry().contains( OID ) );
++ assertTrue( getObjectClassRegistry().contains( OID ) ,
++ "objectClass OID should still be present" );
assertEquals( "objectClass schema should be set to apachemeta", "apachemeta",
getObjectClassRegistry().getSchemaName( OID ) );
@@@ -328,7 -328,7 +328,7 @@@
@Test
-- @Ignore
++ @Disabled
public void testModifyObjectClassWithAttributes() throws Exception
{
addObjectClass();
@@@ -346,8 -346,8 +346,8 @@@
connection.modify( dn, mod1, mod2 );
-- assertTrue( "objectClass OID should still be present",
-- getObjectClassRegistry().contains( OID ) );
++ assertTrue( getObjectClassRegistry().contains( OID ) ,
++ "objectClass OID should still be present" );
assertEquals( "objectClass schema should be set to apachemeta", "apachemeta",
getObjectClassRegistry().getSchemaName( OID ) );
@@@ -402,13 -402,13 +402,13 @@@
{
}
-- assertTrue( "objectClass should still be in the registry after delete failure",
-- getObjectClassRegistry().contains( OID ) );
++ assertTrue( getObjectClassRegistry().contains( OID ) ,
++ "objectClass should still be in the registry after delete failure" );
}
@Test
-- @Ignore
++ @Disabled
public void testMoveObjectClassWhenInUse() throws Exception
{
addObjectClass();
@@@ -427,13 -427,13 +427,13 @@@
{
}
-- assertTrue( "objectClass should still be in the registry after move failure",
-- getObjectClassRegistry().contains( OID ) );
++ assertTrue( getObjectClassRegistry().contains( OID ) ,
++ "objectClass should still be in the registry after move failure" );
}
@Test
-- @Ignore
++ @Disabled
public void testMoveObjectClassAndChangeRdnWhenInUse() throws Exception
{
addObjectClass();
@@@ -452,13 -452,13 +452,13 @@@
{
}
-- assertTrue( "ObjectClass should still be in the registry after move failure",
-- getObjectClassRegistry().contains( OID ) );
++ assertTrue( getObjectClassRegistry().contains( OID ) ,
++ "ObjectClass should still be in the registry after move failure" );
}
@Test
-- @Ignore
++ @Disabled
public void testRenameObjectClassWhenInUse() throws Exception
{
Dn dn = new Dn( "m-oid=" + OID + ",ou=objectClasses,cn=apacheMeta,ou=schema" );
@@@ -477,8 -477,8 +477,8 @@@
{
}
-- assertTrue( "objectClass should still be in the registry after rename failure",
-- getObjectClassRegistry().contains( OID ) );
++ assertTrue( getObjectClassRegistry().contains( OID ) ,
++ "objectClass should still be in the registry after rename failure" );
}
@@@ -486,7 -486,7 +486,7 @@@
// Let's try some freaky stuff
// ----------------------------------------------------------------------
@Test
-- @Ignore
++ @Disabled
public void testMoveObjectClassToTop() throws Exception
{
addObjectClass();
@@@ -504,13 -504,13 +504,13 @@@
{
}
-- assertTrue( "objectClass should still be in the registry after move failure",
-- getObjectClassRegistry().contains( OID ) );
++ assertTrue( getObjectClassRegistry().contains( OID ) ,
++ "objectClass should still be in the registry after move failure" );
}
@Test
-- @Ignore
++ @Disabled
public void testMoveObjectClassToComparatorContainer() throws Exception
{
addObjectClass();
@@@ -528,8 -528,8 +528,8 @@@
{
}
-- assertTrue( "objectClass should still be in the registry after move failure",
-- getObjectClassRegistry().contains( OID ) );
++ assertTrue( getObjectClassRegistry().contains( OID ) ,
++ "objectClass should still be in the registry after move failure" );
}
@@@ -556,7 -556,7 +556,7 @@@
@Test
-- @Ignore
++ @Disabled
public void testMoveObjectClassToDisabledSchema() throws Exception
{
addObjectClass();
@@@ -568,13 -568,13 +568,13 @@@
connection.move( dn, newDn );
-- assertFalse( "objectClass OID should no longer be present",
-- getObjectClassRegistry().contains( OID ) );
++ assertFalse( getObjectClassRegistry().contains( OID ) ,
++ "objectClass OID should no longer be present" );
}
@Test
-- @Ignore
++ @Disabled
public void testMoveObjectClassToEnabledSchema() throws Exception
{
addObjectClassToDisabledSchema();
@@@ -582,15 -582,15 +582,15 @@@
// nis is inactive by default
Dn dn = new Dn( "m-oid=" + OID + ",ou=objectClasses,cn=nis,ou=schema" );
-- assertFalse( "objectClass OID should NOT be present when added to disabled nis schema",
-- getObjectClassRegistry().contains( OID ) );
++ assertFalse( getObjectClassRegistry().contains( OID ) ,
++ "objectClass OID should NOT be present when added to disabled nis schema" );
Dn newDn = new Dn( "m-oid=" + OID + ",ou=objectClasses,cn=apachemeta,ou=schema" );
connection.move( dn, newDn );
-- assertTrue( "objectClass OID should be present when moved to enabled schema",
-- getObjectClassRegistry().contains( OID ) );
++ assertTrue( getObjectClassRegistry().contains( OID ) ,
++ "objectClass OID should be present when moved to enabled schema" );
assertEquals( "objectClass should be in apachemeta schema after move", "apachemeta",
getObjectClassRegistry().getSchemaName( OID ) );
diff --cc core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSchemaHandlerIT.java
index f9f9c8d,f9f9c8d..157bfd9
--- a/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSchemaHandlerIT.java
+++ b/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSchemaHandlerIT.java
@@@ -20,11 -20,11 +20,11 @@@
package org.apache.directory.server.core.schema;
--import static org.junit.Assert.assertEquals;
--import static org.junit.Assert.assertFalse;
--import static org.junit.Assert.assertNotNull;
--import static org.junit.Assert.assertTrue;
--import static org.junit.Assert.fail;
++import static org.junit.jupiter.api.Assertions.assertEquals;
++import static org.junit.jupiter.api.Assertions.assertFalse;
++import static org.junit.jupiter.api.Assertions.assertNotNull;
++import static org.junit.jupiter.api.Assertions.assertTrue;
++import static org.junit.jupiter.api.Assertions.fail;
import org.apache.directory.api.ldap.model.constants.MetaSchemaConstants;
import org.apache.directory.api.ldap.model.constants.SchemaConstants;
@@@ -38,12 -38,12 +38,12 @@@ import org.apache.directory.api.ldap.mo
import org.apache.directory.api.ldap.model.schema.SchemaManager;
import org.apache.directory.ldap.client.api.LdapConnection;
import org.apache.directory.server.core.annotations.CreateDS;
--import org.apache.directory.server.core.integ.FrameworkRunner;
++import org.apache.directory.server.core.integ.ApacheDSTestExtension;
import org.apache.directory.server.core.integ.IntegrationUtils;
--import org.junit.Before;
--import org.junit.Ignore;
--import org.junit.Test;
--import org.junit.runner.RunWith;
++import org.junit.jupiter.api.BeforeEach;
++import org.junit.jupiter.api.Disabled;
++import org.junit.jupiter.api.Test;
++import org.junit.jupiter.api.extension.ExtendWith;
/**
@@@ -90,7 -90,7 +90,7 @@@
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
--@RunWith(FrameworkRunner.class)
++@ExtendWith( ApacheDSTestExtension.class )
@CreateDS(name = "MetaSchemaHandlerIT")
public class MetaSchemaHandlerIT extends AbstractMetaSchemaObjectHandler
{
@@@ -104,7 -104,7 +104,7 @@@
private static LdapConnection connection;
-- @Before
++ @BeforeEach
public void setup() throws Exception
{
super.init();
@@@ -539,7 -539,7 +539,7 @@@
* @throws Exception on error
*/
@Test
-- @Ignore
++ @Disabled
public void testAddDisabledSchemaNoDeps() throws Exception
{
Dn dn = new Dn( "cn=dummy,ou=schema" );
@@@ -565,7 -565,7 +565,7 @@@
* @throws Exception on error
*/
@Test
-- @Ignore
++ @Disabled
public void testAddDisabledSchemaWithDeps() throws Exception
{
Dn dn = new Dn( "cn=dummy,ou=schema" );
@@@ -593,7 -593,7 +593,7 @@@
* @throws Exception on error
*/
@Test
-- @Ignore
++ @Disabled
public void testRejectDisabledSchemaAddWithMissingDeps() throws Exception
{
Dn dn = new Dn( "cn=dummy,ou=schema" );
@@@ -637,7 -637,7 +637,7 @@@
* @throws Exception on error
*/
@Test
-- @Ignore
++ @Disabled
public void testAddEnabledSchemaNoDeps() throws Exception
{
Dn dn = new Dn( "cn=dummy,ou=schema" );
@@@ -663,7 -663,7 +663,7 @@@
* @throws Exception on error
*/
@Test
-- @Ignore
++ @Disabled
public void testRejectEnabledSchemaAddWithDisabledDeps() throws Exception
{
Dn dn = new Dn( "cn=dummy,ou=schema" );
@@@ -709,7 -709,7 +709,7 @@@
* @throws Exception on error
*/
@Test
-- @Ignore
++ @Disabled
public void testDeleteSchemaNoDependents() throws Exception
{
Dn dn = new Dn( "cn=dummy,ou=schema" );
@@@ -730,7 -730,7 +730,7 @@@
* @throws Exception on error
*/
@Test
-- @Ignore
++ @Disabled
public void testRejectSchemaDeleteWithDependents() throws Exception
{
// add the dummy schema enabled
@@@ -763,7 -763,7 +763,7 @@@
* @throws Exception on error
*/
@Test
-- @Ignore
++ @Disabled
public void testRejectEnabledSchemaAddWithMisingDeps() throws Exception
{
Dn dn = new Dn( "cn=dummy,ou=schema" );
@@@ -807,7 -807,7 +807,7 @@@
* @throws Exception on error
*/
@Test
-- @Ignore
++ @Disabled
public void testDisableSchemaWithEnabledDependents() throws Exception
{
// let's enable the test schema and add the dummy schema
@@@ -870,7 -870,7 +870,7 @@@
* @throws Exception on error
*/
@Test
-- @Ignore
++ @Disabled
public void testSchemaRenameDisabledSchema() throws Exception
{
connection.rename( "cn=samba,ou=schema", "cn=foo" );
@@@ -904,7 -904,7 +904,7 @@@
* @throws Exception on error
*/
@Test
-- @Ignore
++ @Disabled
public void testRejectSchemaRenameWithDeps() throws Exception
{
try
@@@ -939,7 -939,7 +939,7 @@@
* @throws Exception on error
*/
@Test
-- @Ignore
++ @Disabled
public void testSchemaRenameEnabledSchema() throws Exception
{
IntegrationUtils.enableSchema( getService(), "samba" );
@@@ -973,7 -973,7 +973,7 @@@
* @throws Exception on error
*/
@Test
-- @Ignore
++ @Disabled
public void testRejectAddBogusDependency() throws Exception
{
try
@@@ -998,7 -998,7 +998,7 @@@
* @throws Exception on error
*/
@Test
-- @Ignore
++ @Disabled
public void testRejectAddOfDisabledDependencyToEnabledSchema() throws Exception
{
IntegrationUtils.enableSchema( getService(), "nis" );
@@@ -1023,7 -1023,7 +1023,7 @@@
* @throws Exception on error
*/
@Test
-- @Ignore
++ @Disabled
public void testAddOfDisabledDependencyToDisabledSchema() throws Exception
{
connection.modify( "cn=nis,ou=schema",
@@@ -1042,7 -1042,7 +1042,7 @@@
* @throws Exception on error
*/
@Test
-- @Ignore
++ @Disabled
public void testAddOfEnabledDependencyToDisabledSchema() throws Exception
{
connection.modify( "cn=nis,ou=schema",
diff --cc core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandlerIT.java
index e23d883,e23d883..edbc614
--- a/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandlerIT.java
+++ b/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandlerIT.java
@@@ -20,10 -20,10 +20,10 @@@
package org.apache.directory.server.core.schema;
--import static org.junit.Assert.assertEquals;
--import static org.junit.Assert.assertFalse;
--import static org.junit.Assert.assertTrue;
--import static org.junit.Assert.fail;
++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 static org.junit.jupiter.api.Assertions.fail;
import java.io.ByteArrayOutputStream;
import java.io.InputStream;
@@@ -42,12 -42,12 +42,12 @@@ import org.apache.directory.api.ldap.mo
import org.apache.directory.api.ldap.model.schema.syntaxCheckers.OctetStringSyntaxChecker;
import org.apache.directory.ldap.client.api.LdapConnection;
import org.apache.directory.server.core.annotations.CreateDS;
--import org.apache.directory.server.core.integ.FrameworkRunner;
++import org.apache.directory.server.core.integ.ApacheDSTestExtension;
import org.apache.directory.server.core.integ.IntegrationUtils;
--import org.junit.Before;
--import org.junit.Ignore;
--import org.junit.Test;
--import org.junit.runner.RunWith;
++import org.junit.jupiter.api.BeforeEach;
++import org.junit.jupiter.api.Disabled;
++import org.junit.jupiter.api.Test;
++import org.junit.jupiter.api.extension.ExtendWith;
/**
@@@ -56,7 -56,7 +56,7 @@@
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
--@RunWith(FrameworkRunner.class)
++@ExtendWith( ApacheDSTestExtension.class )
@CreateDS(name = "MetaSyntaxCheckerHandlerIT")
public class MetaSyntaxCheckerHandlerIT extends AbstractMetaSchemaObjectHandler
{
@@@ -67,7 -67,7 +67,7 @@@
private static SchemaManager schemaManager;
-- @Before
++ @BeforeEach
public void setup() throws Exception
{
super.init();
@@@ -120,8 -120,8 +120,8 @@@
// nis is by default inactive
connection.add( entry );
-- assertFalse( "adding new syntaxChecker to disabled schema should not register it into the registries",
-- schemaManager.getSyntaxCheckerRegistry().contains( OID ) );
++ assertFalse( schemaManager.getSyntaxCheckerRegistry().contains( OID ) ,
++ "adding new syntaxChecker to disabled schema should not register it into the registries" );
assertTrue( isOnDisk( dn ) );
}
@@@ -150,8 -150,8 +150,8 @@@
// Expected result.
}
-- assertFalse( "adding new syntaxChecker to disabled schema should not register it into the registries",
-- schemaManager.getSyntaxCheckerRegistry().contains( OID ) );
++ assertFalse( schemaManager.getSyntaxCheckerRegistry().contains( OID ) ,
++ "adding new syntaxChecker to disabled schema should not register it into the registries" );
assertFalse( isOnDisk( dn ) );
}
@@@ -230,14 -230,14 +230,14 @@@
testAddSyntaxCheckerToEnabledSchema();
-- assertTrue( "syntaxChecker should be removed from the registry after being deleted", schemaManager
-- .getSyntaxCheckerRegistry().contains( OID ) );
++ assertTrue( schemaManager.getSyntaxCheckerRegistry().contains( OID ) ,
++ "syntaxChecker should be removed from the registry after being deleted" );
assertTrue( isOnDisk( dn ) );
connection.delete( dn );
-- assertFalse( "syntaxChecker should be removed from the registry after being deleted", schemaManager
-- .getSyntaxCheckerRegistry().contains( OID ) );
++ assertFalse( schemaManager.getSyntaxCheckerRegistry().contains( OID ) ,
++ "syntaxChecker should be removed from the registry after being deleted" );
try
{
@@@ -259,14 -259,14 +259,14 @@@
testAddSyntaxCheckerToEnabledSchema();
-- assertTrue( "syntaxChecker should be removed from the registry after being deleted", schemaManager
-- .getSyntaxCheckerRegistry().contains( OID ) );
++ assertTrue( schemaManager.getSyntaxCheckerRegistry().contains( OID ) ,
++ "syntaxChecker should be removed from the registry after being deleted" );
assertTrue( isOnDisk( dn ) );
connection.delete( dn );
-- assertFalse( "syntaxChecker should be removed from the registry after being deleted", schemaManager
-- .getSyntaxCheckerRegistry().contains( OID ) );
++ assertFalse( schemaManager.getSyntaxCheckerRegistry().contains( OID ) ,
++ "syntaxChecker should be removed from the registry after being deleted" );
try
{
@@@ -282,7 -282,7 +282,7 @@@
@Test
-- @Ignore
++ @Disabled
public void testRenameSyntaxChecker() throws Exception
{
Dn dn = new Dn( "m-oid=" + OID + ",ou=syntaxCheckers,cn=apachemeta,ou=schema" );
@@@ -292,8 -292,8 +292,8 @@@
Rdn rdn = new Rdn( "m-oid=" + NEW_OID );
connection.rename( dn, rdn );
-- assertFalse( "old syntaxChecker OID should be removed from the registry after being renamed", schemaManager
-- .getSyntaxCheckerRegistry().contains( OID ) );
++ assertFalse( schemaManager.getSyntaxCheckerRegistry().contains( OID ) ,
++ "old syntaxChecker OID should be removed from the registry after being renamed" );
//noinspection EmptyCatchBlock
try
@@@ -312,7 -312,7 +312,7 @@@
@Test
-- @Ignore
++ @Disabled
public void testMoveSyntaxChecker() throws Exception
{
testAddSyntaxCheckerToEnabledSchema();
@@@ -323,8 -323,8 +323,8 @@@
connection.move( dn, newDn );
-- assertTrue( "syntaxChecker OID should still be present", schemaManager.getSyntaxCheckerRegistry()
-- .contains( OID ) );
++ assertTrue( schemaManager.getSyntaxCheckerRegistry().contains( OID ) ,
++ "syntaxChecker OID should still be present" );
assertEquals( "syntaxChecker schema should be set to apache not apachemeta", "apache",
schemaManager.getSyntaxCheckerRegistry().getSchemaName( OID ) );
@@@ -335,7 -335,7 +335,7 @@@
@Test
-- @Ignore
++ @Disabled
public void testMoveSyntaxCheckerAndChangeRdn() throws Exception
{
testAddSyntaxCheckerToEnabledSchema();
@@@ -346,11 -346,11 +346,11 @@@
connection.moveAndRename( dn, newDn );
-- assertFalse( "old syntaxChecker OID should NOT be present", schemaManager.getSyntaxCheckerRegistry().contains(
-- OID ) );
++ assertFalse( schemaManager.getSyntaxCheckerRegistry().contains(OID ) ,
++ "old syntaxChecker OID should NOT be present" );
-- assertTrue( "new syntaxChecker OID should be present", schemaManager.getSyntaxCheckerRegistry().contains(
-- NEW_OID ) );
++ assertTrue( schemaManager.getSyntaxCheckerRegistry().contains(NEW_OID ) ,
++ "new syntaxChecker OID should be present" );
assertEquals( "syntaxChecker with new oid should have schema set to apache NOT apachemeta", "apache",
schemaManager.getSyntaxCheckerRegistry().getSchemaName( NEW_OID ) );
@@@ -361,7 -361,7 +361,7 @@@
@Test
-- @Ignore
++ @Disabled
public void testModifySyntaxCheckerWithModificationItems() throws Exception
{
testAddSyntaxCheckerToEnabledSchema();
@@@ -372,8 -372,8 +372,8 @@@
ModificationOperation.REPLACE_ATTRIBUTE, "m-fqcn", BogusSyntaxChecker.class.getName() );
connection.modify( dn, mod );
-- assertTrue( "syntaxChecker OID should still be present", schemaManager.getSyntaxCheckerRegistry()
-- .contains( OID ) );
++ assertTrue( schemaManager.getSyntaxCheckerRegistry().contains( OID ) ,
++ "syntaxChecker OID should still be present" );
assertEquals( "syntaxChecker schema should be set to apachemeta", "apachemeta",
schemaManager.getSyntaxCheckerRegistry().getSchemaName( OID ) );
@@@ -384,7 -384,7 +384,7 @@@
@Test
-- @Ignore
++ @Disabled
public void testModifySyntaxCheckerWithAttributes() throws Exception
{
testAddSyntaxCheckerToEnabledSchema();
@@@ -395,8 -395,8 +395,8 @@@
ModificationOperation.REPLACE_ATTRIBUTE, "m-fqcn", BogusSyntaxChecker.class.getName() );
connection.modify( dn, mod );
-- assertTrue( "syntaxChecker OID should still be present", schemaManager.getSyntaxCheckerRegistry()
-- .contains( OID ) );
++ assertTrue( schemaManager.getSyntaxCheckerRegistry().contains( OID ) ,
++ "syntaxChecker OID should still be present" );
assertEquals( "syntaxChecker schema should be set to apachemeta", "apachemeta",
schemaManager.getSyntaxCheckerRegistry().getSchemaName( OID ) );
@@@ -450,13 -450,13 +450,13 @@@
{
}
-- assertTrue( "syntaxChecker should still be in the registry after delete failure", schemaManager
-- .getSyntaxCheckerRegistry().contains( OID ) );
++ assertTrue( schemaManager.getSyntaxCheckerRegistry().contains( OID ) ,
++ "syntaxChecker should still be in the registry after delete failure" );
}
@Test
-- @Ignore
++ @Disabled
public void testMoveSyntaxCheckerWhenInUse() throws Exception
{
testAddSyntaxCheckerToEnabledSchema();
@@@ -474,15 -474,15 +474,15 @@@
{
}
-- assertTrue( "syntaxChecker should still be in the registry after move failure", schemaManager
-- .getSyntaxCheckerRegistry().contains( OID ) );
++ assertTrue( schemaManager.getSyntaxCheckerRegistry().contains( OID ) ,
++ "syntaxChecker should still be in the registry after move failure" );
schemaManager.getLdapSyntaxRegistry().unregister( OID );
schemaManager.getGlobalOidRegistry().unregister( OID );
}
@Test
-- @Ignore
++ @Disabled
public void testMoveSyntaxCheckerAndChangeRdnWhenInUse() throws Exception
{
testAddSyntaxCheckerToEnabledSchema();
@@@ -500,15 -500,15 +500,15 @@@
{
}
-- assertTrue( "syntaxChecker should still be in the registry after move failure", schemaManager
-- .getSyntaxCheckerRegistry().contains( OID ) );
++ assertTrue( schemaManager.getSyntaxCheckerRegistry().contains( OID ) ,
++ "syntaxChecker should still be in the registry after move failure" );
schemaManager.getLdapSyntaxRegistry().unregister( OID );
schemaManager.getGlobalOidRegistry().unregister( OID );
}
@Test
-- @Ignore
++ @Disabled
public void testRenameSyntaxCheckerWhenInUse() throws Exception
{
Dn dn = new Dn( "m-oid=" + OID + ",ou=syntaxCheckers,cn=apachemeta,ou=schema" );
@@@ -527,8 -527,8 +527,8 @@@
{
}
-- assertTrue( "syntaxChecker should still be in the registry after rename failure", schemaManager
-- .getSyntaxCheckerRegistry().contains( OID ) );
++ assertTrue( schemaManager.getSyntaxCheckerRegistry().contains( OID ) ,
++ "syntaxChecker should still be in the registry after rename failure" );
schemaManager.getLdapSyntaxRegistry().unregister( OID );
schemaManager.getGlobalOidRegistry().unregister( OID );
}
@@@ -539,7 -539,7 +539,7 @@@
// ----------------------------------------------------------------------
@Test
-- @Ignore
++ @Disabled
public void testMoveSyntaxCheckerToTop() throws Exception
{
testAddSyntaxCheckerToEnabledSchema();
@@@ -557,13 -557,13 +557,13 @@@
{
}
-- assertTrue( "syntaxChecker should still be in the registry after move failure", schemaManager
-- .getSyntaxCheckerRegistry().contains( OID ) );
++ assertTrue( schemaManager.getSyntaxCheckerRegistry().contains( OID ) ,
++ "syntaxChecker should still be in the registry after move failure" );
}
@Test
-- @Ignore
++ @Disabled
public void testMoveSyntaxCheckerToComparatorContainer() throws Exception
{
testAddSyntaxCheckerToEnabledSchema();
@@@ -581,13 -581,13 +581,13 @@@
{
}
-- assertTrue( "syntaxChecker should still be in the registry after move failure", schemaManager
-- .getSyntaxCheckerRegistry().contains( OID ) );
++ assertTrue( schemaManager.getSyntaxCheckerRegistry().contains( OID ) ,
++ "syntaxChecker should still be in the registry after move failure" );
}
@Test
-- @Ignore
++ @Disabled
public void testMoveSyntaxCheckerToDisabledSchema() throws Exception
{
testAddSyntaxCheckerToEnabledSchema();
@@@ -599,13 -599,13 +599,13 @@@
connection.move( dn, newDn );
-- assertFalse( "syntaxChecker OID should no longer be present", schemaManager.getSyntaxCheckerRegistry()
-- .contains( OID ) );
++ assertFalse( schemaManager.getSyntaxCheckerRegistry().contains( OID ) ,
++ "syntaxChecker OID should no longer be present" );
}
@Test
-- @Ignore
++ @Disabled
public void testMoveSyntaxCheckerToEnabledSchema() throws Exception
{
testAddSyntaxCheckerToDisabledSchema();
@@@ -613,15 -613,15 +613,15 @@@
// nis is inactive by default
Dn dn = new Dn( "m-oid=" + OID + ",ou=syntaxCheckers,cn=nis,ou=schema" );
-- assertFalse( "syntaxChecker OID should NOT be present when added to disabled nis schema", schemaManager
-- .getSyntaxCheckerRegistry().contains( OID ) );
++ assertFalse( schemaManager.getSyntaxCheckerRegistry().contains( OID ) ,
++ "syntaxChecker OID should NOT be present when added to disabled nis schema" );
Dn newDn = new Dn( "m-oid=" + OID + ",ou=syntaxCheckers,cn=apachemeta,ou=schema" );
connection.move( dn, newDn );
-- assertTrue( "syntaxChecker OID should be present when moved to enabled schema", schemaManager
-- .getSyntaxCheckerRegistry().contains( OID ) );
++ assertTrue( schemaManager.getSyntaxCheckerRegistry().contains( OID ) ,
++ "syntaxChecker OID should be present when moved to enabled schema" );
assertEquals( "syntaxChecker should be in apachemeta schema after move", "apachemeta",
schemaManager.getSyntaxCheckerRegistry().getSchemaName( OID ) );
diff --cc core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxHandlerIT.java
index 6daa990,6daa990..7bfa99e
--- a/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxHandlerIT.java
+++ b/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxHandlerIT.java
@@@ -20,10 -20,10 +20,10 @@@
package org.apache.directory.server.core.schema;
--import static org.junit.Assert.assertEquals;
--import static org.junit.Assert.assertFalse;
--import static org.junit.Assert.assertTrue;
--import static org.junit.Assert.fail;
++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 static org.junit.jupiter.api.Assertions.fail;
import java.util.ArrayList;
import java.util.List;
@@@ -46,12 -46,12 +46,12 @@@ import org.apache.directory.api.ldap.mo
import org.apache.directory.api.ldap.model.schema.syntaxCheckers.OctetStringSyntaxChecker;
import org.apache.directory.ldap.client.api.LdapConnection;
import org.apache.directory.server.core.annotations.CreateDS;
--import org.apache.directory.server.core.integ.FrameworkRunner;
++import org.apache.directory.server.core.integ.ApacheDSTestExtension;
import org.apache.directory.server.core.integ.IntegrationUtils;
--import org.junit.Before;
--import org.junit.Ignore;
--import org.junit.Test;
--import org.junit.runner.RunWith;
++import org.junit.jupiter.api.BeforeEach;
++import org.junit.jupiter.api.Disabled;
++import org.junit.jupiter.api.Test;
++import org.junit.jupiter.api.extension.ExtendWith;
/**
@@@ -60,7 -60,7 +60,7 @@@
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
--@RunWith(FrameworkRunner.class)
++@ExtendWith( ApacheDSTestExtension.class )
@CreateDS(name = "MetaSyntaxHandlerIT")
public class MetaSyntaxHandlerIT extends AbstractMetaSchemaObjectHandler
{
@@@ -79,7 -79,7 +79,7 @@@
private static LdapConnection connection;
-- @Before
++ @BeforeEach
public void setup() throws Exception
{
super.init();
@@@ -129,8 -129,8 +129,8 @@@
createDummySyntaxChecker( OID, "nis" );
connection.add( entry );
-- assertFalse( "adding new syntax to disabled schema should not register it into the registries",
-- schemaManager.getLdapSyntaxRegistry().contains( OID ) );
++ assertFalse( schemaManager.getLdapSyntaxRegistry().contains( OID ) ,
++ "adding new syntax to disabled schema should not register it into the registries" );
assertTrue( isOnDisk( dn ) );
}
@@@ -160,8 -160,8 +160,8 @@@
// Expected result.
}
-- assertFalse( "adding new syntax to disabled schema should not register it into the registries",
-- schemaManager.getLdapSyntaxRegistry().contains( OID ) );
++ assertFalse( schemaManager.getLdapSyntaxRegistry().contains( OID ) ,
++ "adding new syntax to disabled schema should not register it into the registries" );
assertFalse( isOnDisk( dn ) );
}
@@@ -174,13 -174,13 +174,13 @@@
testAddSyntaxToEnabledSchema();
assertTrue( isOnDisk( dn ) );
-- assertTrue( "syntax should be removed from the registry after being deleted",
-- schemaManager.getLdapSyntaxRegistry().contains( OID ) );
++ assertTrue( schemaManager.getLdapSyntaxRegistry().contains( OID ) ,
++ "syntax should be removed from the registry after being deleted" );
connection.delete( dn );
-- assertFalse( "syntax should be removed from the registry after being deleted",
-- schemaManager.getLdapSyntaxRegistry().contains( OID ) );
++ assertFalse( schemaManager.getLdapSyntaxRegistry().contains( OID ) ,
++ "syntax should be removed from the registry after being deleted" );
try
{
@@@ -203,13 -203,13 +203,13 @@@
testAddSyntaxToDisabledSchema();
assertTrue( isOnDisk( dn ) );
-- assertFalse( "syntax should be removed from the registry after being deleted",
-- schemaManager.getLdapSyntaxRegistry().contains( OID ) );
++ assertFalse( schemaManager.getLdapSyntaxRegistry().contains( OID ) ,
++ "syntax should be removed from the registry after being deleted" );
connection.delete( dn );
-- assertFalse( "syntax should be removed from the registry after being deleted",
-- schemaManager.getLdapSyntaxRegistry().contains( OID ) );
++ assertFalse( schemaManager.getLdapSyntaxRegistry().contains( OID ) ,
++ "syntax should be removed from the registry after being deleted" );
try
{
@@@ -225,7 -225,7 +225,7 @@@
@Test
-- @Ignore
++ @Disabled
public void testRenameSyntax() throws Exception
{
Dn dn = new Dn( "m-oid=" + OID + ",ou=syntaxes,cn=apachemeta,ou=schema" );
@@@ -236,8 -236,8 +236,8 @@@
connection.rename( dn, rdn );
-- assertFalse( "old syntax OID should be removed from the registry after being renamed",
-- schemaManager.getLdapSyntaxRegistry().contains( OID ) );
++ assertFalse( schemaManager.getLdapSyntaxRegistry().contains( OID ) ,
++ "old syntax OID should be removed from the registry after being renamed" );
//noinspection EmptyCatchBlock
try
@@@ -254,7 -254,7 +254,7 @@@
@Test
-- @Ignore
++ @Disabled
public void testMoveSyntax() throws Exception
{
testAddSyntaxToEnabledSchema();
@@@ -265,8 -265,8 +265,8 @@@
connection.move( dn, newDn );
-- assertTrue( "syntax OID should still be present",
-- schemaManager.getLdapSyntaxRegistry().contains( OID ) );
++ assertTrue( schemaManager.getLdapSyntaxRegistry().contains( OID ) ,
++ "syntax OID should still be present" );
assertEquals( "syntax schema should be set to apache not apachemeta", "apache",
schemaManager.getLdapSyntaxRegistry().getSchemaName( OID ) );
@@@ -274,7 -274,7 +274,7 @@@
@Test
-- @Ignore
++ @Disabled
public void testMoveSyntaxAndChangeRdn() throws Exception
{
testAddSyntaxToEnabledSchema();
@@@ -285,11 -285,11 +285,11 @@@
connection.move( dn, newDn );
-- assertFalse( "old syntax OID should NOT be present",
-- schemaManager.getLdapSyntaxRegistry().contains( OID ) );
++ assertFalse( schemaManager.getLdapSyntaxRegistry().contains( OID ) ,
++ "old syntax OID should NOT be present" );
-- assertTrue( "new syntax OID should be present",
-- schemaManager.getLdapSyntaxRegistry().contains( NEW_OID ) );
++ assertTrue( schemaManager.getLdapSyntaxRegistry().contains( NEW_OID ) ,
++ "new syntax OID should be present" );
assertEquals( "syntax with new oid should have schema set to apache NOT apachemeta", "apache",
schemaManager.getLdapSyntaxRegistry().getSchemaName( NEW_OID ) );
@@@ -297,7 -297,7 +297,7 @@@
@Test
-- @Ignore
++ @Disabled
public void testModifySyntaxWithModificationItems() throws Exception
{
testAddSyntaxToEnabledSchema();
@@@ -311,8 -311,8 +311,8 @@@
ModificationOperation.REPLACE_ATTRIBUTE, "m-description", DESCRIPTION1 );
connection.modify( dn, mod );
-- assertTrue( "syntax OID should still be present",
-- schemaManager.getLdapSyntaxRegistry().contains( OID ) );
++ assertTrue( schemaManager.getLdapSyntaxRegistry().contains( OID ) ,
++ "syntax OID should still be present" );
assertEquals( "syntax schema should be set to apachemeta", "apachemeta",
schemaManager.getLdapSyntaxRegistry().getSchemaName( OID ) );
@@@ -323,7 -323,7 +323,7 @@@
@Test
-- @Ignore
++ @Disabled
public void testModifySyntaxWithAttributes() throws Exception
{
testAddSyntaxToEnabledSchema();
@@@ -337,8 -337,8 +337,8 @@@
ModificationOperation.REPLACE_ATTRIBUTE, "m-description", DESCRIPTION1 );
connection.modify( dn, mod );
-- assertTrue( "syntax OID should still be present",
-- schemaManager.getLdapSyntaxRegistry().contains( OID ) );
++ assertTrue( schemaManager.getLdapSyntaxRegistry().contains( OID ) ,
++ "syntax OID should still be present" );
assertEquals( "syntax schema should be set to apachemeta", "apachemeta",
schemaManager.getLdapSyntaxRegistry().getSchemaName( OID ) );
@@@ -369,13 -369,13 +369,13 @@@
{
}
-- assertTrue( "syntax should still be in the registry after delete failure",
-- schemaManager.getLdapSyntaxRegistry().contains( OID ) );
++ assertTrue( schemaManager.getLdapSyntaxRegistry().contains( OID ) ,
++ "syntax should still be in the registry after delete failure" );
}
@Test
-- @Ignore
++ @Disabled
public void testMoveSyntaxWhenInUse() throws Exception
{
testAddSyntaxToEnabledSchema();
@@@ -395,13 -395,13 +395,13 @@@
assertEquals( ResultCodeEnum.UNWILLING_TO_PERFORM, e.getResultCode() );
}
-- assertTrue( "syntax should still be in the registry after move failure",
-- schemaManager.getLdapSyntaxRegistry().contains( OID ) );
++ assertTrue( schemaManager.getLdapSyntaxRegistry().contains( OID ) ,
++ "syntax should still be in the registry after move failure" );
}
@Test
-- @Ignore
++ @Disabled
public void testMoveSyntaxAndChangeRdnWhenInUse() throws Exception
{
testAddSyntaxToEnabledSchema();
@@@ -421,8 -421,8 +421,8 @@@
assertEquals( ResultCodeEnum.UNWILLING_TO_PERFORM, e.getResultCode() );
}
-- assertTrue( "syntax should still be in the registry after move failure",
-- schemaManager.getLdapSyntaxRegistry().contains( OID ) );
++ assertTrue( schemaManager.getLdapSyntaxRegistry().contains( OID ) ,
++ "syntax should still be in the registry after move failure" );
}
@@@ -447,7 -447,7 +447,7 @@@
@Test
-- @Ignore
++ @Disabled
public void testRenameNormalizerWhenInUse() throws Exception
{
Dn dn = new Dn( "m-oid=" + OID + ",ou=syntaxes,cn=apachemeta,ou=schema" );
@@@ -467,8 -467,8 +467,8 @@@
assertEquals( ResultCodeEnum.UNWILLING_TO_PERFORM, e.getResultCode() );
}
-- assertTrue( "syntax should still be in the registry after rename failure",
-- schemaManager.getLdapSyntaxRegistry().contains( OID ) );
++ assertTrue( schemaManager.getLdapSyntaxRegistry().contains( OID ) ,
++ "syntax should still be in the registry after rename failure" );
}
@@@ -477,7 -477,7 +477,7 @@@
// ----------------------------------------------------------------------
@Test
-- @Ignore
++ @Disabled
public void testMoveSyntaxToTop() throws Exception
{
testAddSyntaxToEnabledSchema();
@@@ -496,13 -496,13 +496,13 @@@
assertEquals( ResultCodeEnum.NAMING_VIOLATION, e.getResultCode() );
}
-- assertTrue( "syntax should still be in the registry after move failure",
-- schemaManager.getLdapSyntaxRegistry().contains( OID ) );
++ assertTrue( schemaManager.getLdapSyntaxRegistry().contains( OID ) ,
++ "syntax should still be in the registry after move failure" );
}
@Test
-- @Ignore
++ @Disabled
public void testMoveSyntaxToComparatorContainer() throws Exception
{
testAddSyntaxToEnabledSchema();
@@@ -521,13 -521,13 +521,13 @@@
assertEquals( ResultCodeEnum.NAMING_VIOLATION, e.getResultCode() );
}
-- assertTrue( "syntax should still be in the registry after move failure",
-- schemaManager.getLdapSyntaxRegistry().contains( OID ) );
++ assertTrue( schemaManager.getLdapSyntaxRegistry().contains( OID ) ,
++ "syntax should still be in the registry after move failure" );
}
@Test
-- @Ignore
++ @Disabled
public void testMoveSyntaxToDisabledSchema() throws Exception
{
testAddSyntaxToEnabledSchema();
@@@ -539,13 -539,13 +539,13 @@@
connection.move( dn, newDn );
-- assertFalse( "syntax OID should no longer be present",
-- schemaManager.getLdapSyntaxRegistry().contains( OID ) );
++ assertFalse( schemaManager.getLdapSyntaxRegistry().contains( OID ) ,
++ "syntax OID should no longer be present" );
}
@Test
-- @Ignore
++ @Disabled
public void testMoveSyntaxToEnabledSchema() throws Exception
{
testAddSyntaxToDisabledSchema();
@@@ -553,15 -553,15 +553,15 @@@
// nis is inactive by default
Dn dn = new Dn( "m-oid=" + OID + ",ou=syntaxes,cn=nis,ou=schema" );
-- assertFalse( "syntax OID should NOT be present when added to disabled nis schema",
-- schemaManager.getLdapSyntaxRegistry().contains( OID ) );
++ assertFalse( schemaManager.getLdapSyntaxRegistry().contains( OID ) ,
++ "syntax OID should NOT be present when added to disabled nis schema" );
Dn newDn = new Dn( "m-oid=" + OID + ",ou=syntaxes,cn=apachemeta,ou=schema" );
connection.move( dn, newDn );
-- assertTrue( "syntax OID should be present when moved to enabled schema",
-- schemaManager.getLdapSyntaxRegistry().contains( OID ) );
++ assertTrue( schemaManager.getLdapSyntaxRegistry().contains( OID ) ,
++ "syntax OID should be present when moved to enabled schema" );
assertEquals( "syntax should be in apachemeta schema after move", "apachemeta",
schemaManager.getLdapSyntaxRegistry().getSchemaName( OID ) );
diff --cc core-integ/src/test/java/org/apache/directory/server/core/schema/ObjectClassCreateIT.java
index c3ebd56,c3ebd56..8215bc5
--- a/core-integ/src/test/java/org/apache/directory/server/core/schema/ObjectClassCreateIT.java
+++ b/core-integ/src/test/java/org/apache/directory/server/core/schema/ObjectClassCreateIT.java
@@@ -22,10 -22,10 +22,10 @@@ package org.apache.directory.server.cor
import static org.apache.directory.server.core.integ.IntegrationUtils.getSchemaContext;
import static org.apache.directory.server.core.integ.IntegrationUtils.getSystemContext;
--import static org.junit.Assert.assertEquals;
--import static org.junit.Assert.assertFalse;
--import static org.junit.Assert.assertTrue;
--import static org.junit.Assert.fail;
++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 static org.junit.jupiter.api.Assertions.fail;
import javax.naming.NamingEnumeration;
import javax.naming.NamingException;
@@@ -43,12 -43,12 +43,12 @@@ import org.apache.directory.api.ldap.mo
import org.apache.directory.api.ldap.util.JndiUtils;
import org.apache.directory.server.core.annotations.CreateDS;
import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
--import org.apache.directory.server.core.integ.FrameworkRunner;
--import org.junit.Test;
--import org.junit.runner.RunWith;
++import org.apache.directory.server.core.integ.ApacheDSTestExtension;
++import org.junit.jupiter.api.Test;
++import org.junit.jupiter.api.extension.ExtendWith;
--@RunWith(FrameworkRunner.class)
++@ExtendWith( ApacheDSTestExtension.class )
@CreateDS(name = "ObjectClassCreateIT")
public class ObjectClassCreateIT extends AbstractLdapTestUnit
{
diff --cc core-integ/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderIT.java
index 185d32e,185d32e..9524ea4
--- a/core-integ/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderIT.java
+++ b/core-integ/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderIT.java
@@@ -20,10 -20,10 +20,10 @@@
package org.apache.directory.server.core.schema;
--import static org.junit.Assert.assertEquals;
--import static org.junit.Assert.assertFalse;
--import static org.junit.Assert.assertNotNull;
--import static org.junit.Assert.fail;
++import static org.junit.jupiter.api.Assertions.assertEquals;
++import static org.junit.jupiter.api.Assertions.assertFalse;
++import static org.junit.jupiter.api.Assertions.assertNotNull;
++import static org.junit.jupiter.api.Assertions.fail;
import java.io.File;
diff --cc core-integ/src/test/java/org/apache/directory/server/core/schema/SchemaPersistenceIT.java
index 7193795,7193795..3d5004f
--- a/core-integ/src/test/java/org/apache/directory/server/core/schema/SchemaPersistenceIT.java
+++ b/core-integ/src/test/java/org/apache/directory/server/core/schema/SchemaPersistenceIT.java
@@@ -22,12 -22,12 +22,12 @@@ package org.apache.directory.server.cor
import static org.apache.directory.server.core.integ.IntegrationUtils.getRootContext;
import static org.apache.directory.server.core.integ.IntegrationUtils.getSchemaContext;
--import static org.junit.Assert.assertEquals;
--import static org.junit.Assert.assertFalse;
--import static org.junit.Assert.assertNotNull;
--import static org.junit.Assert.assertNull;
--import static org.junit.Assert.assertTrue;
--import static org.junit.Assert.fail;
++import static org.junit.jupiter.api.Assertions.assertEquals;
++import static org.junit.jupiter.api.Assertions.assertFalse;
++import static org.junit.jupiter.api.Assertions.assertNotNull;
++import static org.junit.jupiter.api.Assertions.assertNull;
++import static org.junit.jupiter.api.Assertions.assertTrue;
++import static org.junit.jupiter.api.Assertions.fail;
import java.util.ArrayList;
import java.util.List;
@@@ -53,11 -53,11 +53,11 @@@ import org.apache.directory.api.ldap.ut
import org.apache.directory.ldap.client.api.LdapConnection;
import org.apache.directory.server.core.annotations.CreateDS;
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.directory.server.core.integ.IntegrationUtils;
--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;
/**
@@@ -66,7 -66,7 +66,7 @@@
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
--@RunWith(FrameworkRunner.class)
++@ExtendWith( ApacheDSTestExtension.class )
@CreateDS(name = "SchemaPersistenceIT-class")
public class SchemaPersistenceIT extends AbstractLdapTestUnit
{
@@@ -76,7 -76,7 +76,7 @@@
private static LdapConnection connection;
-- @Before
++ @BeforeEach
public void setup() throws Exception
{
connection = IntegrationUtils.getAdminConnection( getService() );
diff --cc core-integ/src/test/java/org/apache/directory/server/core/schema/SchemaServiceIT.java
index c5d1aa5,c5d1aa5..4c37483
--- a/core-integ/src/test/java/org/apache/directory/server/core/schema/SchemaServiceIT.java
+++ b/core-integ/src/test/java/org/apache/directory/server/core/schema/SchemaServiceIT.java
@@@ -23,12 -23,12 +23,12 @@@ package org.apache.directory.server.cor
import static org.apache.directory.server.core.integ.IntegrationUtils.getRootContext;
import static org.apache.directory.server.core.integ.IntegrationUtils.getSchemaContext;
import static org.apache.directory.server.core.integ.IntegrationUtils.getSystemContext;
--import static org.junit.Assert.assertEquals;
--import static org.junit.Assert.assertFalse;
--import static org.junit.Assert.assertNotNull;
--import static org.junit.Assert.assertNull;
--import static org.junit.Assert.assertTrue;
--import static org.junit.Assert.fail;
++import static org.junit.jupiter.api.Assertions.assertEquals;
++import static org.junit.jupiter.api.Assertions.assertFalse;
++import static org.junit.jupiter.api.Assertions.assertNotNull;
++import static org.junit.jupiter.api.Assertions.assertNull;
++import static org.junit.jupiter.api.Assertions.assertTrue;
++import static org.junit.jupiter.api.Assertions.fail;
import java.io.StringReader;
import java.util.ArrayList;
@@@ -60,9 -60,9 +60,9 @@@ import org.apache.directory.api.ldap.ut
import org.apache.directory.server.core.annotations.ApplyLdifs;
import org.apache.directory.server.core.annotations.CreateDS;
import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
--import org.apache.directory.server.core.integ.FrameworkRunner;
--import org.junit.Test;
--import org.junit.runner.RunWith;
++import org.apache.directory.server.core.integ.ApacheDSTestExtension;
++import org.junit.jupiter.api.Test;
++import org.junit.jupiter.api.extension.ExtendWith;
/**
@@@ -90,7 -90,7 +90,7 @@@
"objectClass: inetOrgPerson",
"cn: person2",
"sn: sn_person2" })
--@RunWith(FrameworkRunner.class)
++@ExtendWith( ApacheDSTestExtension.class )
@CreateDS(name = "SchemaServiceIT")
public class SchemaServiceIT extends AbstractLdapTestUnit
{
@@@ -969,19 -969,19 +969,19 @@@
SearchControls controls = new SearchControls();
controls.setSearchScope( SearchControls.SUBTREE_SCOPE );
NamingEnumeration<SearchResult> results = schemaRoot.search( "", "(objectClass=top)", controls );
-- assertTrue( "Expected some results", results.hasMore() );
++ assertTrue( results.hasMore() , "Expected some results" );
results.close();
controls = new SearchControls();
controls.setSearchScope( SearchControls.SUBTREE_SCOPE );
results = schemaRoot.search( "", "(objectClass=metaAttributeType)", controls );
-- assertTrue( "Expected some results", results.hasMore() );
++ assertTrue( results.hasMore() , "Expected some results" );
results.close();
controls = new SearchControls();
controls.setSearchScope( SearchControls.SUBTREE_SCOPE );
results = schemaRoot.search( "", "(objectClass=metaTop)", controls );
-- assertTrue( "Expected some results", results.hasMore() );
++ assertTrue( results.hasMore() , "Expected some results" );
results.close();
}
diff --cc core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java
index b0db6b1,b0db6b1..658abbc
--- a/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java
+++ b/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java
@@@ -20,12 -20,12 +20,12 @@@
package org.apache.directory.server.core.schema;
--import static org.junit.Assert.assertEquals;
--import static org.junit.Assert.assertFalse;
--import static org.junit.Assert.assertNotNull;
--import static org.junit.Assert.assertNull;
--import static org.junit.Assert.assertTrue;
--import static org.junit.Assert.fail;
++import static org.junit.jupiter.api.Assertions.assertEquals;
++import static org.junit.jupiter.api.Assertions.assertFalse;
++import static org.junit.jupiter.api.Assertions.assertNotNull;
++import static org.junit.jupiter.api.Assertions.assertNull;
++import static org.junit.jupiter.api.Assertions.assertTrue;
++import static org.junit.jupiter.api.Assertions.fail;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
@@@ -79,12 -79,12 +79,13 @@@ import org.apache.directory.api.util.Da
import org.apache.directory.ldap.client.api.LdapConnection;
import org.apache.directory.server.core.annotations.CreateDS;
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.directory.server.core.integ.IntegrationUtils;
--import org.junit.Before;
--import org.junit.Ignore;
--import org.junit.Test;
--import org.junit.runner.RunWith;
++import org.junit.jupiter.api.Assertions;
++import org.junit.jupiter.api.BeforeEach;
++import org.junit.jupiter.api.Disabled;
++import org.junit.jupiter.api.Test;
++import org.junit.jupiter.api.extension.ExtendWith;
/**
@@@ -93,7 -93,7 +94,7 @@@
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
--@RunWith(FrameworkRunner.class)
++@ExtendWith( ApacheDSTestExtension.class )
@CreateDS(name = "SubschemaSubentryIT-class")
public class SubschemaSubentryIT extends AbstractLdapTestUnit
{
@@@ -113,7 -113,7 +114,7 @@@
private Entry subschemaSubentry;
-- @Before
++ @BeforeEach
public void init() throws Exception
{
connection = IntegrationUtils.getAdminConnection( getService() );
@@@ -161,11 -161,11 +162,14 @@@
*
* @throws NamingException on error
*/
-- @Test(expected = LdapException.class)
++ @Test
public void testSSSEDeleteRejection() throws Exception
{
-- connection.delete( subschemaSubentryDn );
-- fail( "You are not allowed to delete the global schema subentry" );
++ Assertions.assertThrows( LdapException.class, () ->
++ {
++ connection.delete( subschemaSubentryDn );
++ fail( "You are not allowed to delete the global schema subentry" );
++ } );
}
@@@ -174,11 -174,11 +178,14 @@@
*
* @throws NamingException on error
*/
-- @Test(expected = LdapException.class)
++ @Test
public void testSSSEAddRejection() throws Exception
{
-- connection.add( subschemaSubentry );
-- fail( "You are not allowed to add the global schema subentry which exists by default" );
++ Assertions.assertThrows( LdapException.class, () ->
++ {
++ connection.add( subschemaSubentry );
++ fail( "You are not allowed to add the global schema subentry which exists by default" );
++ } );
}
@@@ -187,11 -187,11 +194,14 @@@
*
* @throws NamingException on error
*/
-- @Test(expected = LdapException.class)
++ @Test
public void testSSSERenameRejection() throws Exception
{
-- connection.rename( subschemaSubentryDn, "cn=schema,ou=system" );
-- fail( "You are not allowed to rename the global schema subentry which is fixed" );
++ Assertions.assertThrows( LdapException.class, () ->
++ {
++ connection.rename( subschemaSubentryDn, "cn=schema,ou=system" );
++ fail( "You are not allowed to rename the global schema subentry which is fixed" );
++ } );
}
@@@ -1436,17 -1436,17 +1446,20 @@@
*
* @throws Exception on error
*/
-- @Test(expected = LdapInvalidAttributeValueException.class)
++ @Test
public void testAddAttributeTypeWithUnderscoresOnEnabledSchema() throws Exception
{
-- enableSchema( "nis" );
-- Dn dn = new Dn( subschemaSubentryDn );
-- String substrate = "( 1.3.6.1.4.1.18060.0.4.0.2.10000 NAME ( 'bogus' 'bogus_microsoft_name' ) "
-- + "DESC 'bogus description' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SUP name SINGLE-VALUE X-SCHEMA 'nis' )";
-- Modification mod = new DefaultModification(
-- ModificationOperation.ADD_ATTRIBUTE, new DefaultAttribute( "attributeTypes", substrate ) );
--
-- connection.modify( dn, mod );
++ Assertions.assertThrows( LdapInvalidAttributeValueException.class, () ->
++ {
++ enableSchema( "nis" );
++ Dn dn = new Dn( subschemaSubentryDn );
++ String substrate = "( 1.3.6.1.4.1.18060.0.4.0.2.10000 NAME ( 'bogus' 'bogus_microsoft_name' ) "
++ + "DESC 'bogus description' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SUP name SINGLE-VALUE X-SCHEMA 'nis' )";
++ Modification mod = new DefaultModification(
++ ModificationOperation.ADD_ATTRIBUTE, new DefaultAttribute( "attributeTypes", substrate ) );
++
++ connection.modify( dn, mod );
++ } );
}
@@@ -1843,7 -1843,7 +1856,7 @@@
* @throws NamingException on error
*/
@Test
-- @Ignore("The test is failing when run in conjonction with other tests")
++ @Disabled("The test is failing when run in conjonction with other tests")
// @TODO as we can't modify a schema element, the end of this test has been commented
public void testTimestampAndModifierUpdates() throws Exception, InterruptedException
{
diff --cc core-integ/src/test/java/org/apache/directory/server/core/sp/LdapClassLoaderIT.java
index c818fe0,c818fe0..68f4514
--- a/core-integ/src/test/java/org/apache/directory/server/core/sp/LdapClassLoaderIT.java
+++ b/core-integ/src/test/java/org/apache/directory/server/core/sp/LdapClassLoaderIT.java
@@@ -22,8 -22,8 +22,8 @@@ package org.apache.directory.server.cor
import static org.apache.directory.server.core.integ.IntegrationUtils.getRootContext;
--import static org.junit.Assert.assertEquals;
--import static org.junit.Assert.assertNotNull;
++import static org.junit.jupiter.api.Assertions.assertEquals;
++import static org.junit.jupiter.api.Assertions.assertNotNull;
import javax.naming.directory.Attribute;
import javax.naming.directory.Attributes;
@@@ -35,11 -35,11 +35,11 @@@ import org.apache.directory.api.util.Ba
import org.apache.directory.server.core.annotations.CreateDS;
import org.apache.directory.server.core.factory.DefaultDirectoryServiceFactory;
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.directory.server.core.jndi.ServerLdapContext;
import org.apache.directory.server.core.api.sp.LdapClassLoader;
--import org.junit.Test;
--import org.junit.runner.RunWith;
++import org.junit.jupiter.api.Test;
++import org.junit.jupiter.api.extension.ExtendWith;
/**
@@@ -47,7 -47,7 +47,7 @@@
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
--@RunWith(FrameworkRunner.class)
++@ExtendWith( ApacheDSTestExtension.class )
@CreateDS(factory = DefaultDirectoryServiceFactory.class, name = "LdapClassLoaderIT-class")
public class LdapClassLoaderIT extends AbstractLdapTestUnit
{
diff --cc core-integ/src/test/java/org/apache/directory/server/core/subtree/BadSubentryServiceIT.java
index b194771,b194771..84edb37
--- a/core-integ/src/test/java/org/apache/directory/server/core/subtree/BadSubentryServiceIT.java
+++ b/core-integ/src/test/java/org/apache/directory/server/core/subtree/BadSubentryServiceIT.java
@@@ -22,9 -22,9 +22,9 @@@ package org.apache.directory.server.cor
import static org.apache.directory.server.core.integ.IntegrationUtils.getSystemContext;
--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 java.util.HashMap;
import java.util.Map;
@@@ -43,9 -43,9 +43,9 @@@ import javax.naming.ldap.LdapContext
import org.apache.directory.api.ldap.model.constants.SchemaConstants;
import org.apache.directory.server.core.annotations.CreateDS;
import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
--import org.apache.directory.server.core.integ.FrameworkRunner;
--import org.junit.Test;
--import org.junit.runner.RunWith;
++import org.apache.directory.server.core.integ.ApacheDSTestExtension;
++import org.junit.jupiter.api.Test;
++import org.junit.jupiter.api.extension.ExtendWith;
/**
@@@ -53,7 -53,7 +53,7 @@@
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
--@RunWith(FrameworkRunner.class)
++@ExtendWith( ApacheDSTestExtension.class )
@CreateDS(name = "BadSubentryServiceIT-class")
public class BadSubentryServiceIT extends AbstractLdapTestUnit
{
@@@ -182,9 -182,9 +182,9 @@@
assertTrue( collectiveAttributeSubentries.contains( "cn=collectiveAttributeTestSubentry,ou=system" ) );
-- assertFalse( "'collectiveAttributeSubentries' operational attribute SHOULD NOT " +
-- "contain references to non-'collectiveAttributeSubentry's like 'accessControlSubentry's",
-- collectiveAttributeSubentries.contains( "cn=accessControlTestSubentry,ou=system" ) );
++ assertFalse( collectiveAttributeSubentries.contains( "cn=accessControlTestSubentry,ou=system" ),
++ "'collectiveAttributeSubentries' operational attribute SHOULD NOT " +
++ "contain references to non-'collectiveAttributeSubentry's like 'accessControlSubentry's" );
assertEquals( 1, collectiveAttributeSubentries.size() );
@@@ -194,9 -194,9 +194,9 @@@
assertTrue( accessControlSubentries.contains( "cn=accessControlTestSubentry,ou=system" ) );
-- assertFalse( "'accessControlSubentries' operational attribute SHOULD NOT " +
-- "contain references to non-'accessControlSubentry's like 'collectiveAttributeSubentry's",
-- accessControlSubentries.contains( "cn=collectiveAttributeTestSubentry,ou=system" ) );
++ assertFalse( accessControlSubentries.contains( "cn=collectiveAttributeTestSubentry,ou=system" ),
++ "'accessControlSubentries' operational attribute SHOULD NOT " +
++ "contain references to non-'accessControlSubentry's like 'collectiveAttributeSubentry's" );
assertEquals( 1, accessControlSubentries.size() );
}
diff --cc core-integ/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceEntryModificationHandlingIT.java
index 61b4d1b,61b4d1b..55ff798
--- a/core-integ/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceEntryModificationHandlingIT.java
+++ b/core-integ/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceEntryModificationHandlingIT.java
@@@ -22,8 -22,8 +22,8 @@@ package org.apache.directory.server.cor
import static org.apache.directory.server.core.integ.IntegrationUtils.getSystemContext;
--import static org.junit.Assert.assertNotNull;
--import static org.junit.Assert.assertNull;
++import static org.junit.jupiter.api.Assertions.assertNotNull;
++import static org.junit.jupiter.api.Assertions.assertNull;
import java.util.HashMap;
import java.util.Map;
@@@ -43,9 -43,9 +43,9 @@@ import org.apache.directory.api.ldap.mo
import org.apache.directory.server.core.annotations.CreateDS;
import org.apache.directory.server.core.factory.DefaultDirectoryServiceFactory;
import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
--import org.apache.directory.server.core.integ.FrameworkRunner;
--import org.junit.Test;
--import org.junit.runner.RunWith;
++import org.apache.directory.server.core.integ.ApacheDSTestExtension;
++import org.junit.jupiter.api.Test;
++import org.junit.jupiter.api.extension.ExtendWith;
/**
@@@ -56,7 -56,7 +56,7 @@@
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
--@RunWith(FrameworkRunner.class)
++@ExtendWith( ApacheDSTestExtension.class )
@CreateDS(factory = DefaultDirectoryServiceFactory.class, name = "SubentryServiceEntryModificationHandlingIT-class")
public class SubentryServiceEntryModificationHandlingIT extends AbstractLdapTestUnit
{
diff --cc core-integ/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceIT.java
index 2d9eb79,2d9eb79..50e4d72
--- a/core-integ/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceIT.java
+++ b/core-integ/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceIT.java
@@@ -21,12 -21,12 +21,12 @@@ package org.apache.directory.server.cor
import static org.apache.directory.server.core.integ.IntegrationUtils.getSystemContext;
--import static org.junit.Assert.assertEquals;
--import static org.junit.Assert.assertFalse;
--import static org.junit.Assert.assertNotNull;
--import static org.junit.Assert.assertNull;
--import static org.junit.Assert.assertTrue;
--import static org.junit.Assert.fail;
++import static org.junit.jupiter.api.Assertions.assertEquals;
++import static org.junit.jupiter.api.Assertions.assertFalse;
++import static org.junit.jupiter.api.Assertions.assertNotNull;
++import static org.junit.jupiter.api.Assertions.assertNull;
++import static org.junit.jupiter.api.Assertions.assertTrue;
++import static org.junit.jupiter.api.Assertions.fail;
import java.util.HashMap;
import java.util.Map;
@@@ -62,11 -62,11 +62,12 @@@ import org.apache.directory.ldap.client
import org.apache.directory.server.core.annotations.ApplyLdifs;
import org.apache.directory.server.core.annotations.CreateDS;
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.directory.server.core.integ.IntegrationUtils;
--import org.junit.Ignore;
--import org.junit.Test;
--import org.junit.runner.RunWith;
++import org.junit.jupiter.api.Assertions;
++import org.junit.jupiter.api.Disabled;
++import org.junit.jupiter.api.Test;
++import org.junit.jupiter.api.extension.ExtendWith;
/**
@@@ -74,7 -74,7 +75,7 @@@
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
--@RunWith(FrameworkRunner.class)
++@ExtendWith( ApacheDSTestExtension.class )
@CreateDS(name = "SubentryServiceIT-class")
@ApplyLdifs(
{
@@@ -331,7 -331,7 +332,7 @@@ public class SubentryServiceIT extends
@Test
-- @Ignore
++ @Disabled
public void testEntryAdd() throws Exception
{
LdapContext sysRoot = getSystemContext( getService() );
@@@ -347,7 -347,7 +348,7 @@@
Attributes marked = results.get( "cn=marked,ou=configuration,ou=system" );
javax.naming.directory.Attribute collectiveAttributeSubentries = marked.get( "collectiveAttributeSubentries" );
-- assertNotNull( "ou=marked,ou=configuration,ou=system should be marked", collectiveAttributeSubentries );
++ assertNotNull( collectiveAttributeSubentries , "ou=marked,ou=configuration,ou=system should be marked" );
assertEquals( "2.5.4.3=testsubentry,2.5.4.11=system", collectiveAttributeSubentries.get() );
assertEquals( 1, collectiveAttributeSubentries.size() );
@@@ -356,8 -356,8 +357,8 @@@
// --------------------------------------------------------------------
Attributes unmarked = results.get( "cn=unmarked,ou=system" );
-- assertNull( "cn=unmarked,ou=system should not be marked", unmarked
-- .get( "collectiveAttributeSubentries" ) );
++ assertNull( unmarked.get( "collectiveAttributeSubentries" ),
++ "cn=unmarked,ou=system should not be marked" );
}
@@@ -406,7 -406,7 +407,7 @@@
* Then suppress the subentry under AP-B
*/
@Test
-- @Ignore
++ @Disabled
public void testSubentryAdd() throws Exception
{
LdapConnection connection = IntegrationUtils.getAdminConnection( getService() );
@@@ -592,7 -592,7 +593,7 @@@
@Test
-- @Ignore
++ @Disabled
public void testSubentryModify() throws Exception
{
LdapContext sysRoot = getSystemContext( getService() );
@@@ -607,25 -607,25 +608,25 @@@
Attributes configuration = results.get( "ou=configuration,ou=system" );
javax.naming.directory.Attribute collectiveAttributeSubentries = configuration
.get( "collectiveAttributeSubentries" );
-- assertNotNull( "ou=configuration,ou=system should be marked", collectiveAttributeSubentries );
++ assertNotNull( collectiveAttributeSubentries , "ou=configuration,ou=system should be marked" );
assertEquals( "2.5.4.3=testsubentry,2.5.4.11=system", collectiveAttributeSubentries.get() );
assertEquals( 1, collectiveAttributeSubentries.size() );
Attributes interceptors = results.get( "ou=interceptors,ou=configuration,ou=system" );
collectiveAttributeSubentries = interceptors.get( "collectiveAttributeSubentries" );
-- assertNotNull( "ou=interceptors,ou=configuration,ou=system should be marked", collectiveAttributeSubentries );
++ assertNotNull( collectiveAttributeSubentries , "ou=interceptors,ou=configuration,ou=system should be marked" );
assertEquals( "2.5.4.3=testsubentry,2.5.4.11=system", collectiveAttributeSubentries.get() );
assertEquals( 1, collectiveAttributeSubentries.size() );
Attributes partitions = results.get( "ou=partitions,ou=configuration,ou=system" );
collectiveAttributeSubentries = partitions.get( "collectiveAttributeSubentries" );
-- assertNotNull( "ou=partitions,ou=configuration,ou=system should be marked", collectiveAttributeSubentries );
++ assertNotNull( collectiveAttributeSubentries , "ou=partitions,ou=configuration,ou=system should be marked" );
assertEquals( "2.5.4.3=testsubentry,2.5.4.11=system", collectiveAttributeSubentries.get() );
assertEquals( 1, collectiveAttributeSubentries.size() );
Attributes services = results.get( "ou=services,ou=configuration,ou=system" );
collectiveAttributeSubentries = services.get( "collectiveAttributeSubentries" );
-- assertNotNull( "ou=services,ou=configuration,ou=system should be marked", collectiveAttributeSubentries );
++ assertNotNull( collectiveAttributeSubentries , "ou=services,ou=configuration,ou=system should be marked" );
assertEquals( "2.5.4.3=testsubentry,2.5.4.11=system", collectiveAttributeSubentries.get() );
assertEquals( 1, collectiveAttributeSubentries.size() );
@@@ -634,23 -634,23 +635,23 @@@
// --------------------------------------------------------------------
Attributes system = results.get( "ou=system" );
-- assertNull( "ou=system should not be marked", system.get( "collectiveAttributeSubentries" ) );
++ assertNull( system.get( "collectiveAttributeSubentries" ), "ou=system should not be marked" );
Attributes users = results.get( "ou=users,ou=system" );
-- assertNull( "ou=users,ou=system should not be marked", users
-- .get( "collectiveAttributeSubentries" ) );
++ assertNull( users.get( "collectiveAttributeSubentries" ),
++ "ou=users,ou=system should not be marked" );
Attributes groups = results.get( "ou=groups,ou=system" );
-- assertNull( "ou=groups,ou=system should not be marked", groups
-- .get( "collectiveAttributeSubentries" ) );
++ assertNull( groups.get( "collectiveAttributeSubentries" ),
++ "ou=groups,ou=system should not be marked" );
Attributes admin = results.get( "uid=admin,ou=system" );
-- assertNull( "uid=admin,ou=system should not be marked", admin
-- .get( "collectiveAttributeSubentries" ) );
++ assertNull( admin.get( "collectiveAttributeSubentries" ),
++ "uid=admin,ou=system should not be marked" );
Attributes sysPrefRoot = results.get( "prefNodeName=sysPrefRoot,ou=system" );
-- assertNull( "prefNode=sysPrefRoot,ou=system should not be marked", sysPrefRoot
-- .get( "collectiveAttributeSubentries" ) );
++ assertNull( sysPrefRoot.get( "collectiveAttributeSubentries" ),
++ "prefNode=sysPrefRoot,ou=system should not be marked" );
// --------------------------------------------------------------------
// Now modify the subentry by introducing an exclusion
@@@ -669,19 -669,19 +670,19 @@@
configuration = results.get( "ou=configuration,ou=system" );
collectiveAttributeSubentries = configuration.get( "collectiveAttributeSubentries" );
-- assertNotNull( "ou=configuration,ou=system should be marked", collectiveAttributeSubentries );
++ assertNotNull( collectiveAttributeSubentries , "ou=configuration,ou=system should be marked" );
assertEquals( "2.5.4.3=testsubentry,2.5.4.11=system", collectiveAttributeSubentries.get() );
assertEquals( 1, collectiveAttributeSubentries.size() );
interceptors = results.get( "ou=interceptors,ou=configuration,ou=system" );
collectiveAttributeSubentries = interceptors.get( "collectiveAttributeSubentries" );
-- assertNotNull( "ou=interceptors,ou=configuration,ou=system should be marked", collectiveAttributeSubentries );
++ assertNotNull( collectiveAttributeSubentries , "ou=interceptors,ou=configuration,ou=system should be marked" );
assertEquals( "2.5.4.3=testsubentry,2.5.4.11=system", collectiveAttributeSubentries.get() );
assertEquals( 1, collectiveAttributeSubentries.size() );
partitions = results.get( "ou=partitions,ou=configuration,ou=system" );
... 3693 lines suppressed ...
[directory-server] 01/03: Migrated to Junit5
Posted by el...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
elecharny pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/directory-server.git
commit 08ef62b6f825a818d9d4c22a808965f0e4fea0f8
Author: emmanuel lecharny <el...@apache.org>
AuthorDate: Mon Apr 5 06:00:13 2021 +0200
Migrated to Junit5
---
core-annotations/pom.xml | 5 +++++
core/pom.xml | 14 +++++++-------
.../directory/server/core/DefaultDirectoryServiceTest.java | 3 +--
.../server/core/security/CertificateUtilTest.java | 3 +--
.../server/core/security/TlsKeyGeneratorTest.java | 13 +++----------
5 files changed, 17 insertions(+), 21 deletions(-)
diff --git a/core-annotations/pom.xml b/core-annotations/pom.xml
index c388df7..0ed3a5b 100644
--- a/core-annotations/pom.xml
+++ b/core-annotations/pom.xml
@@ -37,6 +37,11 @@
<artifactId>junit-jupiter-engine</artifactId>
<scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-api</artifactId>
+ </dependency>
<dependency>
<groupId>${project.groupId}</groupId>
diff --git a/core/pom.xml b/core/pom.xml
index 393f52e..3e94f4a 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -39,12 +39,6 @@
<dependencies>
<dependency>
- <groupId>org.apache.directory.junit</groupId>
- <artifactId>junit-addons</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
<groupId>${project.groupId}</groupId>
<artifactId>apacheds-i18n</artifactId>
</dependency>
@@ -153,7 +147,13 @@
<groupId>org.apache.directory.api</groupId>
<artifactId>api-util</artifactId>
</dependency>
-
+
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
+ <scope>test</scope>
+ </dependency>
+
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
diff --git a/core/src/test/java/org/apache/directory/server/core/DefaultDirectoryServiceTest.java b/core/src/test/java/org/apache/directory/server/core/DefaultDirectoryServiceTest.java
index 90c2731..4a3d2fc 100644
--- a/core/src/test/java/org/apache/directory/server/core/DefaultDirectoryServiceTest.java
+++ b/core/src/test/java/org/apache/directory/server/core/DefaultDirectoryServiceTest.java
@@ -26,12 +26,11 @@ import org.apache.directory.api.ldap.model.exception.LdapException;
import org.apache.directory.server.core.api.InterceptorEnum;
import org.apache.directory.server.core.api.interceptor.BaseInterceptor;
import org.apache.directory.server.core.api.interceptor.Interceptor;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class DefaultDirectoryServiceTest
{
-
@Test
public void testAddAfterExistingInterceptor() throws LdapException
{
diff --git a/core/src/test/java/org/apache/directory/server/core/security/CertificateUtilTest.java b/core/src/test/java/org/apache/directory/server/core/security/CertificateUtilTest.java
index 0a60df2..e71f09f 100644
--- a/core/src/test/java/org/apache/directory/server/core/security/CertificateUtilTest.java
+++ b/core/src/test/java/org/apache/directory/server/core/security/CertificateUtilTest.java
@@ -27,7 +27,7 @@ import java.security.cert.X509Certificate;
import javax.security.auth.x500.X500Principal;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test for the CertificateUtil class.
@@ -37,7 +37,6 @@ import org.junit.Test;
@SuppressWarnings("restriction")
public class CertificateUtilTest
{
-
@Test
public void testSelfSignedCertificateCreation() throws IOException, GeneralSecurityException
{
diff --git a/core/src/test/java/org/apache/directory/server/core/security/TlsKeyGeneratorTest.java b/core/src/test/java/org/apache/directory/server/core/security/TlsKeyGeneratorTest.java
index 1398671..c56ba45 100644
--- a/core/src/test/java/org/apache/directory/server/core/security/TlsKeyGeneratorTest.java
+++ b/core/src/test/java/org/apache/directory/server/core/security/TlsKeyGeneratorTest.java
@@ -33,23 +33,16 @@ import org.apache.directory.api.ldap.model.name.Dn;
import org.apache.directory.api.ldap.model.schema.SchemaManager;
import org.apache.directory.api.ldap.schema.loader.LdifSchemaLoader;
import org.apache.directory.api.ldap.schema.manager.impl.DefaultSchemaManager;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.mycila.junit.concurrent.Concurrency;
-import com.mycila.junit.concurrent.ConcurrentJunitRunner;
-
-
/**
* Test for the TlsKeyGenerator class.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-@RunWith(ConcurrentJunitRunner.class)
-@Concurrency()
public class TlsKeyGeneratorTest
{
private static final Logger LOG = LoggerFactory.getLogger( TlsKeyGeneratorTest.class );
@@ -60,7 +53,7 @@ public class TlsKeyGeneratorTest
/**
* Initialize the registries once for the whole test suite
*/
- @BeforeClass
+ @BeforeAll
public static void setup() throws Exception
{
/*
[directory-server] 03/03: Switched to junit 5
Posted by el...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
elecharny pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/directory-server.git
commit 26f92a1d42248a583e8864c772fd7732c6b9a814
Author: emmanuel lecharny <el...@apache.org>
AuthorDate: Mon Apr 26 23:42:40 2021 +0200
Switched to junit 5
---
.../server/kerberos/kdc/AbstractKerberosITest.java | 34 +++++++++--------
.../kerberos/kdc/KerberosKRBProtocolTest.java | 8 ++--
.../server/core/integ/ApacheDSTestExtension.java | 44 ++++++++--------------
3 files changed, 38 insertions(+), 48 deletions(-)
diff --git a/kerberos-test/src/test/java/org/apache/directory/server/kerberos/kdc/AbstractKerberosITest.java b/kerberos-test/src/test/java/org/apache/directory/server/kerberos/kdc/AbstractKerberosITest.java
index e90a659..5a99a68 100644
--- a/kerberos-test/src/test/java/org/apache/directory/server/kerberos/kdc/AbstractKerberosITest.java
+++ b/kerberos-test/src/test/java/org/apache/directory/server/kerberos/kdc/AbstractKerberosITest.java
@@ -24,6 +24,8 @@ import static org.junit.Assert.assertEquals;
import java.io.File;
import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
import java.util.Collections;
import javax.security.auth.Subject;
@@ -44,10 +46,9 @@ import org.apache.directory.server.protocol.shared.transport.TcpTransport;
import org.apache.directory.server.protocol.shared.transport.Transport;
import org.apache.directory.shared.kerberos.codec.types.EncryptionType;
import org.apache.directory.shared.kerberos.crypto.checksum.ChecksumType;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.rules.TemporaryFolder;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.io.TempDir;
/**
@@ -63,13 +64,13 @@ public class AbstractKerberosITest extends AbstractLdapTestUnit
public static final String LDAP_SERVICE_NAME = "ldap";
public static final String HOSTNAME = KerberosTestUtils.getHostName();
- @Rule
- public TemporaryFolder folder = new TemporaryFolder();
+ @TempDir
+ public Path folder;
protected LdapCoreSessionConnection conn;
- @Before
+ @BeforeEach
public void setUp() throws Exception
{
conn = new LdapCoreSessionConnection( service );
@@ -78,11 +79,12 @@ public class AbstractKerberosITest extends AbstractLdapTestUnit
}
- @After
+ @AfterEach
public void tearDown() throws Exception
{
conn.close();
}
+
class ObtainTicketParameters
{
@@ -195,22 +197,22 @@ public class AbstractKerberosITest extends AbstractLdapTestUnit
*/
private String createKrb5Conf( ChecksumType checksumType, EncryptionType encryptionType, boolean isTcp ) throws IOException
{
- File file = folder.newFile( "krb5.conf" );
+ File file = Files.createDirectory( folder.resolve( "krb5.conf" ) ).toFile();
String data = "";
- data += "[libdefaults]" + SystemUtils.LINE_SEPARATOR;
- data += "default_realm = " + REALM + SystemUtils.LINE_SEPARATOR;
- data += "default_tkt_enctypes = " + encryptionType.getName() + SystemUtils.LINE_SEPARATOR;
- data += "default_tgs_enctypes = " + encryptionType.getName() + SystemUtils.LINE_SEPARATOR;
- data += "permitted_enctypes = " + encryptionType.getName() + SystemUtils.LINE_SEPARATOR;
+ data += "[libdefaults]" + System.lineSeparator();
+ data += "default_realm = " + REALM + System.lineSeparator();
+ data += "default_tkt_enctypes = " + encryptionType.getName() + System.lineSeparator();
+ data += "default_tgs_enctypes = " + encryptionType.getName() + System.lineSeparator();
+ data += "permitted_enctypes = " + encryptionType.getName() + System.lineSeparator();
// data += "default_checksum = " + checksumType.getName() + SystemUtils.LINE_SEPARATOR;
// data += "ap_req_checksum_type = " + checksumType.getName() + SystemUtils.LINE_SEPARATOR;
- data += "default-checksum_type = " + checksumType.getName() + SystemUtils.LINE_SEPARATOR;
+ data += "default-checksum_type = " + checksumType.getName() + System.lineSeparator();
if ( isTcp )
{
- data += "udp_preference_limit = 1" + SystemUtils.LINE_SEPARATOR;
+ data += "udp_preference_limit = 1" + System.lineSeparator();
}
diff --git a/kerberos-test/src/test/java/org/apache/directory/server/kerberos/kdc/KerberosKRBProtocolTest.java b/kerberos-test/src/test/java/org/apache/directory/server/kerberos/kdc/KerberosKRBProtocolTest.java
index 3a2334f..a940f0a 100644
--- a/kerberos-test/src/test/java/org/apache/directory/server/kerberos/kdc/KerberosKRBProtocolTest.java
+++ b/kerberos-test/src/test/java/org/apache/directory/server/kerberos/kdc/KerberosKRBProtocolTest.java
@@ -26,14 +26,14 @@ import org.apache.directory.server.annotations.CreateTransport;
import org.apache.directory.server.core.annotations.ApplyLdifFiles;
import org.apache.directory.server.core.annotations.CreateDS;
import org.apache.directory.server.core.annotations.CreatePartition;
-import org.apache.directory.server.core.integ.FrameworkRunner;
+import org.apache.directory.server.core.integ.ApacheDSTestExtension;
import org.apache.directory.server.core.kerberos.KeyDerivationInterceptor;
import org.apache.directory.server.protocol.shared.transport.TcpTransport;
import org.apache.directory.server.protocol.shared.transport.UdpTransport;
import org.apache.directory.shared.kerberos.codec.types.EncryptionType;
import org.apache.directory.shared.kerberos.crypto.checksum.ChecksumType;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
/**
@@ -41,7 +41,7 @@ import org.junit.runner.RunWith;
*
* https://issues.apache.org/jira/browse/DIRSERVER-2031
*/
-@RunWith(FrameworkRunner.class)
+@ExtendWith(ApacheDSTestExtension.class)
@CreateDS(name = "KerberosKRBProtocolTest-class",
partitions =
{
diff --git a/test-framework/src/main/java/org/apache/directory/server/core/integ/ApacheDSTestExtension.java b/test-framework/src/main/java/org/apache/directory/server/core/integ/ApacheDSTestExtension.java
index 6d4a496..c94d61a 100644
--- a/test-framework/src/main/java/org/apache/directory/server/core/integ/ApacheDSTestExtension.java
+++ b/test-framework/src/main/java/org/apache/directory/server/core/integ/ApacheDSTestExtension.java
@@ -56,17 +56,6 @@ public class ApacheDSTestExtension implements BeforeEachCallback, AfterEachCallb
private static final String METHOD_DS = "methodService";
private static final String REVISION = "revision";
- /** The 'service' field in the run tests */
- private static final String SET_SERVICE_METHOD_NAME = "setService";
-
- /** The 'ldapServer' field in the run tests */
- private static final String SET_LDAP_SERVER_METHOD_NAME = "setLdapServer";
-
- /** The 'kdcServer' field in the run tests */
- private static final String SET_KDC_SERVER_METHOD_NAME = "setKdcServer";
-
-
-
private DirectoryService getDirectoryService( ExtensionContext context, String fieldName )
throws NoSuchFieldException, SecurityException, IllegalArgumentException, IllegalAccessException
{
@@ -162,11 +151,11 @@ public class ApacheDSTestExtension implements BeforeEachCallback, AfterEachCallb
}
- private void setRevision( ExtensionContext context, String fieldName, long revision )
+ private void setRevision( ExtensionContext context, long revision )
throws NoSuchFieldException, SecurityException, IllegalArgumentException, IllegalAccessException
{
Class<?> testClass = context.getTestClass().get();
- Field field = testClass.getField( fieldName );
+ Field field = testClass.getField( REVISION );
field.set( null, revision );
}
@@ -210,6 +199,11 @@ public class ApacheDSTestExtension implements BeforeEachCallback, AfterEachCallb
setDirectoryService( context, CLASS_DS, classDS );
+ // Store the revision
+ //revision = classDS.getChangeLog().getCurrentRevision();
+
+ //setRevision( context, revision );
+
// check if it has a LdapServerBuilder
// then use the DS created above
CreateLdapServer classLdapServerBuilder = annotations.getDeclaredAnnotation( CreateLdapServer.class );
@@ -326,23 +320,11 @@ public class ApacheDSTestExtension implements BeforeEachCallback, AfterEachCallb
DirectoryService service = classDS;
- if ( dsBuilder == null )
+ if ( dsBuilder != null )
{
- // No method DS? let's use the class DS then
-
- // Set the revision to 0, we will revert only if it's set to another value
- long methodRevision = 0L;
-
- setRevision( context, REVISION, methodRevision );
- }
- else
- {
- // Build the DSS server now
+ // Build the DS server now
try
{
- // Set the revision to 0, we will revert only if it's set to another value
- long methodRevision = 0L;
-
// Check if this method has a dedicated DSBuilder
DirectoryService methodDS = DSAnnotationProcessor.getDirectoryService( dsBuilder );
@@ -358,8 +340,14 @@ public class ApacheDSTestExtension implements BeforeEachCallback, AfterEachCallb
}
}
- DSAnnotationProcessor.applyLdifs( classAnnotation, context.getDisplayName(), service );
DSAnnotationProcessor.applyLdifs( methodAnnotation, context.getDisplayName(), service );
+
+ // Get current revision
+ if ( ( service != null ) && ( service.getChangeLog().isEnabled() ) )
+ {
+ long revision = service.getChangeLog().getCurrentRevision();
+ setRevision( context, revision );
+ }
}