From commits-return-51063-archive-asf-public=cust-asf.ponee.io@directory.apache.org Mon May 6 16:00:36 2019 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [207.244.88.153]) by mx-eu-01.ponee.io (Postfix) with SMTP id C88D418060F for ; Mon, 6 May 2019 18:00:35 +0200 (CEST) Received: (qmail 65496 invoked by uid 500); 6 May 2019 16:00:35 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 65486 invoked by uid 99); 6 May 2019 16:00:35 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 06 May 2019 16:00:35 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 00AD987263; Mon, 6 May 2019 16:00:29 +0000 (UTC) Date: Mon, 06 May 2019 16:00:29 +0000 To: "commits@directory.apache.org" Subject: [directory-ldap-api] branch master updated: Fixed random failures in tests (due to some Junit 5 concurrent tests initialisation badly done) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <155715842992.20932.7892919746368974721@gitbox.apache.org> From: elecharny@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: directory-ldap-api X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: e8a4e86c28a38e7394b9f986f8ba766ab8067e00 X-Git-Newrev: a6d42bdeca875f78e676541bb3f1a8780e4fc978 X-Git-Rev: a6d42bdeca875f78e676541bb3f1a8780e4fc978 X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated 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-ldap-api.git The following commit(s) were added to refs/heads/master by this push: new a6d42bd Fixed random failures in tests (due to some Junit 5 concurrent tests initialisation badly done) a6d42bd is described below commit a6d42bdeca875f78e676541bb3f1a8780e4fc978 Author: emmanuel lecharny AuthorDate: Mon May 6 18:00:23 2019 +0200 Fixed random failures in tests (due to some Junit 5 concurrent tests initialisation badly done) --- .../ldap/codec/osgi/AbstractCodecServiceTest.java | 49 +++++++++++++--------- .../api/ldap/extras/AbstractCodecServiceTest.java | 7 +++- .../controls/ad/AdDirSyncRequestControlTest.java | 9 ++-- .../controls/ad/AdDirSyncResponseControlTest.java | 14 ++++--- .../controls/ad/AdPolicyHintsControlTest.java | 14 ++++--- .../ppolicy/PasswordPolicyResponseTest.java | 14 ++++--- .../syncrepl_impl/SyncDoneValueControlTest.java | 14 ++++--- .../syncrepl_impl/SyncRequestValueControlTest.java | 14 ++++--- .../syncrepl_impl/SyncStateValueControlTest.java | 14 ++++--- .../extras/controls/vlv/VLVRequestControlTest.java | 14 ++++--- .../controls/vlv/VLVResponseControlTest.java | 14 ++++--- .../ldap/extras/extended/ExtendedRequestTest.java | 14 ++++--- .../ldap/extras/extended/ExtendedResponseTest.java | 14 ++++--- .../ads_impl/cancel/CancelRequestTest.java | 14 ++++--- .../certGeneration/CertGenerationRequestTest.java | 14 ++++--- .../endTransaction/EndTransactionRequestTest.java | 14 ++++--- .../endTransaction/EndTransactionResponseTest.java | 19 ++++----- .../GracefulDisconnectResponseTest.java | 14 ++++--- .../gracefulShutdown/GracefulShutdownTest.java | 14 ++++--- .../pwdModify/PasswordModifyRequestTest.java | 14 ++++--- .../pwdModify/PasswordModifyResponseTest.java | 14 ++++--- .../storedProcedure/StoredProcedureTest.java | 14 ++++--- .../ads_impl/whoAmI/WhoAmIResponseTest.java | 14 ++++--- .../syncrepl/SyncInfoValueControlTest.java | 14 ++++--- 24 files changed, 230 insertions(+), 134 deletions(-) diff --git a/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/osgi/AbstractCodecServiceTest.java b/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/osgi/AbstractCodecServiceTest.java index f306792..3bd5a6c 100644 --- a/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/osgi/AbstractCodecServiceTest.java +++ b/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/osgi/AbstractCodecServiceTest.java @@ -20,8 +20,10 @@ package org.apache.directory.api.ldap.codec.osgi; +import java.util.concurrent.locks.Lock; +import java.util.concurrent.locks.ReentrantLock; + import org.apache.directory.api.ldap.codec.api.LdapApiServiceFactory; -import org.apache.directory.api.ldap.codec.api.LdapEncoder; import org.apache.mina.core.session.IoSession; import org.apache.mina.filter.codec.ProtocolCodecFactory; import org.apache.mina.filter.codec.ProtocolDecoder; @@ -37,10 +39,8 @@ import org.junit.jupiter.api.BeforeEach; public abstract class AbstractCodecServiceTest { protected DefaultLdapCodecService codec; - - /** The encoder instance */ - protected static LdapEncoder encoder; - + + private static Lock lock = new ReentrantLock(); /** * Initialize the codec service @@ -48,27 +48,36 @@ public abstract class AbstractCodecServiceTest @BeforeEach public void setupLdapCodecService() { - codec = new DefaultLdapCodecService(); + lock.lock(); - codec.registerProtocolCodecFactory( new ProtocolCodecFactory() + try { - @Override - public ProtocolEncoder getEncoder( IoSession session ) throws Exception + codec = new DefaultLdapCodecService(); + + codec.registerProtocolCodecFactory( new ProtocolCodecFactory() { - return null; - } - - - @Override - public ProtocolDecoder getDecoder( IoSession session ) throws Exception + @Override + public ProtocolEncoder getEncoder( IoSession session ) throws Exception + { + return null; + } + + + @Override + public ProtocolDecoder getDecoder( IoSession session ) throws Exception + { + return null; + } + } ); + + if ( LdapApiServiceFactory.isInitialized() == false ) { - return null; + LdapApiServiceFactory.initialize( codec ); } - } ); - - if ( LdapApiServiceFactory.isInitialized() == false ) + } + finally { - LdapApiServiceFactory.initialize( codec ); + lock.unlock(); } } } diff --git a/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/AbstractCodecServiceTest.java b/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/AbstractCodecServiceTest.java index acc69c9..b803053 100644 --- a/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/AbstractCodecServiceTest.java +++ b/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/AbstractCodecServiceTest.java @@ -31,5 +31,10 @@ import org.apache.directory.api.ldap.codec.osgi.DefaultLdapCodecService; */ public abstract class AbstractCodecServiceTest { - protected static LdapApiService codec = new DefaultLdapCodecService(); + protected static LdapApiService codec; + + public static void initBase() + { + codec = new DefaultLdapCodecService(); + } } diff --git a/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/controls/ad/AdDirSyncRequestControlTest.java b/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/controls/ad/AdDirSyncRequestControlTest.java index 512299d..66aad11 100644 --- a/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/controls/ad/AdDirSyncRequestControlTest.java +++ b/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/controls/ad/AdDirSyncRequestControlTest.java @@ -29,11 +29,11 @@ import java.nio.ByteBuffer; import org.apache.directory.api.asn1.DecoderException; import org.apache.directory.api.asn1.EncoderException; import org.apache.directory.api.asn1.util.Asn1Buffer; -import org.apache.directory.api.ldap.extras.AbstractCodecServiceTest; +import org.apache.directory.api.ldap.codec.api.LdapApiService; +import org.apache.directory.api.ldap.codec.osgi.DefaultLdapCodecService; import org.apache.directory.api.ldap.extras.controls.ad_impl.AdDirSyncRequestFactory; import org.apache.directory.api.util.Strings; import org.junit.jupiter.api.BeforeAll; -import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.parallel.Execution; import org.junit.jupiter.api.parallel.ExecutionMode; @@ -45,11 +45,14 @@ import org.junit.jupiter.api.parallel.ExecutionMode; * @author Apache Directory Project */ @Execution( ExecutionMode.CONCURRENT) -public class AdDirSyncRequestControlTest extends AbstractCodecServiceTest +public class AdDirSyncRequestControlTest { + private static LdapApiService codec; + @BeforeAll public static void init() { + codec = new DefaultLdapCodecService(); codec.registerRequestControl( new AdDirSyncRequestFactory( codec ) ); } diff --git a/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/controls/ad/AdDirSyncResponseControlTest.java b/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/controls/ad/AdDirSyncResponseControlTest.java index 5909e59..ad07128 100644 --- a/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/controls/ad/AdDirSyncResponseControlTest.java +++ b/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/controls/ad/AdDirSyncResponseControlTest.java @@ -30,10 +30,11 @@ import java.util.EnumSet; import org.apache.directory.api.asn1.DecoderException; import org.apache.directory.api.asn1.EncoderException; import org.apache.directory.api.asn1.util.Asn1Buffer; -import org.apache.directory.api.ldap.extras.AbstractCodecServiceTest; +import org.apache.directory.api.ldap.codec.api.LdapApiService; +import org.apache.directory.api.ldap.codec.osgi.DefaultLdapCodecService; import org.apache.directory.api.ldap.extras.controls.ad_impl.AdDirSyncResponseFactory; import org.apache.directory.api.util.Strings; -import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.parallel.Execution; import org.junit.jupiter.api.parallel.ExecutionMode; @@ -45,11 +46,14 @@ import org.junit.jupiter.api.parallel.ExecutionMode; * @author Apache Directory Project */ @Execution( ExecutionMode.CONCURRENT) -public class AdDirSyncResponseControlTest extends AbstractCodecServiceTest +public class AdDirSyncResponseControlTest { - @BeforeEach - public void init() + private static LdapApiService codec; + + @BeforeAll + public static void init() { + codec = new DefaultLdapCodecService(); codec.registerResponseControl( new AdDirSyncResponseFactory( codec ) ); } diff --git a/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/controls/ad/AdPolicyHintsControlTest.java b/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/controls/ad/AdPolicyHintsControlTest.java index 339bab6..535f94d 100644 --- a/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/controls/ad/AdPolicyHintsControlTest.java +++ b/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/controls/ad/AdPolicyHintsControlTest.java @@ -29,9 +29,10 @@ import java.nio.ByteBuffer; import org.apache.directory.api.asn1.DecoderException; import org.apache.directory.api.asn1.EncoderException; import org.apache.directory.api.asn1.util.Asn1Buffer; -import org.apache.directory.api.ldap.extras.AbstractCodecServiceTest; +import org.apache.directory.api.ldap.codec.api.LdapApiService; +import org.apache.directory.api.ldap.codec.osgi.DefaultLdapCodecService; import org.apache.directory.api.ldap.extras.controls.ad_impl.AdPolicyHintsFactory; -import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.parallel.Execution; import org.junit.jupiter.api.parallel.ExecutionMode; @@ -43,11 +44,14 @@ import org.junit.jupiter.api.parallel.ExecutionMode; * @author Apache Directory Project */ @Execution( ExecutionMode.CONCURRENT) -public class AdPolicyHintsControlTest extends AbstractCodecServiceTest +public class AdPolicyHintsControlTest { - @BeforeEach - public void init() + private static LdapApiService codec; + + @BeforeAll + public static void init() { + codec = new DefaultLdapCodecService(); codec.registerRequestControl( new AdPolicyHintsFactory( codec ) ); } diff --git a/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/controls/ppolicy/PasswordPolicyResponseTest.java b/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/controls/ppolicy/PasswordPolicyResponseTest.java index b0d2523..9e1b63c 100644 --- a/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/controls/ppolicy/PasswordPolicyResponseTest.java +++ b/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/controls/ppolicy/PasswordPolicyResponseTest.java @@ -30,9 +30,10 @@ import java.nio.ByteBuffer; import org.apache.directory.api.asn1.DecoderException; import org.apache.directory.api.asn1.EncoderException; import org.apache.directory.api.asn1.util.Asn1Buffer; -import org.apache.directory.api.ldap.extras.AbstractCodecServiceTest; +import org.apache.directory.api.ldap.codec.api.LdapApiService; +import org.apache.directory.api.ldap.codec.osgi.DefaultLdapCodecService; import org.apache.directory.api.ldap.extras.controls.ppolicy_impl.PasswordPolicyResponseFactory; -import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.parallel.Execution; import org.junit.jupiter.api.parallel.ExecutionMode; @@ -43,11 +44,14 @@ import org.junit.jupiter.api.parallel.ExecutionMode; * @author Apache Directory Project */ @Execution( ExecutionMode.CONCURRENT) -public class PasswordPolicyResponseTest extends AbstractCodecServiceTest +public class PasswordPolicyResponseTest { - @BeforeEach - public void init() + private static LdapApiService codec; + + @BeforeAll + public static void init() { + codec = new DefaultLdapCodecService(); codec.registerResponseControl( new PasswordPolicyResponseFactory( codec ) ); } diff --git a/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncDoneValueControlTest.java b/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncDoneValueControlTest.java index f29864a..bcef36a 100644 --- a/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncDoneValueControlTest.java +++ b/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncDoneValueControlTest.java @@ -31,10 +31,11 @@ import java.nio.ByteBuffer; import org.apache.directory.api.asn1.DecoderException; import org.apache.directory.api.asn1.EncoderException; import org.apache.directory.api.asn1.util.Asn1Buffer; -import org.apache.directory.api.ldap.extras.AbstractCodecServiceTest; +import org.apache.directory.api.ldap.codec.api.LdapApiService; +import org.apache.directory.api.ldap.codec.osgi.DefaultLdapCodecService; import org.apache.directory.api.ldap.extras.controls.syncrepl.syncDone.SyncDoneValue; import org.apache.directory.api.util.Strings; -import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.parallel.Execution; import org.junit.jupiter.api.parallel.ExecutionMode; @@ -46,11 +47,14 @@ import org.junit.jupiter.api.parallel.ExecutionMode; * @author Apache Directory Project */ @Execution( ExecutionMode.CONCURRENT) -public class SyncDoneValueControlTest extends AbstractCodecServiceTest +public class SyncDoneValueControlTest { - @BeforeEach - public void init() + private static LdapApiService codec; + + @BeforeAll + public static void init() { + codec = new DefaultLdapCodecService(); codec.registerResponseControl( new SyncDoneValueFactory( codec ) ); } diff --git a/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncRequestValueControlTest.java b/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncRequestValueControlTest.java index 99f9a1c..367647c 100644 --- a/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncRequestValueControlTest.java +++ b/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncRequestValueControlTest.java @@ -30,11 +30,12 @@ import java.nio.ByteBuffer; import org.apache.directory.api.asn1.DecoderException; import org.apache.directory.api.asn1.EncoderException; import org.apache.directory.api.asn1.util.Asn1Buffer; -import org.apache.directory.api.ldap.extras.AbstractCodecServiceTest; +import org.apache.directory.api.ldap.codec.api.LdapApiService; +import org.apache.directory.api.ldap.codec.osgi.DefaultLdapCodecService; import org.apache.directory.api.ldap.extras.controls.SynchronizationModeEnum; import org.apache.directory.api.ldap.extras.controls.syncrepl.syncRequest.SyncRequestValue; import org.apache.directory.api.util.Strings; -import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.parallel.Execution; import org.junit.jupiter.api.parallel.ExecutionMode; @@ -45,11 +46,14 @@ import org.junit.jupiter.api.parallel.ExecutionMode; * @author Apache Directory Project */ @Execution( ExecutionMode.CONCURRENT) -public class SyncRequestValueControlTest extends AbstractCodecServiceTest +public class SyncRequestValueControlTest { - @BeforeEach - public void init() + private static LdapApiService codec; + + @BeforeAll + public static void init() { + codec = new DefaultLdapCodecService(); codec.registerRequestControl( new SyncRequestValueFactory( codec ) ); } diff --git a/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncStateValueControlTest.java b/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncStateValueControlTest.java index 3a37eef..82c10b0 100644 --- a/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncStateValueControlTest.java +++ b/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncStateValueControlTest.java @@ -30,11 +30,12 @@ import java.nio.ByteBuffer; import org.apache.directory.api.asn1.DecoderException; import org.apache.directory.api.asn1.EncoderException; import org.apache.directory.api.asn1.util.Asn1Buffer; -import org.apache.directory.api.ldap.extras.AbstractCodecServiceTest; +import org.apache.directory.api.ldap.codec.api.LdapApiService; +import org.apache.directory.api.ldap.codec.osgi.DefaultLdapCodecService; import org.apache.directory.api.ldap.extras.controls.syncrepl.syncState.SyncStateTypeEnum; import org.apache.directory.api.ldap.extras.controls.syncrepl.syncState.SyncStateValue; import org.apache.directory.api.util.Strings; -import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.parallel.Execution; import org.junit.jupiter.api.parallel.ExecutionMode; @@ -45,11 +46,14 @@ import org.junit.jupiter.api.parallel.ExecutionMode; * @author Apache Directory Project */ @Execution( ExecutionMode.CONCURRENT) -public class SyncStateValueControlTest extends AbstractCodecServiceTest +public class SyncStateValueControlTest { - @BeforeEach - public void init() + private static LdapApiService codec; + + @BeforeAll + public static void init() { + codec = new DefaultLdapCodecService(); codec.registerResponseControl( new SyncStateValueFactory( codec ) ); } diff --git a/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/controls/vlv/VLVRequestControlTest.java b/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/controls/vlv/VLVRequestControlTest.java index 4668599..5a7f471 100644 --- a/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/controls/vlv/VLVRequestControlTest.java +++ b/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/controls/vlv/VLVRequestControlTest.java @@ -32,10 +32,11 @@ import java.nio.ByteBuffer; import org.apache.directory.api.asn1.DecoderException; import org.apache.directory.api.asn1.EncoderException; import org.apache.directory.api.asn1.util.Asn1Buffer; -import org.apache.directory.api.ldap.extras.AbstractCodecServiceTest; +import org.apache.directory.api.ldap.codec.api.LdapApiService; +import org.apache.directory.api.ldap.codec.osgi.DefaultLdapCodecService; import org.apache.directory.api.ldap.extras.controls.vlv_impl.VirtualListViewRequestFactory; import org.apache.directory.api.util.Strings; -import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.parallel.Execution; import org.junit.jupiter.api.parallel.ExecutionMode; @@ -46,11 +47,14 @@ import org.junit.jupiter.api.parallel.ExecutionMode; * @author Apache Directory Project */ @Execution( ExecutionMode.CONCURRENT) -public class VLVRequestControlTest extends AbstractCodecServiceTest +public class VLVRequestControlTest { - @BeforeEach - public void init() + private static LdapApiService codec; + + @BeforeAll + public static void init() { + codec = new DefaultLdapCodecService(); codec.registerRequestControl( new VirtualListViewRequestFactory( codec ) ); } diff --git a/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/controls/vlv/VLVResponseControlTest.java b/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/controls/vlv/VLVResponseControlTest.java index f8b2269..aa25728 100644 --- a/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/controls/vlv/VLVResponseControlTest.java +++ b/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/controls/vlv/VLVResponseControlTest.java @@ -30,10 +30,11 @@ import java.nio.ByteBuffer; import org.apache.directory.api.asn1.DecoderException; import org.apache.directory.api.asn1.EncoderException; import org.apache.directory.api.asn1.util.Asn1Buffer; -import org.apache.directory.api.ldap.extras.AbstractCodecServiceTest; +import org.apache.directory.api.ldap.codec.api.LdapApiService; +import org.apache.directory.api.ldap.codec.osgi.DefaultLdapCodecService; import org.apache.directory.api.ldap.extras.controls.vlv_impl.VirtualListViewResponseFactory; import org.apache.directory.api.util.Strings; -import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.parallel.Execution; import org.junit.jupiter.api.parallel.ExecutionMode; @@ -44,11 +45,14 @@ import org.junit.jupiter.api.parallel.ExecutionMode; * @author Apache Directory Project */ @Execution( ExecutionMode.CONCURRENT) -public class VLVResponseControlTest extends AbstractCodecServiceTest +public class VLVResponseControlTest { - @BeforeEach - public void init() + private static LdapApiService codec; + + @BeforeAll + public static void init() { + codec = new DefaultLdapCodecService(); codec.registerResponseControl( new VirtualListViewResponseFactory( codec ) ); } diff --git a/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/extended/ExtendedRequestTest.java b/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/extended/ExtendedRequestTest.java index d1f23fb..841699b 100644 --- a/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/extended/ExtendedRequestTest.java +++ b/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/extended/ExtendedRequestTest.java @@ -32,9 +32,10 @@ import org.apache.directory.api.asn1.DecoderException; import org.apache.directory.api.asn1.EncoderException; import org.apache.directory.api.asn1.ber.Asn1Decoder; import org.apache.directory.api.asn1.util.Asn1Buffer; +import org.apache.directory.api.ldap.codec.api.LdapApiService; import org.apache.directory.api.ldap.codec.api.LdapEncoder; import org.apache.directory.api.ldap.codec.api.LdapMessageContainer; -import org.apache.directory.api.ldap.extras.AbstractCodecServiceTest; +import org.apache.directory.api.ldap.codec.osgi.DefaultLdapCodecService; import org.apache.directory.api.ldap.extras.extended.ads_impl.cancel.CancelFactory; import org.apache.directory.api.ldap.extras.extended.ads_impl.startTls.StartTlsFactory; import org.apache.directory.api.ldap.extras.extended.cancel.CancelRequest; @@ -42,7 +43,7 @@ import org.apache.directory.api.ldap.extras.extended.startTls.StartTlsRequest; import org.apache.directory.api.ldap.model.message.Control; import org.apache.directory.api.ldap.model.message.ExtendedRequest; import org.apache.directory.api.ldap.model.message.controls.ManageDsaIT; -import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.parallel.Execution; import org.junit.jupiter.api.parallel.ExecutionMode; @@ -53,11 +54,14 @@ import org.junit.jupiter.api.parallel.ExecutionMode; * @author Apache Directory Project */ @Execution( ExecutionMode.CONCURRENT) -public class ExtendedRequestTest extends AbstractCodecServiceTest +public class ExtendedRequestTest { - @BeforeEach - public void init() + private static LdapApiService codec; + + @BeforeAll + public static void init() { + codec = new DefaultLdapCodecService(); codec.getExtendedRequestFactories().put( "1.3.6.1.1.8", new CancelFactory( codec ) ); codec.getExtendedRequestFactories().put( "1.3.6.1.4.1.1466.20037", new StartTlsFactory( codec ) ); } diff --git a/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/extended/ExtendedResponseTest.java b/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/extended/ExtendedResponseTest.java index 3cfa6a2..db1a1bb 100644 --- a/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/extended/ExtendedResponseTest.java +++ b/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/extended/ExtendedResponseTest.java @@ -32,9 +32,10 @@ import org.apache.directory.api.asn1.DecoderException; import org.apache.directory.api.asn1.EncoderException; import org.apache.directory.api.asn1.ber.Asn1Decoder; import org.apache.directory.api.asn1.util.Asn1Buffer; +import org.apache.directory.api.ldap.codec.api.LdapApiService; import org.apache.directory.api.ldap.codec.api.LdapEncoder; import org.apache.directory.api.ldap.codec.api.LdapMessageContainer; -import org.apache.directory.api.ldap.extras.AbstractCodecServiceTest; +import org.apache.directory.api.ldap.codec.osgi.DefaultLdapCodecService; import org.apache.directory.api.ldap.extras.extended.ads_impl.gracefulDisconnect.GracefulDisconnectFactory; import org.apache.directory.api.ldap.extras.extended.gracefulDisconnect.GracefulDisconnectResponse; import org.apache.directory.api.ldap.model.message.Control; @@ -43,7 +44,7 @@ import org.apache.directory.api.ldap.model.message.ResultCodeEnum; import org.apache.directory.api.ldap.model.message.controls.PagedResults; import org.apache.directory.api.ldap.model.name.Dn; import org.apache.directory.api.util.Strings; -import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.parallel.Execution; import org.junit.jupiter.api.parallel.ExecutionMode; @@ -54,11 +55,14 @@ import org.junit.jupiter.api.parallel.ExecutionMode; * @author Apache Directory Project */ @Execution( ExecutionMode.CONCURRENT) -public class ExtendedResponseTest extends AbstractCodecServiceTest +public class ExtendedResponseTest { - @BeforeEach - public void init() + private static LdapApiService codec; + + @BeforeAll + public static void init() { + codec = new DefaultLdapCodecService(); codec.getExtendedResponseFactories().put( "1.3.6.1.4.1.18060.0.1.5", new GracefulDisconnectFactory( codec ) ); } diff --git a/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/extended/ads_impl/cancel/CancelRequestTest.java b/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/extended/ads_impl/cancel/CancelRequestTest.java index 5d84fd4..fea62dc 100644 --- a/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/extended/ads_impl/cancel/CancelRequestTest.java +++ b/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/extended/ads_impl/cancel/CancelRequestTest.java @@ -28,9 +28,10 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import org.apache.directory.api.asn1.DecoderException; import org.apache.directory.api.asn1.EncoderException; import org.apache.directory.api.asn1.util.Asn1Buffer; -import org.apache.directory.api.ldap.extras.AbstractCodecServiceTest; +import org.apache.directory.api.ldap.codec.api.LdapApiService; +import org.apache.directory.api.ldap.codec.osgi.DefaultLdapCodecService; import org.apache.directory.api.ldap.extras.extended.cancel.CancelRequest; -import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.parallel.Execution; import org.junit.jupiter.api.parallel.ExecutionMode; @@ -41,11 +42,14 @@ import org.junit.jupiter.api.parallel.ExecutionMode; * @author Apache Directory Project */ @Execution( ExecutionMode.CONCURRENT) -public class CancelRequestTest extends AbstractCodecServiceTest +public class CancelRequestTest { - @BeforeEach - public void init() + private static LdapApiService codec; + + @BeforeAll + public static void init() { + codec = new DefaultLdapCodecService(); codec.registerExtendedRequest( new CancelFactory( codec ) ); } diff --git a/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/extended/ads_impl/certGeneration/CertGenerationRequestTest.java b/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/extended/ads_impl/certGeneration/CertGenerationRequestTest.java index c7b4635..244ee74 100644 --- a/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/extended/ads_impl/certGeneration/CertGenerationRequestTest.java +++ b/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/extended/ads_impl/certGeneration/CertGenerationRequestTest.java @@ -27,9 +27,10 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import org.apache.directory.api.asn1.DecoderException; import org.apache.directory.api.asn1.EncoderException; import org.apache.directory.api.asn1.util.Asn1Buffer; -import org.apache.directory.api.ldap.extras.AbstractCodecServiceTest; +import org.apache.directory.api.ldap.codec.api.LdapApiService; +import org.apache.directory.api.ldap.codec.osgi.DefaultLdapCodecService; import org.apache.directory.api.ldap.extras.extended.certGeneration.CertGenerationRequest; -import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.parallel.Execution; import org.junit.jupiter.api.parallel.ExecutionMode; @@ -41,11 +42,14 @@ import org.junit.jupiter.api.parallel.ExecutionMode; * @author Apache Directory Project */ @Execution( ExecutionMode.CONCURRENT) -public class CertGenerationRequestTest extends AbstractCodecServiceTest +public class CertGenerationRequestTest { - @BeforeEach - public void init() + private static LdapApiService codec; + + @BeforeAll + public static void init() { + codec = new DefaultLdapCodecService(); codec.registerExtendedRequest( new CertGenerationFactory( codec ) ); } diff --git a/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/extended/ads_impl/endTransaction/EndTransactionRequestTest.java b/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/extended/ads_impl/endTransaction/EndTransactionRequestTest.java index 9317443..14838e6 100644 --- a/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/extended/ads_impl/endTransaction/EndTransactionRequestTest.java +++ b/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/extended/ads_impl/endTransaction/EndTransactionRequestTest.java @@ -29,10 +29,11 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import org.apache.directory.api.asn1.DecoderException; import org.apache.directory.api.asn1.EncoderException; import org.apache.directory.api.asn1.util.Asn1Buffer; -import org.apache.directory.api.ldap.extras.AbstractCodecServiceTest; +import org.apache.directory.api.ldap.codec.api.LdapApiService; +import org.apache.directory.api.ldap.codec.osgi.DefaultLdapCodecService; import org.apache.directory.api.ldap.extras.extended.endTransaction.EndTransactionRequest; import org.apache.directory.api.util.Strings; -import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.parallel.Execution; import org.junit.jupiter.api.parallel.ExecutionMode; @@ -43,11 +44,14 @@ import org.junit.jupiter.api.parallel.ExecutionMode; * @author Apache Directory Project */ @Execution( ExecutionMode.CONCURRENT) -public class EndTransactionRequestTest extends AbstractCodecServiceTest +public class EndTransactionRequestTest { - @BeforeEach - public void init() + private static LdapApiService codec; + + @BeforeAll + public static void init() { + codec = new DefaultLdapCodecService(); codec.registerExtendedRequest( new EndTransactionFactory( codec ) ); } diff --git a/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/extended/ads_impl/endTransaction/EndTransactionResponseTest.java b/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/extended/ads_impl/endTransaction/EndTransactionResponseTest.java index d5cc936..708d2c7 100644 --- a/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/extended/ads_impl/endTransaction/EndTransactionResponseTest.java +++ b/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/extended/ads_impl/endTransaction/EndTransactionResponseTest.java @@ -32,8 +32,9 @@ import static org.junit.jupiter.api.Assertions.fail; import org.apache.directory.api.asn1.DecoderException; import org.apache.directory.api.asn1.EncoderException; import org.apache.directory.api.asn1.util.Asn1Buffer; +import org.apache.directory.api.ldap.codec.api.LdapApiService; import org.apache.directory.api.ldap.codec.api.LdapApiServiceFactory; -import org.apache.directory.api.ldap.extras.AbstractCodecServiceTest; +import org.apache.directory.api.ldap.codec.osgi.DefaultLdapCodecService; import org.apache.directory.api.ldap.extras.controls.syncrepl.syncDone.SyncDoneValue; import org.apache.directory.api.ldap.extras.controls.syncrepl.syncState.SyncStateTypeEnum; import org.apache.directory.api.ldap.extras.controls.syncrepl.syncState.SyncStateValue; @@ -46,7 +47,7 @@ import org.apache.directory.api.ldap.model.message.controls.PagedResults; import org.apache.directory.api.ldap.model.message.controls.SortResponse; import org.apache.directory.api.ldap.model.message.controls.SortResultCode; import org.apache.directory.api.util.Strings; -import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.parallel.Execution; import org.junit.jupiter.api.parallel.ExecutionMode; @@ -57,17 +58,15 @@ import org.junit.jupiter.api.parallel.ExecutionMode; * @author Apache Directory Project */ @Execution( ExecutionMode.CONCURRENT) -public class EndTransactionResponseTest extends AbstractCodecServiceTest +public class EndTransactionResponseTest { - static + private static LdapApiService codec; + + @BeforeAll + public static void init() { + codec = new DefaultLdapCodecService(); LdapApiServiceFactory.initialize( codec ); - } - - @BeforeEach - public void init() - { - codec = LdapApiServiceFactory.getSingleton(); codec.registerResponseControl( new SyncDoneValueFactory( codec ) ); codec.registerResponseControl( new SyncStateValueFactory( codec ) ); codec.registerExtendedResponse( new EndTransactionFactory( codec ) ); diff --git a/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/extended/ads_impl/gracefulDisconnect/GracefulDisconnectResponseTest.java b/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/extended/ads_impl/gracefulDisconnect/GracefulDisconnectResponseTest.java index 962d2cb..b14a618 100644 --- a/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/extended/ads_impl/gracefulDisconnect/GracefulDisconnectResponseTest.java +++ b/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/extended/ads_impl/gracefulDisconnect/GracefulDisconnectResponseTest.java @@ -29,9 +29,10 @@ import java.util.Iterator; import org.apache.directory.api.asn1.DecoderException; import org.apache.directory.api.asn1.EncoderException; import org.apache.directory.api.asn1.util.Asn1Buffer; -import org.apache.directory.api.ldap.extras.AbstractCodecServiceTest; +import org.apache.directory.api.ldap.codec.api.LdapApiService; +import org.apache.directory.api.ldap.codec.osgi.DefaultLdapCodecService; import org.apache.directory.api.ldap.extras.extended.gracefulDisconnect.GracefulDisconnectResponse; -import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.parallel.Execution; import org.junit.jupiter.api.parallel.ExecutionMode; @@ -42,11 +43,14 @@ import org.junit.jupiter.api.parallel.ExecutionMode; * @author Apache Directory Project */ @Execution( ExecutionMode.CONCURRENT) -public class GracefulDisconnectResponseTest extends AbstractCodecServiceTest +public class GracefulDisconnectResponseTest { - @BeforeEach - public void init() + private static LdapApiService codec; + + @BeforeAll + public static void init() { + codec = new DefaultLdapCodecService(); codec.registerExtendedResponse( new GracefulDisconnectFactory( codec ) ); } diff --git a/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/extended/ads_impl/gracefulShutdown/GracefulShutdownTest.java b/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/extended/ads_impl/gracefulShutdown/GracefulShutdownTest.java index 77a7185..f56538e 100644 --- a/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/extended/ads_impl/gracefulShutdown/GracefulShutdownTest.java +++ b/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/extended/ads_impl/gracefulShutdown/GracefulShutdownTest.java @@ -27,9 +27,10 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import org.apache.directory.api.asn1.DecoderException; import org.apache.directory.api.asn1.EncoderException; import org.apache.directory.api.asn1.util.Asn1Buffer; -import org.apache.directory.api.ldap.extras.AbstractCodecServiceTest; +import org.apache.directory.api.ldap.codec.api.LdapApiService; +import org.apache.directory.api.ldap.codec.osgi.DefaultLdapCodecService; import org.apache.directory.api.ldap.extras.extended.gracefulShutdown.GracefulShutdownRequest; -import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.parallel.Execution; import org.junit.jupiter.api.parallel.ExecutionMode; @@ -40,11 +41,14 @@ import org.junit.jupiter.api.parallel.ExecutionMode; * @author Apache Directory Project */ @Execution( ExecutionMode.CONCURRENT) -public class GracefulShutdownTest extends AbstractCodecServiceTest +public class GracefulShutdownTest { - @BeforeEach - public void init() + private static LdapApiService codec; + + @BeforeAll + public static void init() { + codec = new DefaultLdapCodecService(); codec.registerExtendedRequest( new GracefulShutdownFactory( codec ) ); } diff --git a/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyRequestTest.java b/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyRequestTest.java index e67e2b8..23774d3 100644 --- a/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyRequestTest.java +++ b/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyRequestTest.java @@ -27,10 +27,11 @@ import static org.junit.jupiter.api.Assertions.assertNull; import org.apache.directory.api.asn1.DecoderException; import org.apache.directory.api.asn1.util.Asn1Buffer; -import org.apache.directory.api.ldap.extras.AbstractCodecServiceTest; +import org.apache.directory.api.ldap.codec.api.LdapApiService; +import org.apache.directory.api.ldap.codec.osgi.DefaultLdapCodecService; import org.apache.directory.api.ldap.extras.extended.pwdModify.PasswordModifyRequest; import org.apache.directory.api.util.Strings; -import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.parallel.Execution; import org.junit.jupiter.api.parallel.ExecutionMode; @@ -41,11 +42,14 @@ import org.junit.jupiter.api.parallel.ExecutionMode; * @author Apache Directory Project */ @Execution( ExecutionMode.CONCURRENT) -public class PasswordModifyRequestTest extends AbstractCodecServiceTest +public class PasswordModifyRequestTest { - @BeforeEach - public void init() + private static LdapApiService codec; + + @BeforeAll + public static void init() { + codec = new DefaultLdapCodecService(); codec.registerExtendedRequest( new PasswordModifyFactory( codec ) ); } diff --git a/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyResponseTest.java b/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyResponseTest.java index 3259c3c..329b2a5 100644 --- a/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyResponseTest.java +++ b/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyResponseTest.java @@ -27,10 +27,11 @@ import static org.junit.jupiter.api.Assertions.assertNull; import org.apache.directory.api.asn1.DecoderException; import org.apache.directory.api.asn1.util.Asn1Buffer; -import org.apache.directory.api.ldap.extras.AbstractCodecServiceTest; +import org.apache.directory.api.ldap.codec.api.LdapApiService; +import org.apache.directory.api.ldap.codec.osgi.DefaultLdapCodecService; import org.apache.directory.api.ldap.extras.extended.pwdModify.PasswordModifyResponse; import org.apache.directory.api.util.Strings; -import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.parallel.Execution; import org.junit.jupiter.api.parallel.ExecutionMode; @@ -41,11 +42,14 @@ import org.junit.jupiter.api.parallel.ExecutionMode; * @author Apache Directory Project */ @Execution( ExecutionMode.CONCURRENT) -public class PasswordModifyResponseTest extends AbstractCodecServiceTest +public class PasswordModifyResponseTest { - @BeforeEach - public void init() + private static LdapApiService codec; + + @BeforeAll + public static void init() { + codec = new DefaultLdapCodecService(); codec.registerExtendedResponse( new PasswordModifyFactory( codec ) ); } diff --git a/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/extended/ads_impl/storedProcedure/StoredProcedureTest.java b/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/extended/ads_impl/storedProcedure/StoredProcedureTest.java index 866a6d3..3144a00 100644 --- a/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/extended/ads_impl/storedProcedure/StoredProcedureTest.java +++ b/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/extended/ads_impl/storedProcedure/StoredProcedureTest.java @@ -30,10 +30,11 @@ import org.apache.directory.api.asn1.ber.tlv.BerValue; import org.apache.directory.api.asn1.ber.tlv.IntegerDecoder; import org.apache.directory.api.asn1.ber.tlv.IntegerDecoderException; import org.apache.directory.api.asn1.util.Asn1Buffer; -import org.apache.directory.api.ldap.extras.AbstractCodecServiceTest; +import org.apache.directory.api.ldap.codec.api.LdapApiService; +import org.apache.directory.api.ldap.codec.osgi.DefaultLdapCodecService; import org.apache.directory.api.ldap.extras.extended.storedProcedure.StoredProcedureRequest; import org.apache.directory.api.util.Strings; -import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.parallel.Execution; import org.junit.jupiter.api.parallel.ExecutionMode; @@ -44,11 +45,14 @@ import org.junit.jupiter.api.parallel.ExecutionMode; * @author Apache Directory Project */ @Execution( ExecutionMode.CONCURRENT) -public class StoredProcedureTest extends AbstractCodecServiceTest +public class StoredProcedureTest { - @BeforeEach - public void init() + private static LdapApiService codec; + + @BeforeAll + public static void init() { + codec = new DefaultLdapCodecService(); codec.registerExtendedRequest( new StoredProcedureFactory( codec ) ); } diff --git a/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/extended/ads_impl/whoAmI/WhoAmIResponseTest.java b/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/extended/ads_impl/whoAmI/WhoAmIResponseTest.java index 3d25d3a..5aadbca 100644 --- a/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/extended/ads_impl/whoAmI/WhoAmIResponseTest.java +++ b/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/extended/ads_impl/whoAmI/WhoAmIResponseTest.java @@ -31,10 +31,11 @@ import java.nio.ByteBuffer; import org.apache.directory.api.asn1.DecoderException; import org.apache.directory.api.asn1.EncoderException; import org.apache.directory.api.asn1.util.Asn1Buffer; -import org.apache.directory.api.ldap.extras.AbstractCodecServiceTest; +import org.apache.directory.api.ldap.codec.api.LdapApiService; +import org.apache.directory.api.ldap.codec.osgi.DefaultLdapCodecService; import org.apache.directory.api.ldap.extras.extended.whoAmI.WhoAmIResponse; import org.apache.directory.api.util.Strings; -import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.parallel.Execution; import org.junit.jupiter.api.parallel.ExecutionMode; @@ -45,11 +46,14 @@ import org.junit.jupiter.api.parallel.ExecutionMode; * @author Apache Directory Project */ @Execution( ExecutionMode.CONCURRENT) -public class WhoAmIResponseTest extends AbstractCodecServiceTest +public class WhoAmIResponseTest { - @BeforeEach - public void init() + private static LdapApiService codec; + + @BeforeAll + public static void init() { + codec = new DefaultLdapCodecService(); codec.registerExtendedResponse( new WhoAmIFactory( codec ) ); } diff --git a/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/intermediate/syncrepl/SyncInfoValueControlTest.java b/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/intermediate/syncrepl/SyncInfoValueControlTest.java index 7c40b06..dd83a89 100644 --- a/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/intermediate/syncrepl/SyncInfoValueControlTest.java +++ b/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/intermediate/syncrepl/SyncInfoValueControlTest.java @@ -31,12 +31,13 @@ import java.nio.ByteBuffer; import org.apache.directory.api.asn1.DecoderException; import org.apache.directory.api.asn1.EncoderException; import org.apache.directory.api.asn1.util.Asn1Buffer; -import org.apache.directory.api.ldap.extras.AbstractCodecServiceTest; +import org.apache.directory.api.ldap.codec.api.LdapApiService; +import org.apache.directory.api.ldap.codec.osgi.DefaultLdapCodecService; import org.apache.directory.api.ldap.extras.intermediate.syncrepl.SyncInfoValue; import org.apache.directory.api.ldap.extras.intermediate.syncrepl.SynchronizationInfoEnum; import org.apache.directory.api.ldap.extras.intermediate.syncrepl_impl.SyncInfoValueFactory; import org.apache.directory.api.util.Strings; -import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.parallel.Execution; import org.junit.jupiter.api.parallel.ExecutionMode; @@ -47,11 +48,14 @@ import org.junit.jupiter.api.parallel.ExecutionMode; * @author Apache Directory Project */ @Execution( ExecutionMode.CONCURRENT) -public class SyncInfoValueControlTest extends AbstractCodecServiceTest +public class SyncInfoValueControlTest { - @BeforeEach - public void init() + private static LdapApiService codec; + + @BeforeAll + public static void init() { + codec = new DefaultLdapCodecService(); codec.registerIntermediateResponse( new SyncInfoValueFactory() ); }