Move remaining OpenLDAP and 389ds specific tests

11 files changed, 147 insertions, 1966 deletions

diff --git a/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/EntryEditorTest.java b/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/EntryEditorTest.java
index 804dfb961..24c230778 100644
--- a/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/EntryEditorTest.java
+++ b/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/EntryEditorTest.java
@@ -22,8 +22,8 @@ package org.apache.directory.studio.test.integration.ui;
 
 
 import static org.apache.directory.studio.test.integration.junit5.TestFixture.BJENSEN_DN;
-import static org.apache.directory.studio.test.integration.junit5.TestFixture.HNELSON_DN;
 import static org.apache.directory.studio.test.integration.junit5.TestFixture.GROUP1_DN;
+import static org.apache.directory.studio.test.integration.junit5.TestFixture.HNELSON_DN;
 import static org.apache.directory.studio.test.integration.junit5.TestFixture.MULTI_VALUED_RDN_DN;
 import static org.apache.directory.studio.test.integration.junit5.TestFixture.USER1_DN;
 import static org.hamcrest.CoreMatchers.startsWith;
@@ -55,6 +55,7 @@ import org.apache.directory.studio.test.integration.junit5.TestLdapServer;
 import org.apache.directory.studio.test.integration.ui.bots.AciItemEditorDialogBot;
 import org.apache.directory.studio.test.integration.ui.bots.CertificateEditorDialogBot;
 import org.apache.directory.studio.test.integration.ui.bots.DnEditorDialogBot;
+import org.apache.directory.studio.test.integration.ui.bots.EditAttributeWizardBot;
 import org.apache.directory.studio.test.integration.ui.bots.EntryEditorBot;
 import org.apache.directory.studio.test.integration.ui.bots.HexEditorDialogBot;
 import org.apache.directory.studio.test.integration.ui.bots.ImageEditorDialogBot;
@@ -240,6 +241,57 @@ public class EntryEditorTest extends AbstractTestBase
 
 
     /**
+     * DIRSTUDIO-1267:Test adding, editing and deleting of attributes with language tag in the entry editor.
+     */
+    @ParameterizedTest
+    @LdapServersSource(types =
+        { LdapServerType.OpenLdap, LdapServerType.Fedora389ds })
+    public void testAddEditDeleteAttributeWithLanguageTag( TestLdapServer server ) throws Exception
+    {
+        connectionsViewBot.createTestConnection( server );
+        browserViewBot.selectEntry( path( USER1_DN ) );
+
+        EntryEditorBot entryEditorBot = studioBot.getEntryEditorBot( USER1_DN.getName() );
+        entryEditorBot.activate();
+
+        // add attribute description;lang-en
+        entryEditorBot.activate();
+        NewAttributeWizardBot wizardBot = entryEditorBot.openNewAttributeWizard();
+        assertTrue( wizardBot.isVisible() );
+        wizardBot.typeAttributeType( "description" );
+        wizardBot.clickNextButton();
+        wizardBot.setLanguageTag( "en", "" );
+        wizardBot.clickFinishButton();
+        entryEditorBot.typeValueAndFinish( "English" );
+        modificationLogsViewBot.waitForText( "add: description;lang-en\ndescription;lang-en: English\n-" );
+        assertTrue( entryEditorBot.getAttributeValues().contains( "description;lang-en: English" ) );
+
+        // edit the attribute to description;lang-en
+        EditAttributeWizardBot editWizardBot = entryEditorBot.editAttribute( "description;lang-en", "English" );
+        editWizardBot.clickNextButton();
+        editWizardBot.setLanguageTag( "en", "us" );
+        editWizardBot.clickFinishButton();
+        modificationLogsViewBot.waitForText( "delete: description;lang-en\ndescription;lang-en: English\n-" );
+        modificationLogsViewBot.waitForText( "add: description;lang-en-us\ndescription;lang-en-us: English\n-" );
+        assertFalse( entryEditorBot.getAttributeValues().contains( "description;lang-en: English" ) );
+        assertTrue( entryEditorBot.getAttributeValues().contains( "description;lang-en-us: English" ) );
+
+        // edit the value
+        entryEditorBot.editValue( "description;lang-en-us", "English" );
+        entryEditorBot.typeValueAndFinish( "English US" );
+        modificationLogsViewBot.waitForText( "delete: description;lang-en-us\ndescription;lang-en-us: English\n-" );
+        modificationLogsViewBot.waitForText( "add: description;lang-en-us\ndescription;lang-en-us: English US\n-" );
+        assertFalse( entryEditorBot.getAttributeValues().contains( "description;lang-en-us: English" ) );
+        assertTrue( entryEditorBot.getAttributeValues().contains( "description;lang-en-us: English US" ) );
+
+        // delete the attribute
+        entryEditorBot.deleteValue( "description;lang-en-us", "English US" );
+        modificationLogsViewBot.waitForText( "delete: description;lang-en-us\ndescription;lang-en-us: English US\n-" );
+        assertFalse( entryEditorBot.getAttributeValues().contains( "description;lang-en-us: English US" ) );
+    }
+
+
+    /**
      * DIRSTUDIO-483: DN Editor escapes all non-ascii characters
      */
     @ParameterizedTest
@@ -521,7 +573,8 @@ public class EntryEditorTest extends AbstractTestBase
 
 
     /**
-     * DIRSTUDIO-1199, DIRSTUDIO-1204, DIRSTUDIO-1267: Binary attributes
+     * DIRSTUDIO-1199, DIRSTUDIO-1204, DIRSTUDIO-1267: Binary attributes.
+     * Test adding, editing and deleting of attributes with binary option in the entry editor.
      */
     @ParameterizedTest
     @LdapServersSource
@@ -529,24 +582,23 @@ public class EntryEditorTest extends AbstractTestBase
     {
         connectionsViewBot.createTestConnection( server );
         String certFile = ResourceUtils.prepareInputFile( "rfc5280_cert2.cer" );
+        String cert3File = ResourceUtils.prepareInputFile( "rfc5280_cert3.cer" );
 
         browserViewBot.selectEntry( path( BJENSEN_DN ) );
 
         EntryEditorBot entryEditorBot = studioBot.getEntryEditorBot( BJENSEN_DN.getName() );
         entryEditorBot.activate();
 
+        // add userCertificate;binary
         NewAttributeWizardBot wizardBot = entryEditorBot.openNewAttributeWizard();
         assertTrue( wizardBot.isVisible() );
         wizardBot.typeAttributeType( "userCertificate" );
         wizardBot.clickNextButton();
         wizardBot.selectBinaryOption();
         CertificateEditorDialogBot certEditorBot = wizardBot.clickFinishButtonExpectingCertificateEditor();
-
         assertTrue( certEditorBot.isVisible() );
         certEditorBot.typeFile( certFile );
-
         certEditorBot.clickOkButton();
-
         modificationLogsViewBot.waitForText( "add: userCertificate;binary\nuserCertificate;binary:: " );
         if ( server.getType() == LdapServerType.OpenLdap || server.getType() == LdapServerType.Fedora389ds )
         {
@@ -558,6 +610,57 @@ public class EntryEditorTest extends AbstractTestBase
             assertTrue( entryEditorBot.getAttributeValues()
                 .contains( "userCertificate: X.509v3: CN=End Entity,DC=example,DC=com" ) );
         }
+
+        // edit userCertificate;binary
+        if ( server.getType() == LdapServerType.OpenLdap || server.getType() == LdapServerType.Fedora389ds )
+        {
+            certEditorBot = entryEditorBot.editValueExpectingCertificateEditor( "userCertificate;binary",
+                "X.509v3: CN=End Entity,DC=example,DC=com" );
+        }
+        else
+        {
+            certEditorBot = entryEditorBot.editValueExpectingCertificateEditor( "userCertificate",
+                "X.509v3: CN=End Entity,DC=example,DC=com" );
+        }
+        assertTrue( certEditorBot.isVisible() );
+        certEditorBot.typeFile( cert3File );
+        certEditorBot.clickOkButton();
+        if ( server.getType() == LdapServerType.OpenLdap || server.getType() == LdapServerType.Fedora389ds )
+        {
+            modificationLogsViewBot
+                .waitForText( "delete: userCertificate;binary\nuserCertificate;binary:: MIICcTCCAdqg" );
+            modificationLogsViewBot.waitForText( "add: userCertificate;binary\nuserCertificate;binary:: MIIDjjCCA06g" );
+            assertFalse( entryEditorBot.getAttributeValues()
+                .contains( "userCertificate;binary: X.509v3: CN=End Entity,DC=example,DC=com" ) );
+            assertTrue( entryEditorBot.getAttributeValues()
+                .contains( "userCertificate;binary: X.509v3: CN=DSA End Entity,DC=example,DC=com" ) );
+        }
+        else
+        {
+            modificationLogsViewBot.waitForText( "delete: userCertificate\nuserCertificate:: MIICcTCCAdqg" );
+            modificationLogsViewBot.waitForText( "add: userCertificate\nuserCertificate:: MIIDjjCCA06g" );
+            assertFalse( entryEditorBot.getAttributeValues()
+                .contains( "userCertificate: X.509v3: CN=End Entity,DC=example,DC=com" ) );
+            assertTrue( entryEditorBot.getAttributeValues()
+                .contains( "userCertificate: X.509v3: CN=DSA End Entity,DC=example,DC=com" ) );
+        }
+
+        // delete userCertificate;binary
+        if ( server.getType() == LdapServerType.OpenLdap || server.getType() == LdapServerType.Fedora389ds )
+        {
+            entryEditorBot.deleteValue( "userCertificate;binary", "X.509v3: CN=DSA End Entity,DC=example,DC=com" );
+            modificationLogsViewBot
+                .waitForText( "delete: userCertificate;binary\nuserCertificate;binary:: MIIDjjCCA06g" );
+            assertFalse( entryEditorBot.getAttributeValues()
+                .contains( "userCertificate;binary: X.509v3: CN=DSA End Entity,DC=example,DC=com" ) );
+        }
+        else
+        {
+            entryEditorBot.deleteValue( "userCertificate", "X.509v3: CN=DSA End Entity,DC=example,DC=com" );
+            modificationLogsViewBot.waitForText( "delete: userCertificate\nuserCertificate:: MIIDjjCCA06g" );
+            assertFalse( entryEditorBot.getAttributeValues()
+                .contains( "userCertificate: X.509v3: CN=DSA End Entity,DC=example,DC=com" ) );
+        }
     }
 
 
diff --git a/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/Fedora389dsTest.java b/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/Fedora389dsTest.java
deleted file mode 100644
index 23502762b..000000000
--- a/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/Fedora389dsTest.java
+++ /dev/null
@@ -1,353 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- *
- */
-
-package org.apache.directory.studio.test.integration.ui;
-
-
-import static org.apache.directory.studio.test.integration.ui.Constants.LOCALHOST;
-import static org.hamcrest.CoreMatchers.containsString;
-import static org.hamcrest.MatcherAssert.assertThat;
-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 java.util.Collections;
-import java.util.List;
-import java.util.stream.Collectors;
-import java.util.stream.StreamSupport;
-
-import org.apache.commons.lang3.StringUtils;
-import org.apache.directory.api.ldap.model.exception.LdapAuthenticationException;
-import org.apache.directory.api.ldap.model.ldif.LdifEntry;
-import org.apache.directory.api.ldap.model.ldif.LdifReader;
-import org.apache.directory.ldap.client.api.LdapNetworkConnection;
-import org.apache.directory.ldap.client.api.exception.InvalidConnectionException;
-import org.apache.directory.studio.connection.core.Connection;
-import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection;
-import org.apache.directory.studio.test.integration.ui.bots.BrowserViewBot;
-import org.apache.directory.studio.test.integration.ui.bots.ConnectionsViewBot;
-import org.apache.directory.studio.test.integration.ui.bots.EntryEditorBot;
-import org.apache.directory.studio.test.integration.ui.bots.ModificationLogsViewBot;
-import org.apache.directory.studio.test.integration.ui.bots.NewAttributeWizardBot;
-import org.apache.directory.studio.test.integration.ui.bots.NewConnectionWizardBot;
-import org.apache.directory.studio.test.integration.ui.bots.SearchDialogBot;
-import org.apache.directory.studio.test.integration.ui.bots.StudioBot;
-import org.apache.directory.studio.test.integration.ui.bots.utils.Assertions;
-import org.apache.directory.studio.test.integration.ui.bots.utils.FrameworkRunnerWithScreenshotCaptureListener;
-import org.junit.After;
-import org.junit.Assume;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-
-/**
- * Tests against 389 Directory Sever.
- * 
- * Expects a running 389ds server with below default connection parameters
- * which can be configured via environment variables.
- *
- * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
- * @version $Rev$, $Date$
- */
-@Ignore
-@RunWith(FrameworkRunnerWithScreenshotCaptureListener.class)
-public class Fedora389dsTest
-{
-    static String getOrDefault( String key, String defaultValue )
-    {
-        return System.getenv().getOrDefault( key, defaultValue );
-    }
-
-    private static final String FEDORA_389DS_HOST = getOrDefault( "FEDORA_389DS_HOST", LOCALHOST );
-    private static final int FEDORA_389DS_PORT = Integer.parseInt( getOrDefault( "FEDORA_389DS_PORT", "21389" ) );
-    private static final String FEDORA_389DS_ADMIN_DN = getOrDefault( "FEDORA_389DS_ADMIN_DN", "cn=Directory Manager" );
-    private static final String FEDORA_389DS_ADMIN_PASSWORD = getOrDefault( "FEDORA_389DS_ADMIN_PASSWORD", "admin" );
-
-    @BeforeClass
-    public static void skip389dsTestIfNotRunning() throws Exception
-    {
-
-        try ( LdapNetworkConnection connection = new LdapNetworkConnection( FEDORA_389DS_HOST, FEDORA_389DS_PORT ) )
-        {
-            connection.connect();
-            connection.bind( FEDORA_389DS_ADMIN_DN, FEDORA_389DS_ADMIN_PASSWORD );
-        }
-        catch ( InvalidConnectionException e )
-        {
-            Assume.assumeNoException(
-                "Skipping tests as connection to Fedora 389 DS failed: " + FEDORA_389DS_HOST + ":" + FEDORA_389DS_PORT, e );
-        }
-        catch ( LdapAuthenticationException e )
-        {
-            Assume.assumeNoException(
-                "Skipping tests as bind to Fedora 389 DS failed: " + FEDORA_389DS_HOST + ":" + FEDORA_389DS_PORT, e );
-        }
-    }
-
-    private StudioBot studioBot;
-    private ConnectionsViewBot connectionsViewBot;
-    private BrowserViewBot browserViewBot;
-    private ModificationLogsViewBot modificationLogsViewBot;
-    
-    private Connection connection;
-
-    @Before
-    public void setUp() throws Exception
-    {
-        try ( LdapNetworkConnection connection = new LdapNetworkConnection( FEDORA_389DS_HOST, FEDORA_389DS_PORT );
-            LdifReader ldifReader = new LdifReader( Fedora389dsTest.class.getResourceAsStream( "Fedora389dsTest.ldif" ) ) )
-        {
-            connection.bind( FEDORA_389DS_ADMIN_DN, FEDORA_389DS_ADMIN_PASSWORD );
-            for ( LdifEntry entry : ldifReader )
-            {
-                connection.add( entry.getEntry() );
-            }
-        }
-
-        studioBot = new StudioBot();
-        studioBot.resetLdapPerspective();
-        connectionsViewBot = studioBot.getConnectionView();
-        connection = connectionsViewBot.createTestConnection( "Fedora389dsTest", FEDORA_389DS_HOST, FEDORA_389DS_PORT,
-            FEDORA_389DS_ADMIN_DN, FEDORA_389DS_ADMIN_PASSWORD );
-        browserViewBot = studioBot.getBrowserView();
-        modificationLogsViewBot = studioBot.getModificationLogsViewBot();
-    }
-
-
-    @After
-    public void tearDown() throws Exception
-    {
-        connectionsViewBot.deleteTestConnections();
-        Assertions.genericTearDownAssertions();
-
-        try ( LdapNetworkConnection connection = new LdapNetworkConnection( FEDORA_389DS_HOST, FEDORA_389DS_PORT );
-            LdifReader ldifReader = new LdifReader( Fedora389dsTest.class.getResourceAsStream( "Fedora389dsTest.ldif" ) ) )
-        {
-            connection.bind( FEDORA_389DS_ADMIN_DN, FEDORA_389DS_ADMIN_PASSWORD );
-            List<LdifEntry> ldifEntries = StreamSupport.stream( ldifReader.spliterator(), false )
-                .collect( Collectors.toList() );
-            Collections.reverse( ldifEntries );
-            for ( LdifEntry entry : ldifEntries )
-            {
-                connection.delete( entry.getDn() );
-            }
-        }
-    }
-
-
-    @Test
-    public void testBrowseWithPagingWithScrollMode()
-    {
-        browserViewBot.selectEntry( "DIT", "Root DSE", "dc=example,dc=org", "ou=users" );
-
-        // enable Simple Paged Results control
-        connection.getConnectionParameter().setExtendedBoolProperty(
-            IBrowserConnection.CONNECTION_PARAMETER_PAGED_SEARCH, true );
-        connection.getConnectionParameter().setExtendedIntProperty(
-            IBrowserConnection.CONNECTION_PARAMETER_PAGED_SEARCH_SIZE, 3 );
-        connection.getConnectionParameter().setExtendedBoolProperty(
-            IBrowserConnection.CONNECTION_PARAMETER_PAGED_SEARCH_SCROLL_MODE, true );
-
-        // 1st page
-        browserViewBot.expandEntry( "DIT", "Root DSE", "dc=example,dc=org", "ou=users" );
-        assertFalse(
-            browserViewBot.existsEntry( "DIT", "Root DSE", "dc=example,dc=org", "ou=users", "--- Top Page ---" ) );
-        assertTrue(
-            browserViewBot.existsEntry( "DIT", "Root DSE", "dc=example,dc=org", "ou=users", "--- Next Page ---" ) );
-
-        // next page
-        browserViewBot.selectEntry( "DIT", "Root DSE", "dc=example,dc=org", "ou=users", "--- Next Page ---" );
-        assertTrue(
-            browserViewBot.existsEntry( "DIT", "Root DSE", "dc=example,dc=org", "ou=users", "--- Top Page ---" ) );
-        assertTrue(
-            browserViewBot.existsEntry( "DIT", "Root DSE", "dc=example,dc=org", "ou=users", "--- Next Page ---" ) );
-
-        // last page
-        browserViewBot.selectEntry( "DIT", "Root DSE", "dc=example,dc=org", "ou=users", "--- Next Page ---" );
-        assertTrue(
-            browserViewBot.existsEntry( "DIT", "Root DSE", "dc=example,dc=org", "ou=users", "--- Top Page ---" ) );
-        assertFalse(
-            browserViewBot.existsEntry( "DIT", "Root DSE", "dc=example,dc=org", "ou=users", "--- Next Page ---" ) );
-
-        // back to top
-        browserViewBot.selectEntry( "DIT", "Root DSE", "dc=example,dc=org", "ou=users", "--- Top Page ---" );
-        assertFalse(
-            browserViewBot.existsEntry( "DIT", "Root DSE", "dc=example,dc=org", "ou=users", "--- Top Page ---" ) );
-        assertTrue(
-            browserViewBot.existsEntry( "DIT", "Root DSE", "dc=example,dc=org", "ou=users", "--- Next Page ---" ) );
-    }
-
-
-    @Test
-    public void testBrowseWithPagingWithoutScrollMode()
-    {
-        browserViewBot.selectEntry( "DIT", "Root DSE", "dc=example,dc=org", "ou=users" );
-
-        // enable Simple Paged Results control
-        connection.getConnectionParameter().setExtendedBoolProperty(
-            IBrowserConnection.CONNECTION_PARAMETER_PAGED_SEARCH, true );
-        connection.getConnectionParameter().setExtendedIntProperty(
-            IBrowserConnection.CONNECTION_PARAMETER_PAGED_SEARCH_SIZE, 3 );
-        connection.getConnectionParameter().setExtendedBoolProperty(
-            IBrowserConnection.CONNECTION_PARAMETER_PAGED_SEARCH_SCROLL_MODE, false );
-
-        browserViewBot.expandEntry( "DIT", "Root DSE", "dc=example,dc=org", "ou=users" );
-        assertFalse(
-            browserViewBot.existsEntry( "DIT", "Root DSE", "dc=example,dc=org", "ou=users", "--- Top Page ---" ) );
-        assertFalse(
-            browserViewBot.existsEntry( "DIT", "Root DSE", "dc=example,dc=org", "ou=users", "--- Next Page ---" ) );
-        assertTrue( browserViewBot.existsEntry( "DIT", "Root DSE", "dc=example,dc=org", "ou=users (8)" ) );
-        assertTrue( browserViewBot.existsEntry( "DIT", "Root DSE", "dc=example,dc=org", "ou=users", "uid=user.1" ) );
-        assertTrue( browserViewBot.existsEntry( "DIT", "Root DSE", "dc=example,dc=org", "ou=users", "uid=user.8" ) );
-    }
-
-
-    @Test
-    public void testSearchWithPagingWithScrollMode() throws Exception
-    {
-        String searchName = "Paged search with scroll mode";
-        browserViewBot.selectEntry( "DIT", "Root DSE", "dc=example,dc=org", "ou=users" );
-        SearchDialogBot dialogBot = browserViewBot.openSearchDialog();
-        assertTrue( dialogBot.isVisible() );
-        dialogBot.setSearchName( searchName );
-        dialogBot.setFilter( "(objectClass=*)" );
-        dialogBot.setReturningAttributes( "objectClass,ou,cn,uid" );
-        dialogBot.setControlPagedSearch( true, 3, true );
-        dialogBot.clickSearchButton();
-
-        // 1st page
-        browserViewBot.expandEntry( "Searches", searchName );
-        assertFalse( browserViewBot.existsEntry( "Searches", searchName, "--- Top Page ---" ) );
-        assertTrue( browserViewBot.existsEntry( "Searches", searchName, "--- Next Page ---" ) );
-
-        // next page
-        browserViewBot.selectEntry( "Searches", searchName, "--- Next Page ---" );
-        assertTrue( browserViewBot.existsEntry( "Searches", searchName, "--- Top Page ---" ) );
-        assertTrue( browserViewBot.existsEntry( "Searches", searchName, "--- Next Page ---" ) );
-
-        // last page
-        browserViewBot.selectEntry( "Searches", searchName, "--- Next Page ---" );
-        assertTrue( browserViewBot.existsEntry( "Searches", searchName, "--- Top Page ---" ) );
-        assertFalse( browserViewBot.existsEntry( "Searches", searchName, "--- Next Page ---" ) );
-
-        // back to top
-        browserViewBot.selectEntry( "Searches", searchName, "--- Top Page ---" );
-        assertFalse( browserViewBot.existsEntry( "Searches", searchName, "--- Top Page ---" ) );
-        assertTrue( browserViewBot.existsEntry( "Searches", searchName, "--- Next Page ---" ) );
-    }
-
-
-    @Test
-    public void testSearchWithPagingWithoutScrollMode() throws Exception
-    {
-        String searchName = "Paged search without scroll mode";
-        browserViewBot.selectEntry( "DIT", "Root DSE", "dc=example,dc=org", "ou=users" );
-        SearchDialogBot dialogBot = browserViewBot.openSearchDialog();
-        assertTrue( dialogBot.isVisible() );
-        dialogBot.setSearchName( searchName );
-        dialogBot.setFilter( "(objectClass=*)" );
-        dialogBot.setReturningAttributes( "objectClass,ou,cn,uid" );
-        dialogBot.setControlPagedSearch( true, 3, false );
-        dialogBot.clickSearchButton();
-
-        browserViewBot.expandEntry( "Searches", searchName );
-        assertFalse( browserViewBot.existsEntry( "Searches", searchName, "--- Top Page ---" ) );
-        assertFalse( browserViewBot.existsEntry( "Searches", searchName, "--- Next Page ---" ) );
-        assertTrue( browserViewBot.existsEntry( "Searches", searchName + " (9+)" ) );
-        assertTrue( browserViewBot.existsEntry( "Searches", searchName, "uid=user.1" ) );
-        assertTrue( browserViewBot.existsEntry( "Searches", searchName, "uid=user.8" ) );
-    }
-
-
-    @Test
-    public void testCheckAuthenticationButtonNotOK()
-    {
-        // enter connection parameter
-        NewConnectionWizardBot wizardBot = connectionsViewBot.openNewConnectionWizard();
-        wizardBot.typeConnectionName( "Fedora 389 DS connection test not ok" );
-        wizardBot.typeHost( FEDORA_389DS_HOST );
-        wizardBot.typePort( FEDORA_389DS_PORT );
-        wizardBot.clickNextButton();
-
-        // enter incorrect authentication parameter
-        wizardBot.typeUser( FEDORA_389DS_ADMIN_DN );
-        wizardBot.typePassword( "wrongpassword" );
-
-        // click "Check Network Parameter" button
-        String result = wizardBot.clickCheckAuthenticationButton();
-        assertNotNull( "Expected Error", result );
-        assertThat( result, containsString( "[LDAP result code 49 - invalidCredentials]" ) );
-
-        wizardBot.clickCancelButton();
-    }
-
-
-
-    /**
-     * Test adding, editing and deleting of attributes without equality matching rule in the entry editor.
-     */
-    @Test
-    public void testAddEditDeleteAttributeWithoutEqualityMatchingRule() throws Exception
-    {
-        browserViewBot.selectEntry( "DIT", "Root DSE", "dc=example,dc=org", "ou=users", "uid=user.1" );
-
-        EntryEditorBot entryEditorBot = studioBot.getEntryEditorBot( "uid=user.1,ou=users,dc=example,dc=org" );
-        entryEditorBot.activate();
-        String dn = entryEditorBot.getDnText();
-        assertEquals( "DN: uid=user.1,ou=users,dc=example,dc=org", dn );
-        assertEquals( 22, entryEditorBot.getAttributeValues().size() );
-        assertEquals( "", modificationLogsViewBot.getModificationLogsText() );
-
-        // add facsimileTelephoneNumber attribute
-        entryEditorBot.activate();
-        NewAttributeWizardBot wizardBot = entryEditorBot.openNewAttributeWizard();
-        assertTrue( wizardBot.isVisible() );
-        wizardBot.typeAttributeType( "facsimileTelephoneNumber" );
-        wizardBot.clickFinishButton();
-        entryEditorBot.typeValueAndFinish( "+1 234 567 890" );
-        assertEquals( 23, entryEditorBot.getAttributeValues().size() );
-        assertTrue( entryEditorBot.getAttributeValues().contains( "facsimileTelephoneNumber: +1 234 567 890" ) );
-        modificationLogsViewBot
-            .waitForText( "add: facsimileTelephoneNumber\nfacsimileTelephoneNumber: +1 234 567 890" );
-
-        // edit value
-        entryEditorBot.editValue( "facsimileTelephoneNumber", "+1 234 567 890" );
-        entryEditorBot.typeValueAndFinish( "000000000000" );
-        assertEquals( 23, entryEditorBot.getAttributeValues().size() );
-        assertFalse( entryEditorBot.getAttributeValues().contains( "facsimileTelephoneNumber: +1 234 567 890" ) );
-        assertTrue( entryEditorBot.getAttributeValues().contains( "facsimileTelephoneNumber: 000000000000" ) );
-        modificationLogsViewBot.waitForText( "delete: facsimileTelephoneNumber\nfacsimileTelephoneNumber: +1 234 567 890" );
-        modificationLogsViewBot.waitForText( "add: facsimileTelephoneNumber\nfacsimileTelephoneNumber: 000000000000" );
-
-        // delete 1st value/attribute
-        entryEditorBot.deleteValue( "facsimileTelephoneNumber", "000000000000" );
-        assertEquals( 22, entryEditorBot.getAttributeValues().size() );
-        assertFalse( entryEditorBot.getAttributeValues().contains( "facsimileTelephoneNumber: 000000000000" ) );
-        modificationLogsViewBot.waitForText( "delete: facsimileTelephoneNumber\nfacsimileTelephoneNumber: 000000000000\n-" );
-
-        assertEquals( "Expected 3 modifications.", 3,
-            StringUtils.countMatches( modificationLogsViewBot.getModificationLogsText(), "#!RESULT OK" ) );
-    }
-
-}
diff --git a/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/OpenLdapTest.java b/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/OpenLdapTest.java
deleted file mode 100644
index d31ccecdf..000000000
--- a/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/OpenLdapTest.java
+++ /dev/null
@@ -1,635 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- *
- */
-
-package org.apache.directory.studio.test.integration.ui;
-
-
-import static org.apache.directory.studio.test.integration.ui.Constants.LOCALHOST;
-import static org.hamcrest.CoreMatchers.containsString;
-import static org.hamcrest.MatcherAssert.assertThat;
-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 java.util.Collections;
-import java.util.List;
-import java.util.stream.Collectors;
-import java.util.stream.StreamSupport;
-
-import org.apache.commons.lang3.StringUtils;
-import org.apache.directory.api.ldap.model.entry.Modification;
-import org.apache.directory.api.ldap.model.exception.LdapAuthenticationException;
-import org.apache.directory.api.ldap.model.ldif.LdifEntry;
-import org.apache.directory.api.ldap.model.ldif.LdifReader;
-import org.apache.directory.ldap.client.api.LdapNetworkConnection;
-import org.apache.directory.ldap.client.api.exception.InvalidConnectionException;
-import org.apache.directory.studio.connection.core.Connection;
-import org.apache.directory.studio.ldapbrowser.core.BrowserCorePlugin;
-import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection;
-import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection.ModifyMode;
-import org.apache.directory.studio.ldapbrowser.core.model.schema.Schema;
-import org.apache.directory.studio.test.integration.ui.bots.BrowserViewBot;
-import org.apache.directory.studio.test.integration.ui.bots.CertificateEditorDialogBot;
-import org.apache.directory.studio.test.integration.ui.bots.ConnectionsViewBot;
-import org.apache.directory.studio.test.integration.ui.bots.DeleteDialogBot;
-import org.apache.directory.studio.test.integration.ui.bots.EditAttributeWizardBot;
-import org.apache.directory.studio.test.integration.ui.bots.EntryEditorBot;
-import org.apache.directory.studio.test.integration.ui.bots.ErrorDialogBot;
-import org.apache.directory.studio.test.integration.ui.bots.HexEditorDialogBot;
-import org.apache.directory.studio.test.integration.ui.bots.ModificationLogsViewBot;
-import org.apache.directory.studio.test.integration.ui.bots.NewAttributeWizardBot;
-import org.apache.directory.studio.test.integration.ui.bots.NewConnectionWizardBot;
-import org.apache.directory.studio.test.integration.ui.bots.NewEntryWizardBot;
-import org.apache.directory.studio.test.integration.ui.bots.SchemaBrowserBot;
-import org.apache.directory.studio.test.integration.ui.bots.SearchDialogBot;
-import org.apache.directory.studio.test.integration.ui.bots.StudioBot;
-import org.apache.directory.studio.test.integration.ui.bots.utils.Assertions;
-import org.apache.directory.studio.test.integration.ui.bots.utils.FrameworkRunnerWithScreenshotCaptureListener;
-import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException;
-import org.eclipse.swtbot.swt.finder.utils.SWTUtils;
-import org.junit.After;
-import org.junit.Assume;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-
-/**
- * Tests against OpenLDAP.
- * 
- * Expects a running OpenLDAP server with below default connection parameters
- * which can be configured via environment variables.
- *
- * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
- * @version $Rev$, $Date$
- */
-@Ignore
-@RunWith(FrameworkRunnerWithScreenshotCaptureListener.class)
-public class OpenLdapTest
-{
-    static String getOrDefault( String key, String defaultValue )
-    {
-        return System.getenv().getOrDefault( key, defaultValue );
-    }
-
-    private static final String OPENLDAP_HOST = getOrDefault( "OPENLDAP_HOST", LOCALHOST );
-    private static final int OPENLDAP_PORT = Integer.parseInt( getOrDefault( "OPENLDAP_PORT", "20389" ) );
-    private static final String OPENLDAP_ADMIN_DN = getOrDefault( "OPENLDAP_ADMIN_DN", "cn=admin,dc=example,dc=org" );
-    private static final String OPENLDAP_ADMIN_PASSWORD = getOrDefault( "OPENLDAP_ADMIN_PASSWORD", "admin" );
-    private static final String OPENLDAP_CONFIG_DN = getOrDefault( "OPENLDAP_CONFIG_DN", "cn=admin,cn=config" );
-    private static final String OPENLDAP_CONFIG_PASSWORD = getOrDefault( "OPENLDAP_CONFIG_PASSWORD", "config" );
-
-    @BeforeClass
-    public static void skipOpenLdapTestIfNotRunning() throws Exception
-    {
-
-        try ( LdapNetworkConnection connection = new LdapNetworkConnection( OPENLDAP_HOST, OPENLDAP_PORT ) )
-        {
-            connection.connect();
-            connection.bind( OPENLDAP_ADMIN_DN, OPENLDAP_ADMIN_PASSWORD );
-        }
-        catch ( InvalidConnectionException e )
-        {
-            Assume.assumeNoException(
-                "Skipping tests as connection to OpenLDAP server failed: " + OPENLDAP_HOST + ":" + OPENLDAP_PORT, e );
-        }
-        catch ( LdapAuthenticationException e )
-        {
-            Assume.assumeNoException(
-                "Skipping tests as bind to OpenLDAP server failed: " + OPENLDAP_HOST + ":" + OPENLDAP_PORT, e );
-        }
-    }
-
-    private StudioBot studioBot;
-    private ConnectionsViewBot connectionsViewBot;
-    private BrowserViewBot browserViewBot;
-    private ModificationLogsViewBot modificationLogsViewBot;
-
-    private Connection connection;
-
-    @Before
-    public void setUp() throws Exception
-    {
-        studioBot = new StudioBot();
-        studioBot.resetLdapPerspective();
-        connectionsViewBot = studioBot.getConnectionView();
-        connection = connectionsViewBot.createTestConnection( "OpenLdapTest", OPENLDAP_HOST, OPENLDAP_PORT,
-            OPENLDAP_ADMIN_DN, OPENLDAP_ADMIN_PASSWORD );
-        browserViewBot = studioBot.getBrowserView();
-        modificationLogsViewBot = studioBot.getModificationLogsViewBot();
-
-        try ( LdapNetworkConnection connection = new LdapNetworkConnection( OPENLDAP_HOST, OPENLDAP_PORT );
-            LdifReader ldifReader = new LdifReader( OpenLdapTest.class.getResourceAsStream( "OpenLdapTest.ldif" ) ) )
-        {
-            connection.bind( OPENLDAP_ADMIN_DN, OPENLDAP_ADMIN_PASSWORD );
-            for ( LdifEntry entry : ldifReader )
-            {
-                connection.add( entry.getEntry() );
-            }
-        }
-
-        try ( LdapNetworkConnection connection = new LdapNetworkConnection( OPENLDAP_HOST, OPENLDAP_PORT );
-            LdifReader ldifReader = new LdifReader( OpenLdapTest.class.getResourceAsStream( "OpenLdapConfig.ldif" ) ) )
-        {
-            connection.bind( OPENLDAP_CONFIG_DN, OPENLDAP_CONFIG_PASSWORD );
-            for ( LdifEntry entry : ldifReader )
-            {
-                for ( Modification modification : entry.getModifications() )
-                {
-                    connection.modify( entry.getDn(), modification );
-                }
-            }
-        }
-    }
-
-
-    @After
-    public void tearDown() throws Exception
-    {
-        connectionsViewBot.deleteTestConnections();
-        Assertions.genericTearDownAssertions();
-
-        try ( LdapNetworkConnection connection = new LdapNetworkConnection( OPENLDAP_HOST, OPENLDAP_PORT );
-            LdifReader ldifReader = new LdifReader( OpenLdapTest.class.getResourceAsStream( "OpenLdapTest.ldif" ) ) )
-        {
-            connection.bind( OPENLDAP_ADMIN_DN, OPENLDAP_ADMIN_PASSWORD );
-            List<LdifEntry> ldifEntries = StreamSupport.stream( ldifReader.spliterator(), false )
-                .collect( Collectors.toList() );
-            Collections.reverse( ldifEntries );
-            for ( LdifEntry entry : ldifEntries )
-            {
-                connection.delete( entry.getDn() );
-            }
-        }
-    }
-
-
-    @Test
-    public void testBrowseWithPagingWithScrollMode()
-    {
-        browserViewBot.selectEntry( "DIT", "Root DSE", "dc=example,dc=org", "ou=users" );
-
-        // enable Simple Paged Results control
-        connection.getConnectionParameter().setExtendedBoolProperty(
-            IBrowserConnection.CONNECTION_PARAMETER_PAGED_SEARCH, true );
-        connection.getConnectionParameter().setExtendedIntProperty(
-            IBrowserConnection.CONNECTION_PARAMETER_PAGED_SEARCH_SIZE, 3 );
-        connection.getConnectionParameter().setExtendedBoolProperty(
-            IBrowserConnection.CONNECTION_PARAMETER_PAGED_SEARCH_SCROLL_MODE, true );
-
-        // 1st page
-        browserViewBot.expandEntry( "DIT", "Root DSE", "dc=example,dc=org", "ou=users" );
-        assertFalse(
-            browserViewBot.existsEntry( "DIT", "Root DSE", "dc=example,dc=org", "ou=users", "--- Top Page ---" ) );
-        assertTrue(
-            browserViewBot.existsEntry( "DIT", "Root DSE", "dc=example,dc=org", "ou=users", "--- Next Page ---" ) );
-
-        // next page
-        browserViewBot.selectEntry( "DIT", "Root DSE", "dc=example,dc=org", "ou=users", "--- Next Page ---" );
-        assertTrue(
-            browserViewBot.existsEntry( "DIT", "Root DSE", "dc=example,dc=org", "ou=users", "--- Top Page ---" ) );
-        assertTrue(
-            browserViewBot.existsEntry( "DIT", "Root DSE", "dc=example,dc=org", "ou=users", "--- Next Page ---" ) );
-
-        // last page
-        browserViewBot.selectEntry( "DIT", "Root DSE", "dc=example,dc=org", "ou=users", "--- Next Page ---" );
-        assertTrue(
-            browserViewBot.existsEntry( "DIT", "Root DSE", "dc=example,dc=org", "ou=users", "--- Top Page ---" ) );
-        assertFalse(
-            browserViewBot.existsEntry( "DIT", "Root DSE", "dc=example,dc=org", "ou=users", "--- Next Page ---" ) );
-
-        // back to top
-        browserViewBot.selectEntry( "DIT", "Root DSE", "dc=example,dc=org", "ou=users", "--- Top Page ---" );
-        assertFalse(
-            browserViewBot.existsEntry( "DIT", "Root DSE", "dc=example,dc=org", "ou=users", "--- Top Page ---" ) );
-        assertTrue(
-            browserViewBot.existsEntry( "DIT", "Root DSE", "dc=example,dc=org", "ou=users", "--- Next Page ---" ) );
-    }
-
-
-    @Test
-    public void testBrowseWithPagingWithoutScrollMode()
-    {
-        browserViewBot.selectEntry( "DIT", "Root DSE", "dc=example,dc=org", "ou=users" );
-
-        // enable Simple Paged Results control
-        connection.getConnectionParameter().setExtendedBoolProperty(
-            IBrowserConnection.CONNECTION_PARAMETER_PAGED_SEARCH, true );
-        connection.getConnectionParameter().setExtendedIntProperty(
-            IBrowserConnection.CONNECTION_PARAMETER_PAGED_SEARCH_SIZE, 3 );
-        connection.getConnectionParameter().setExtendedBoolProperty(
-            IBrowserConnection.CONNECTION_PARAMETER_PAGED_SEARCH_SCROLL_MODE, false );
-
-        browserViewBot.expandEntry( "DIT", "Root DSE", "dc=example,dc=org", "ou=users" );
-        assertFalse(
-            browserViewBot.existsEntry( "DIT", "Root DSE", "dc=example,dc=org", "ou=users", "--- Top Page ---" ) );
-        assertFalse(
-            browserViewBot.existsEntry( "DIT", "Root DSE", "dc=example,dc=org", "ou=users", "--- Next Page ---" ) );
-        assertTrue( browserViewBot.existsEntry( "DIT", "Root DSE", "dc=example,dc=org", "ou=users (8)" ) );
-        assertTrue( browserViewBot.existsEntry( "DIT", "Root DSE", "dc=example,dc=org", "ou=users", "uid=user.1" ) );
-        assertTrue( browserViewBot.existsEntry( "DIT", "Root DSE", "dc=example,dc=org", "ou=users", "uid=user.8" ) );
-    }
-
-
-    @Test
-    public void testSearchWithPagingWithScrollMode() throws Exception
-    {
-        String searchName = "Paged search with scroll mode";
-        browserViewBot.selectEntry( "DIT", "Root DSE", "dc=example,dc=org", "ou=users" );
-        SearchDialogBot dialogBot = browserViewBot.openSearchDialog();
-        assertTrue( dialogBot.isVisible() );
-        dialogBot.setSearchName( searchName );
-        dialogBot.setFilter( "(objectClass=*)" );
-        dialogBot.setReturningAttributes( "objectClass,ou,cn,uid" );
-        dialogBot.setControlPagedSearch( true, 3, true );
-        dialogBot.clickSearchButton();
-
-        // 1st page
-        browserViewBot.expandEntry( "Searches", searchName );
-        assertFalse( browserViewBot.existsEntry( "Searches", searchName, "--- Top Page ---" ) );
-        assertTrue( browserViewBot.existsEntry( "Searches", searchName, "--- Next Page ---" ) );
-
-        // next page
-        browserViewBot.selectEntry( "Searches", searchName, "--- Next Page ---" );
-        assertTrue( browserViewBot.existsEntry( "Searches", searchName, "--- Top Page ---" ) );
-        assertTrue( browserViewBot.existsEntry( "Searches", searchName, "--- Next Page ---" ) );
-
-        // last page
-        browserViewBot.selectEntry( "Searches", searchName, "--- Next Page ---" );
-        assertTrue( browserViewBot.existsEntry( "Searches", searchName, "--- Top Page ---" ) );
-        assertFalse( browserViewBot.existsEntry( "Searches", searchName, "--- Next Page ---" ) );
-
-        // back to top
-        browserViewBot.selectEntry( "Searches", searchName, "--- Top Page ---" );
-        assertFalse( browserViewBot.existsEntry( "Searches", searchName, "--- Top Page ---" ) );
-        assertTrue( browserViewBot.existsEntry( "Searches", searchName, "--- Next Page ---" ) );
-    }
-
-
-    @Test
-    public void testSearchWithPagingWithoutScrollMode() throws Exception
-    {
-        String searchName = "Paged search without scroll mode";
-        browserViewBot.selectEntry( "DIT", "Root DSE", "dc=example,dc=org", "ou=users" );
-        SearchDialogBot dialogBot = browserViewBot.openSearchDialog();
-        assertTrue( dialogBot.isVisible() );
-        dialogBot.setSearchName( searchName );
-        dialogBot.setFilter( "(objectClass=*)" );
-        dialogBot.setReturningAttributes( "objectClass,ou,cn,uid" );
-        dialogBot.setControlPagedSearch( true, 3, false );
-        dialogBot.clickSearchButton();
-
-        browserViewBot.expandEntry( "Searches", searchName );
-        assertFalse( browserViewBot.existsEntry( "Searches", searchName, "--- Top Page ---" ) );
-        assertFalse( browserViewBot.existsEntry( "Searches", searchName, "--- Next Page ---" ) );
-        assertTrue( browserViewBot.existsEntry( "Searches", searchName + " (9+)" ) );
-        assertTrue( browserViewBot.existsEntry( "Searches", searchName, "uid=user.1" ) );
-        assertTrue( browserViewBot.existsEntry( "Searches", searchName, "uid=user.8" ) );
-    }
-
-
-    @Test
-    public void testCheckAuthenticationButtonNotOK()
-    {
-        // enter connection parameter
-        NewConnectionWizardBot wizardBot = connectionsViewBot.openNewConnectionWizard();
-        wizardBot.typeConnectionName( "OpenLDAP connection test not ok" );
-        wizardBot.typeHost( OPENLDAP_HOST );
-        wizardBot.typePort( OPENLDAP_PORT );
-        wizardBot.clickNextButton();
-
-        // enter incorrect authentication parameter
-        wizardBot.typeUser( OPENLDAP_ADMIN_DN );
-        wizardBot.typePassword( "wrongpassword" );
-
-        // click "Check Network Parameter" button
-        String result = wizardBot.clickCheckAuthenticationButton();
-        assertNotNull( "Expected Error", result );
-        assertThat( result, containsString( "[LDAP result code 49 - invalidCredentials]" ) );
-
-        wizardBot.clickCancelButton();
-    }
-
-
-
-
-    /**
-     * Test adding, editing and deleting of attributes without equality matching rule in the entry editor.
-     */
-    @Test
-    public void testAddEditDeleteAttributeWithoutEqualityMatchingRule() throws Exception
-    {
-        IBrowserConnection browserConnection = BrowserCorePlugin.getDefault().getConnectionManager()
-            .getBrowserConnection( connection );
-        browserConnection.setModifyModeNoEMR( ModifyMode.REPLACE );
-
-        browserViewBot.selectEntry( "DIT", "Root DSE", "dc=example,dc=org", "ou=users", "uid=user.1" );
-
-        EntryEditorBot entryEditorBot = studioBot.getEntryEditorBot( "uid=user.1,ou=users,dc=example,dc=org" );
-        entryEditorBot.activate();
-        String dn = entryEditorBot.getDnText();
-        assertEquals( "DN: uid=user.1,ou=users,dc=example,dc=org", dn );
-        assertEquals( 22, entryEditorBot.getAttributeValues().size() );
-        assertEquals( "", modificationLogsViewBot.getModificationLogsText() );
-
-        // add facsimileTelephoneNumber attribute
-        entryEditorBot.activate();
-        NewAttributeWizardBot wizardBot = entryEditorBot.openNewAttributeWizard();
-        assertTrue( wizardBot.isVisible() );
-        wizardBot.typeAttributeType( "facsimileTelephoneNumber" );
-        wizardBot.clickFinishButton();
-        entryEditorBot.typeValueAndFinish( "+1 234 567 890" );
-        assertEquals( 23, entryEditorBot.getAttributeValues().size() );
-        assertTrue( entryEditorBot.getAttributeValues().contains( "facsimileTelephoneNumber: +1 234 567 890" ) );
-        modificationLogsViewBot
-            .waitForText( "replace: facsimileTelephoneNumber\nfacsimileTelephoneNumber: +1 234 567 890" );
-
-        // edit value
-        entryEditorBot.editValue( "facsimileTelephoneNumber", "+1 234 567 890" );
-        entryEditorBot.typeValueAndFinish( "000000000000" );
-        assertEquals( 23, entryEditorBot.getAttributeValues().size() );
-        assertFalse( entryEditorBot.getAttributeValues().contains( "facsimileTelephoneNumber: +1 234 567 890" ) );
-        assertTrue( entryEditorBot.getAttributeValues().contains( "facsimileTelephoneNumber: 000000000000" ) );
-        modificationLogsViewBot
-            .waitForText( "replace: facsimileTelephoneNumber\nfacsimileTelephoneNumber: 000000000000" );
-
-        // delete 1st value/attribute
-        entryEditorBot.deleteValue( "facsimileTelephoneNumber", "000000000000" );
-        assertEquals( 22, entryEditorBot.getAttributeValues().size() );
-        assertFalse( entryEditorBot.getAttributeValues().contains( "facsimileTelephoneNumber: 000000000000" ) );
-        modificationLogsViewBot
-            .waitForText( "replace: facsimileTelephoneNumber\n-" );
-
-        assertEquals( "Expected 3 modifications.", 3,
-            StringUtils.countMatches( modificationLogsViewBot.getModificationLogsText(), "#!RESULT OK" ) );
-    }
-
-
-    @Test
-    public void testNoPermissionToReadSchema() throws Exception
-    {
-        // Close connection and reset cached schema
-        connectionsViewBot.closeSelectedConnections();
-        IBrowserConnection browserConnection = BrowserCorePlugin.getDefault().getConnectionManager()
-            .getBrowserConnection( connection );
-        browserConnection.setSchema( Schema.DEFAULT_SCHEMA );
-
-        // Open connection as uid=user.1 which is not allowed to read cn=subschema
-        connection.setBindPrincipal( "uid=user.1,ou=users,dc=example,dc=org" );
-        connection.setBindPassword( "password" );
-        ErrorDialogBot errorDialog = connectionsViewBot.openSelectedConnectionExpectingNoSchemaProvidedErrorDialog();
-        assertThat( errorDialog.getErrorDetails(),
-            containsString( "No schema information returned by server, using default schema." ) );
-        errorDialog.clickOkButton();
-
-        // Verify default schema is used
-        SchemaBrowserBot schemaBrowser = connectionsViewBot.openSchemaBrowser();
-        schemaBrowser.selectObjectClass( "DEFAULTSCHEMA" );
-        String rawSchemaDefinition = schemaBrowser.getRawSchemaDefinition();
-        assertNotNull( rawSchemaDefinition );
-        assertTrue( rawSchemaDefinition.contains( "This is the Default Schema" ) );
-
-        // Verify browser
-        browserViewBot.selectEntry( "DIT", "Root DSE" );
-    }
-
-
-    /**
-     * DIRSTUDIO-1267: Test creation of new entry with binary option and language tags.
-     */
-    @Test
-    public void testCreateEntryWithBinaryOptionAndLanguageTags() throws Exception
-    {
-        String certFile = ResourceUtils.prepareInputFile( "rfc5280_cert1.cer" );
-        String crlFile = ResourceUtils.prepareInputFile( "rfc5280_crl.crl" );
-
-        browserViewBot.selectEntry( "DIT", "Root DSE", "dc=example,dc=org", "ou=users" );
-
-        NewEntryWizardBot wizardBot = browserViewBot.openNewEntryWizard();
-
-        wizardBot.selectCreateEntryFromScratch();
-        wizardBot.clickNextButton();
-        wizardBot.addObjectClasses( "organizationalRole" );
-        wizardBot.addObjectClasses( "certificationAuthority" );
-        wizardBot.clickNextButton();
-
-        wizardBot.setRdnType( 1, "cn" );
-        wizardBot.setRdnValue( 1, "asdf" );
-        wizardBot.clickNextButton();
-
-        // by default the hex or certificate editor is opened, close it
-        try
-        {
-            new HexEditorDialogBot().clickCancelButton();
-        }
-        catch ( WidgetNotFoundException e )
-        {
-        }
-        try
-        {
-            new CertificateEditorDialogBot().clickCancelButton();
-        }
-        catch ( WidgetNotFoundException e )
-        {
-        }
-
-        wizardBot.activate();
-        NewAttributeWizardBot newAttributeWizardBot = wizardBot.openNewAttributeWizard();
-        assertTrue( newAttributeWizardBot.isVisible() );
-        newAttributeWizardBot.typeAttributeType( "description" );
-        newAttributeWizardBot.clickNextButton();
-        newAttributeWizardBot.setLanguageTag( "en", "us" );
-        newAttributeWizardBot.clickFinishButton();
-        wizardBot.cancelEditValue();
-        wizardBot.activate();
-        wizardBot.editValue( "description;lang-en-us", null );
-        SWTUtils.sleep( 1000 );
-        wizardBot.typeValueAndFinish( "English description" );
-
-        wizardBot.activate();
-        EditAttributeWizardBot editAttributeBot = wizardBot.editAttribute( "cACertificate", null );
-        editAttributeBot.clickNextButton();
-        editAttributeBot.selectBinaryOption();
-        editAttributeBot.clickFinishButton();
-
-        wizardBot.activate();
-        wizardBot.editValue( "cACertificate;binary", null );
-        CertificateEditorDialogBot certEditorBot = new CertificateEditorDialogBot();
-        assertTrue( certEditorBot.isVisible() );
-        certEditorBot.typeFile( certFile );
-        certEditorBot.clickOkButton();
-
-        wizardBot.activate();
-        editAttributeBot = wizardBot.editAttribute( "certificateRevocationList", null );
-        editAttributeBot.clickNextButton();
-        editAttributeBot.selectBinaryOption();
-        editAttributeBot.clickFinishButton();
-
-        wizardBot.activate();
-        wizardBot.editValue( "certificateRevocationList;binary", null );
-        HexEditorDialogBot hexEditorBot = new HexEditorDialogBot();
-        assertTrue( hexEditorBot.isVisible() );
-        hexEditorBot.typeFile( crlFile );
-        hexEditorBot.clickOkButton();
-
-        wizardBot.activate();
-        editAttributeBot = wizardBot.editAttribute( "authorityRevocationList", null );
-        editAttributeBot.clickNextButton();
-        editAttributeBot.selectBinaryOption();
-        editAttributeBot.clickFinishButton();
-
-        wizardBot.activate();
-        wizardBot.editValue( "authorityRevocationList;binary", null );
-        assertTrue( hexEditorBot.isVisible() );
-        hexEditorBot.typeFile( crlFile );
-        hexEditorBot.clickOkButton();
-
-        wizardBot.activate();
-        wizardBot.clickFinishButton();
-
-        assertTrue( browserViewBot.existsEntry( "DIT", "Root DSE", "dc=example,dc=org", "ou=users", "cn=asdf" ) );
-        browserViewBot.selectEntry( "DIT", "Root DSE", "dc=example,dc=org", "ou=users", "cn=asdf" );
-
-        EntryEditorBot entryEditorBot = studioBot.getEntryEditorBot( "cn=asdf,ou=users,dc=example,dc=org" );
-        entryEditorBot.activate();
-
-        modificationLogsViewBot.waitForText( "cACertificate;binary:: MIICPjCCAaeg" );
-        assertTrue( entryEditorBot.getAttributeValues()
-            .contains( "cACertificate;binary: X.509v3: CN=Example CA,DC=example,DC=com" ) );
-
-        modificationLogsViewBot.waitForText( "certificateRevocationList;binary:: MIIBYDCBygIB" );
-        assertTrue( entryEditorBot.getAttributeValues()
-            .contains( "certificateRevocationList;binary: Binary Data (356 Bytes)" ) );
-
-        modificationLogsViewBot.waitForText( "authorityRevocationList;binary:: MIIBYDCBygIB" );
-        assertTrue( entryEditorBot.getAttributeValues()
-            .contains( "authorityRevocationList;binary: Binary Data (356 Bytes)" ) );
-
-        modificationLogsViewBot.waitForText( "description;lang-en-us: English description" );
-        assertTrue( entryEditorBot.getAttributeValues()
-            .contains( "description;lang-en-us: English description" ) );
-
-        browserViewBot.selectEntry( "DIT", "Root DSE", "dc=example,dc=org", "ou=users", "cn=asdf" );
-        DeleteDialogBot deleteDialogBot = browserViewBot.openDeleteDialog();
-        deleteDialogBot.clickOkButton();
-    }
-
-
-    /**
-     * DIRSTUDIO-1267: Test adding, editing and deleting of attributes with binary option in the entry editor. 
-     */
-    @Test
-    public void testAddEditDeleteAttributeWithBinaryOption() throws Exception
-    {
-        String cert2File = ResourceUtils.prepareInputFile( "rfc5280_cert2.cer" );
-        String cert3File = ResourceUtils.prepareInputFile( "rfc5280_cert3.cer" );
-
-        browserViewBot.selectEntry( "DIT", "Root DSE", "dc=example,dc=org", "ou=users", "uid=user.1" );
-
-        EntryEditorBot entryEditorBot = studioBot.getEntryEditorBot( "uid=user.1,ou=users,dc=example,dc=org" );
-        entryEditorBot.activate();
-
-        // add userCertificate;binary
-        NewAttributeWizardBot wizardBot = entryEditorBot.openNewAttributeWizard();
-        assertTrue( wizardBot.isVisible() );
-        wizardBot.typeAttributeType( "userCertificate" );
-        wizardBot.clickNextButton();
-        wizardBot.selectBinaryOption();
-        CertificateEditorDialogBot certEditorBot = wizardBot.clickFinishButtonExpectingCertificateEditor();
-        assertTrue( certEditorBot.isVisible() );
-        certEditorBot.typeFile( cert2File );
-        certEditorBot.clickOkButton();
-        modificationLogsViewBot.waitForText( "add: userCertificate;binary\nuserCertificate;binary:: MIICcTCCAdqg" );
-        assertTrue( entryEditorBot.getAttributeValues()
-            .contains( "userCertificate;binary: X.509v3: CN=End Entity,DC=example,DC=com" ) );
-
-        // edit userCertificate;binary
-        certEditorBot = entryEditorBot.editValueExpectingCertificateEditor( "userCertificate;binary",
-            "X.509v3: CN=End Entity,DC=example,DC=com" );
-        assertTrue( certEditorBot.isVisible() );
-        certEditorBot.typeFile( cert3File );
-        certEditorBot.clickOkButton();
-        modificationLogsViewBot.waitForText( "delete: userCertificate;binary\nuserCertificate;binary:: MIICcTCCAdqg" );
-        modificationLogsViewBot.waitForText( "add: userCertificate;binary\nuserCertificate;binary:: MIIDjjCCA06g" );
-        assertFalse( entryEditorBot.getAttributeValues()
-            .contains( "userCertificate;binary: X.509v3: CN=End Entity,DC=example,DC=com" ) );
-        assertTrue( entryEditorBot.getAttributeValues()
-            .contains( "userCertificate;binary: X.509v3: CN=DSA End Entity,DC=example,DC=com" ) );
-
-        // delete userCertificate;binary
-        entryEditorBot.deleteValue( "userCertificate;binary", "X.509v3: CN=DSA End Entity,DC=example,DC=com" );
-        modificationLogsViewBot.waitForText( "delete: userCertificate;binary\nuserCertificate;binary:: MIIDjjCCA06g" );
-        assertFalse( entryEditorBot.getAttributeValues()
-            .contains( "userCertificate;binary: X.509v3: CN=DSA End Entity,DC=example,DC=com" ) );
-
-    }
-
-
-    /**
-     * DIRSTUDIO-1267:Test adding, editing and deleting of attributes with language tag in the entry editor.
-     */
-    @Test
-    public void testAddEditDeleteAttributeWithLanguageTag() throws Exception
-    {
-        browserViewBot.selectEntry( "DIT", "Root DSE", "dc=example,dc=org", "ou=users", "uid=user.1" );
-
-        EntryEditorBot entryEditorBot = studioBot.getEntryEditorBot( "uid=user.1,ou=users,dc=example,dc=org" );
-        entryEditorBot.activate();
-
-        // add attribute description;lang-en
-        entryEditorBot.activate();
-        NewAttributeWizardBot wizardBot = entryEditorBot.openNewAttributeWizard();
-        assertTrue( wizardBot.isVisible() );
-        wizardBot.typeAttributeType( "description" );
-        wizardBot.clickNextButton();
-        wizardBot.setLanguageTag( "en", "" );
-        wizardBot.clickFinishButton();
-        entryEditorBot.typeValueAndFinish( "English" );
-        modificationLogsViewBot.waitForText( "add: description;lang-en\ndescription;lang-en: English\n-" );
-        assertTrue( entryEditorBot.getAttributeValues().contains( "description;lang-en: English" ) );
-
-        // edit the attribute to description;lang-en
-        EditAttributeWizardBot editWizardBot = entryEditorBot.editAttribute( "description;lang-en", "English" );
-        editWizardBot.clickNextButton();
-        editWizardBot.setLanguageTag( "en", "us" );
-        editWizardBot.clickFinishButton();
-        modificationLogsViewBot.waitForText( "delete: description;lang-en\ndescription;lang-en: English\n-" );
-        modificationLogsViewBot.waitForText( "add: description;lang-en-us\ndescription;lang-en-us: English\n-" );
-        assertFalse( entryEditorBot.getAttributeValues().contains( "description;lang-en: English" ) );
-        assertTrue( entryEditorBot.getAttributeValues().contains( "description;lang-en-us: English" ) );
-
-        // edit the value
-        entryEditorBot.editValue( "description;lang-en-us", "English" );
-        entryEditorBot.typeValueAndFinish( "English US" );
-        modificationLogsViewBot.waitForText( "delete: description;lang-en-us\ndescription;lang-en-us: English\n-" );
-        modificationLogsViewBot.waitForText( "add: description;lang-en-us\ndescription;lang-en-us: English US\n-" );
-        assertFalse( entryEditorBot.getAttributeValues().contains( "description;lang-en-us: English" ) );
-        assertTrue( entryEditorBot.getAttributeValues().contains( "description;lang-en-us: English US" ) );
-
-        // delete the attribute
-        entryEditorBot.deleteValue( "description;lang-en-us", "English US" );
-        modificationLogsViewBot.waitForText( "delete: description;lang-en-us\ndescription;lang-en-us: English US\n-" );
-        assertFalse( entryEditorBot.getAttributeValues().contains( "description;lang-en-us: English US" ) );
-    }
-
-}
diff --git a/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/SchemaBrowserTest.java b/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/SchemaBrowserTest.java
index 77fdba93f..9afe9b849 100644
--- a/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/SchemaBrowserTest.java
+++ b/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/SchemaBrowserTest.java
@@ -21,12 +21,20 @@
 package org.apache.directory.studio.test.integration.ui;
 
 
+import static org.apache.directory.studio.test.integration.junit5.TestFixture.USER1_DN;
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
 import org.apache.directory.studio.connection.core.Connection;
+import org.apache.directory.studio.ldapbrowser.core.BrowserCorePlugin;
+import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection;
+import org.apache.directory.studio.ldapbrowser.core.model.schema.Schema;
+import org.apache.directory.studio.test.integration.junit5.LdapServerType;
 import org.apache.directory.studio.test.integration.junit5.LdapServersSource;
 import org.apache.directory.studio.test.integration.junit5.TestLdapServer;
+import org.apache.directory.studio.test.integration.ui.bots.ErrorDialogBot;
 import org.apache.directory.studio.test.integration.ui.bots.SchemaBrowserBot;
 import org.junit.jupiter.params.ParameterizedTest;
 
@@ -56,4 +64,35 @@ public class SchemaBrowserTest extends AbstractTestBase
         assertTrue( rawSchemaDefinition.contains( "account" ) );
     }
 
+
+    @ParameterizedTest
+    @LdapServersSource(types = LdapServerType.OpenLdap)
+    public void testNoPermissionToReadSchema( TestLdapServer server ) throws Exception
+    {
+        Connection connection = connectionsViewBot.createTestConnection( server );
+
+        // Close connection and reset cached schema
+        connectionsViewBot.closeSelectedConnections();
+        IBrowserConnection browserConnection = BrowserCorePlugin.getDefault().getConnectionManager()
+            .getBrowserConnection( connection );
+        browserConnection.setSchema( Schema.DEFAULT_SCHEMA );
+
+        // Open connection as uid=user.1 which is not allowed to read cn=subschema
+        connection.setBindPrincipal( USER1_DN.getName() );
+        connection.setBindPassword( "password" );
+        ErrorDialogBot errorDialog = connectionsViewBot.openSelectedConnectionExpectingNoSchemaProvidedErrorDialog();
+        assertThat( errorDialog.getErrorDetails(),
+            containsString( "No schema information returned by server, using default schema." ) );
+        errorDialog.clickOkButton();
+
+        // Verify default schema is used
+        SchemaBrowserBot schemaBrowser = connectionsViewBot.openSchemaBrowser();
+        schemaBrowser.selectObjectClass( "DEFAULTSCHEMA" );
+        String rawSchemaDefinition = schemaBrowser.getRawSchemaDefinition();
+        assertNotNull( rawSchemaDefinition );
+        assertTrue( rawSchemaDefinition.contains( "This is the Default Schema" ) );
+
+        // Verify browser
+        browserViewBot.selectEntry( ROOT_DSE_PATH );
+    }
 }
diff --git a/tests/test.integration.ui/src/main/resources/org/apache/directory/studio/test/integration/ui/BrowserTest.ldif b/tests/test.integration.ui/src/main/resources/org/apache/directory/studio/test/integration/ui/BrowserTest.ldif
deleted file mode 100644
index 761db633a..000000000
--- a/tests/test.integration.ui/src/main/resources/org/apache/directory/studio/test/integration/ui/BrowserTest.ldif
+++ /dev/null
@@ -1,298 +0,0 @@
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#
-dn: uid=user.1,ou=users,ou=system
-objectClass: top
-objectClass: person
-objectClass: organizationalPerson
-objectClass: inetOrgPerson
-givenName: Aaccf
-sn: Amar
-cn: Aaccf Amar
-initials: AA
-uid: user.1
-mail: user.1@null
-userPassword: password
-telephoneNumber: 976-893-3312
-homePhone: 337-310-0727
-pager: 185-156-4071
-mobile: 626-188-0934
-employeeNumber: 1
-street: 27919 Broadway Street
-l: Tallahassee
-st: DE
-postalCode: 67698
-postalAddress: Aaccf Amar$27919 Broadway Street$Tallahassee, DE  67698
-description: This is the description for Aaccf Amar.
-roomNumber: 1388
-
-dn: uid=user.2,ou=users,ou=system
-objectClass: top
-objectClass: person
-objectClass: organizationalPerson
-objectClass: inetOrgPerson
-givenName: Aaren
-sn: Atp
-cn: Aaren Atp
-initials: AA
-uid: user.2
-mail: user.2@null
-userPassword: password
-telephoneNumber: 147-953-0396
-homePhone: 174-439-5329
-pager: 617-443-8449
-mobile: 045-464-2512
-employeeNumber: 2
-street: 36109 Center Street
-l: Harlingen
-st: CO
-postalCode: 21733
-postalAddress: Aaren Atp$36109 Center Street$Harlingen, CO  21733
-description: This is the description for Aaren Atp.
-roomNumber: 1198
-
-dn: uid=user.3,ou=users,ou=system
-objectClass: top
-objectClass: person
-objectClass: organizationalPerson
-objectClass: inetOrgPerson
-givenName: Aarika
-sn: Atpco
-cn: Aarika Atpco
-initials: AA
-uid: user.3
-mail: user.3@null
-userPassword: password
-telephoneNumber: 925-356-4943
-homePhone: 099-983-0308
-pager: 806-672-7363
-mobile: 425-493-8009
-employeeNumber: 3
-street: 14730 Fourteenth Street
-l: Evansville
-st: ND
-postalCode: 95526
-postalAddress: Aarika Atpco$14730 Fourteenth Street$Evansville, ND  95526
-description: This is the description for Aarika Atpco.
-roomNumber: 1135
-
-dn: uid=user.4,ou=users,ou=system
-objectClass: top
-objectClass: person
-objectClass: organizationalPerson
-objectClass: inetOrgPerson
-givenName: Aaron
-sn: Atrc
-cn: Aaron Atrc
-initials: AA
-uid: user.4
-mail: user.4@null
-userPassword: password
-telephoneNumber: 696-981-0488
-homePhone: 854-401-1330
-pager: 389-028-9518
-mobile: 117-882-4912
-employeeNumber: 4
-street: 98495 Fifteenth Street
-l: Miami
-st: PA
-postalCode: 16887
-postalAddress: Aaron Atrc$98495 Fifteenth Street$Miami, PA  16887
-description: This is the description for Aaron Atrc.
-roomNumber: 1311
-
-dn: uid=user.5,ou=users,ou=system
-objectClass: top
-objectClass: person
-objectClass: organizationalPerson
-objectClass: inetOrgPerson
-givenName: Aartjan
-sn: Aalders
-cn: Aartjan Aalders
-initials: AA
-uid: user.5
-mail: user.5@null
-userPassword: password
-telephoneNumber: 657-627-9753
-homePhone: 109-158-4533
-pager: 801-392-0010
-mobile: 763-973-0947
-employeeNumber: 5
-street: 52408 Ridge Street
-l: Omaha
-st: AR
-postalCode: 08015
-postalAddress: Aartjan Aalders$52408 Ridge Street$Omaha, AR  08015
-description: This is the description for Aartjan Aalders.
-roomNumber: 1090
-
-dn: uid=user.6,ou=users,ou=system
-objectClass: top
-objectClass: person
-objectClass: organizationalPerson
-objectClass: inetOrgPerson
-givenName: Abagael
-sn: Aasen
-cn: Abagael Aasen
-initials: AA
-uid: user.6
-mail: user.6@null
-userPassword: password
-telephoneNumber: 600-556-9017
-homePhone: 543-731-7797
-pager: 349-743-6572
-mobile: 042-921-9717
-employeeNumber: 6
-street: 87514 Dogwood Street
-l: Bloomington
-st: ID
-postalCode: 56762
-postalAddress: Abagael Aasen$87514 Dogwood Street$Bloomington, ID  56762
-description: This is the description for Abagael Aasen.
-roomNumber: 1449
-
-dn: uid=user.7,ou=users,ou=system
-objectClass: top
-objectClass: person
-objectClass: organizationalPerson
-objectClass: inetOrgPerson
-givenName: Abagail
-sn: Abadines
-cn: Abagail Abadines
-initials: AA
-uid: user.7
-mail: user.7@null
-userPassword: password
-telephoneNumber: 628-294-0713
-homePhone: 313-764-3970
-pager: 118-541-2978
-mobile: 111-360-9243
-employeeNumber: 7
-street: 60751 Main Street
-l: Macon
-st: MI
-postalCode: 38755
-postalAddress: Abagail Abadines$60751 Main Street$Macon, MI  38755
-description: This is the description for Abagail Abadines.
-roomNumber: 1312
-
-dn: uid=user.8,ou=users,ou=system
-objectClass: top
-objectClass: person
-objectClass: organizationalPerson
-objectClass: inetOrgPerson
-givenName: Abahri
-sn: Abazari
-cn: Abahri Abazari
-initials: AA
-uid: user.8
-mail: user.8@null
-userPassword: password
-telephoneNumber: 760-373-5805
-homePhone: 856-861-3648
-pager: 271-218-0027
-mobile: 957-465-6928
-employeeNumber: 8
-street: 81023 River Street
-l: Monroe
-st: SD
-postalCode: 51865
-postalAddress: Abahri Abazari$81023 River Street$Monroe, SD  51865
-description: This is the description for Abahri Abazari.
-roomNumber: 1963
-
-dn: cn=\#ACL_AD-Projects_Author,ou=users,ou=system
-objectClass: top
-objectClass: person
-cn: #ACL_AD-Projects_Author
-sn: #ACL_AD-Projects_Author
-
-dn: cn=My Group,ou=groups,ou=system
-objectClass: groupOfNames
-objectClass: top
-cn: My Group
-member: cn=\#ACL_AD-Projects_Author,ou=users,ou=system
-
-dn: cn=nghZwwtHgxgyvVbTQCYyeY\+O4cc=,ou=users,ou=system
-objectClass: top
-objectClass: person
-cn: nghZwwtHgxgyvVbTQCYyeY+O4cc=
-sn: nghZwwtHgxgyvVbTQCYyeY+O4cc=
-
-dn: cn=nghZwwtHgxgyvVbTQCYyeY+email=,ou=users,ou=system
-objectClass: top
-objectClass: person
-objectClass: extensibleObject
-cn: nghZwwtHgxgyvVbTQCYyeY
-sn: nghZwwtHgxgyvVbTQCYyeY
-email: 
-
-dn: l=eu + l=de + l=Berlin + l=Brandenburger Tor, ou=users, ou=system
-objectClass: top
-objectClass: locality
-l: eu
-l: de
-l: Berlin
-l: Brandenburger Tor
-
-dn: cn=A, l=eu + l=de + l=Berlin + l=Brandenburger Tor, ou=users, ou=system
-objectClass: top
-objectClass: person
-cn: user.A
-sn: user.A
-
-dn: uid=user.0\,foo,ou=users, ou=system
-objectClass: top
-objectClass: person
-objectClass: organizationalPerson
-objectClass: inetOrgPerson
-sn: bbb
-cn: aaa
-uid: user.0,foo
-
-dn: ou=target,ou=system
-objectClass: top
-objectClass: organizationalUnit
-ou: target
-administrativeRole: accessControlSpecificArea
-
-dn: ou=special,ou=system
-objectClass: top
-objectClass: organizationalUnit
-ou: special
-administrativeRole: accessControlSpecificArea
-
-dn: cn=alias,ou=special,ou=system
-objectClass: alias
-objectClass: top
-objectClass: extensibleObject
-cn: alias
-aliasedObjectName: ou=special,ou=system
-
-dn: cn=referral,ou=special,ou=system
-objectClass: referral
-objectClass: top
-objectClass: extensibleObject
-cn: referral
-ref: ldap://foo.example.com/ou=system
-
-dn: cn=subentry,ou=special,ou=system
-objectClass: subentry
-objectClass: top
-cn: subentry
-subtreeSpecification: { }
-
diff --git a/tests/test.integration.ui/src/main/resources/org/apache/directory/studio/test/integration/ui/EntryEditorTest.ldif b/tests/test.integration.ui/src/main/resources/org/apache/directory/studio/test/integration/ui/EntryEditorTest.ldif
deleted file mode 100644
index 94a61d3c4..000000000
--- a/tests/test.integration.ui/src/main/resources/org/apache/directory/studio/test/integration/ui/EntryEditorTest.ldif
+++ /dev/null
@@ -1,102 +0,0 @@
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#
-dn: cn=Barbara Jensen,ou=users,ou=system
-objectClass: inetOrgPerson
-objectClass: organizationalPerson
-objectClass: person
-objectClass: top
-cn: Barbara Jensen
-sn: Jensen
-givenName: Barbara
-uid: bjensen
-
-dn: uid=hnelson,ou=users,ou=system
-objectClass: inetOrgPerson
-objectClass: organizationalPerson
-objectClass: person
-objectClass: top
-objectClass: extensibleObject
-objectclass: accessControlSubentry
-cn: Horatio Nelson
-sn: Nelson
-uid: hnelson
-description:: QSDDqSDigqwg0K8gzrsg16kg2Lkg4ruhIA==
-userPassword:: e1NTSEE1MTJ9aUlyTG1uR0MxdTNaTGFPWmRvSjZUMjBKdG9XQ05wWjArWGFLRnN
- 5bEVEdFpYK3I3bUZrcjRwYTNKMXE3VWpSZ3ZFV2lCd1FNUjZadjBoYnRsYnRqSTQ2TmR6WVRDdG9G
-jpegPhoto:: /9j/4AAQSkZJRgABAQEAYABgAAD/2wBDAAgGBgcGBQgHBwcJCQgKDBQNDAsLDBkSEw
- 8UHRofHh0aHBwgJC4nICIsIxwcKDcpLDAxNDQ0Hyc5PTgyPC4zNDL/2wBDAQkJCQwLDBgNDRgyIRw
- hMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjL/wAARCAAB
- AAEDASIAAhEBAxEB/8QAHwAAAQUBAQEBAQEAAAAAAAAAAAECAwQFBgcICQoL/8QAtRAAAgEDAwIEA
- wUFBAQAAAF9AQIDAAQRBRIhMUEGE1FhByJxFDKBkaEII0KxwRVS0fAkM2JyggkKFhcYGRolJicoKS
- o0NTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqDhIWGh4iJipKTlJWWl5iZmqK
- jpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uHi4+Tl5ufo6erx8vP09fb3+Pn6/8QA
- HwEAAwEBAQEBAQEBAQAAAAAAAAECAwQFBgcICQoL/8QAtREAAgECBAQDBAcFBAQAAQJ3AAECAxEEB
- SExBhJBUQdhcRMiMoEIFEKRobHBCSMzUvAVYnLRChYkNOEl8RcYGRomJygpKjU2Nzg5OkNERUZHSE
- lKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6goOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba
- 3uLm6wsPExcbHyMnK0tPU1dbX2Nna4uPk5ebn6Onq8vP09fb3+Pn6/9oADAMBAAIRAxEAPwD3+iii
- gD//2Q==
-entryACI: { identificationTag "test", precedence 1, authenticationLevel none, 
- itemOrUserFirst userFirst: { userClasses { subtree { { base "dc=example,dc=co
- m", minimum 1, maximum 2, specificExclusions { chopBefore: "dc=example,dc=com
- " } } }, allUsers, userGroup { "dc=example,dc=com" } }, userPermissions { { p
- recedence 2, protectedItems { allUserAttributeTypes, attributeValue {userpass
- word=*  }, maxImmSub 2, entry, maxValueCount {{ type userPassword, maxCount 2
- }} }, grantsAndDenials { denyRemove, grantReturnDN, denyModify, denyAdd, deny
- Rename, grantFilterMatch, grantBrowse, grantRead, grantCompare } } } } }
-userSMIMECertificate:: AAECAwQFBgcICQoLDA0ODxAREhMUFRYXGBkaGxwdHh8gISIjJCUmJyg
- pKissLS4vMDEyMzQ1Njc4OTo7PD0+P0BBQkNERUZHSElKS0xNTk9QUVJTVFVWV1hZWltcXV5fYGFi
- Y2RlZmdoaWprbG1ub3BxcnN0dXZ3eHl6e3x9fn+AgYKDhIWGh4iJiouMjY6PkJGSk5SVlpeYmZqbn
- J2en6ChoqOkpaanqKmqq6ytrq+wsbKztLW2t7i5uru8vb6/wMHCw8TFxsfIycrLzM3Oz9DR0tPU1d
- bX2Nna29zd3t/g4eLj5OXm5+jp6uvs7e7v8PHy8/T19vf4+fr7/P3+/w==
-userSMIMECertificate:: AAECAwQFBgcICQoLDA0ODxAREhMUFRYXGBkaGxwdHh8gISIjJCUmJyg
- pKissLS4vMDEyMzQ1Njc4OTo7PD0+P0BBQkNERUZHSElKS0xNTk9QUVJTVFVWV1hZWltcXV5fYGFi
- Y2RlZmdoaWprbG1ub3BxcnN0dXZ3eHl6e3x9fn+AgYKDhIWGh4iJiouMjY6PkJGSk5SVlpeYmZqbn
- J2en6ChoqOkpaanqKmqq6ytrq+wsbKztLW2t7i5uru8vb6/wMHCw8TFxsfIycrLzM3Oz9DR0tPU1d
- bX2Nna29zd3t/g4eLj5OXm5+jp6uvs7e7v8PHy8/T19vf4+fr7/P3+/wA=
-userSMIMECertificate:: AAECAwQFBgcICQoLDA0ODxAREhMUFRYXGBkaGxwdHh8gISIjJCUmJyg
- pKissLS4vMDEyMzQ1Njc4OTo7PD0+P0BBQkNERUZHSElKS0xNTk9QUVJTVFVWV1hZWltcXV5fYGFi
- Y2RlZmdoaWprbG1ub3BxcnN0dXZ3eHl6e3x9fn+AgYKDhIWGh4iJiouMjY6PkJGSk5SVlpeYmZqbn
- J2en6ChoqOkpaanqKmqq6ytrq+wsbKztLW2t7i5uru8vb6/wMHCw8TFxsfIycrLzM3Oz9DR0tPU1d
- bX2Nna29zd3t/g4eLj5OXm5+jp6uvs7e7v8PHy8/T19vf4+fr7/P3+
-subtreeSpecification: {}
-prescriptiveACI: { identificationTag "allUsersACI", precedence 10, authenticat
- ionLevel simple, itemOrUserFirst userFirst: { userClasses { allUsers }, userP
- ermissions { { protectedItems { allUserAttributeTypesAndValues, entry }, gran
- tsAndDenials { grantReturnDN, grantCompare, grantRead, grantDiscloseOnError, 
- grantFilterMatch, grantBrowse } }, { protectedItems { attributeType { userPas
- sword } }, grantsAndDenials { denyCompare, denyRead, denyFilterMatch } } } } 
- }
-
-# cn=\#\\\+\, \"öé\",ou=users,ou=system
-dn:: Y249XCNcXFwrXCwgXCLDtsOpXCIsb3U9dXNlcnMsb3U9c3lzdGVt
-objectClass: inetOrgPerson
-objectClass: organizationalPerson
-objectClass: person
-objectClass: top
-cn:: I1wrLCAiw7bDqSI=
-sn:: I1wrLCAiw7bDqSI=
-givenName:: I1wrLCAiw7bDqSI=
-uid:: I1wrLCAiw7bDqSI=
-
-dn: cn=My Group,ou=groups,ou=system
-objectClass: groupOfNames
-objectClass: top
-cn: My Group
-member: cn=Barbara Jensen,ou=users,ou=system
-
-
diff --git a/tests/test.integration.ui/src/main/resources/org/apache/directory/studio/test/integration/ui/Fedora389dsTest.ldif b/tests/test.integration.ui/src/main/resources/org/apache/directory/studio/test/integration/ui/Fedora389dsTest.ldif
deleted file mode 100644
index 96ae7520a..000000000
--- a/tests/test.integration.ui/src/main/resources/org/apache/directory/studio/test/integration/ui/Fedora389dsTest.ldif
+++ /dev/null
@@ -1,226 +0,0 @@
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#
-dn: dc=example,dc=org
-objectClass: top
-objectClass: domain
-dc: example
-
-dn: ou=users,dc=example,dc=org
-objectClass: top
-objectClass: organizationalUnit
-ou: users
-
-dn: uid=user.1,ou=users,dc=example,dc=org
-objectClass: top
-objectClass: person
-objectClass: organizationalPerson
-objectClass: inetOrgPerson
-givenName: Aaccf
-sn: Amar
-cn: Aaccf Amar
-initials: AA
-uid: user.1
-mail: user.1@null
-userPassword: password
-telephoneNumber: 976-893-3312
-homePhone: 337-310-0727
-pager: 185-156-4071
-mobile: 626-188-0934
-employeeNumber: 1
-street: 27919 Broadway Street
-l: Tallahassee
-st: DE
-postalCode: 67698
-postalAddress: Aaccf Amar$27919 Broadway Street$Tallahassee, DE  67698
-roomNumber: 1388
-
-dn: uid=user.2,ou=users,dc=example,dc=org
-objectClass: top
-objectClass: person
-objectClass: organizationalPerson
-objectClass: inetOrgPerson
-givenName: Aaren
-sn: Atp
-cn: Aaren Atp
-initials: AA
-uid: user.2
-mail: user.2@null
-userPassword: password
-telephoneNumber: 147-953-0396
-homePhone: 174-439-5329
-pager: 617-443-8449
-mobile: 045-464-2512
-employeeNumber: 2
-street: 36109 Center Street
-l: Harlingen
-st: CO
-postalCode: 21733
-postalAddress: Aaren Atp$36109 Center Street$Harlingen, CO  21733
-description: This is the description for Aaren Atp.
-roomNumber: 1198
-
-dn: uid=user.3,ou=users,dc=example,dc=org
-objectClass: top
-objectClass: person
-objectClass: organizationalPerson
-objectClass: inetOrgPerson
-givenName: Aarika
-sn: Atpco
-cn: Aarika Atpco
-initials: AA
-uid: user.3
-mail: user.3@null
-userPassword: password
-telephoneNumber: 925-356-4943
-homePhone: 099-983-0308
-pager: 806-672-7363
-mobile: 425-493-8009
-employeeNumber: 3
-street: 14730 Fourteenth Street
-l: Evansville
-st: ND
-postalCode: 95526
-postalAddress: Aarika Atpco$14730 Fourteenth Street$Evansville, ND  95526
-description: This is the description for Aarika Atpco.
-roomNumber: 1135
-
-dn: uid=user.4,ou=users,dc=example,dc=org
-objectClass: top
-objectClass: person
-objectClass: organizationalPerson
-objectClass: inetOrgPerson
-givenName: Aaron
-sn: Atrc
-cn: Aaron Atrc
-initials: AA
-uid: user.4
-mail: user.4@null
-userPassword: password
-telephoneNumber: 696-981-0488
-homePhone: 854-401-1330
-pager: 389-028-9518
-mobile: 117-882-4912
-employeeNumber: 4
-street: 98495 Fifteenth Street
-l: Miami
-st: PA
-postalCode: 16887
-postalAddress: Aaron Atrc$98495 Fifteenth Street$Miami, PA  16887
-description: This is the description for Aaron Atrc.
-roomNumber: 1311
-
-dn: uid=user.5,ou=users,dc=example,dc=org
-objectClass: top
-objectClass: person
-objectClass: organizationalPerson
-objectClass: inetOrgPerson
-givenName: Aartjan
-sn: Aalders
-cn: Aartjan Aalders
-initials: AA
-uid: user.5
-mail: user.5@null
-userPassword: password
-telephoneNumber: 657-627-9753
-homePhone: 109-158-4533
-pager: 801-392-0010
-mobile: 763-973-0947
-employeeNumber: 5
-street: 52408 Ridge Street
-l: Omaha
-st: AR
-postalCode: 08015
-postalAddress: Aartjan Aalders$52408 Ridge Street$Omaha, AR  08015
-description: This is the description for Aartjan Aalders.
-roomNumber: 1090
-
-dn: uid=user.6,ou=users,dc=example,dc=org
-objectClass: top
-objectClass: person
-objectClass: organizationalPerson
-objectClass: inetOrgPerson
-givenName: Abagael
-sn: Aasen
-cn: Abagael Aasen
-initials: AA
-uid: user.6
-mail: user.6@null
-userPassword: password
-telephoneNumber: 600-556-9017
-homePhone: 543-731-7797
-pager: 349-743-6572
-mobile: 042-921-9717
-employeeNumber: 6
-street: 87514 Dogwood Street
-l: Bloomington
-st: ID
-postalCode: 56762
-postalAddress: Abagael Aasen$87514 Dogwood Street$Bloomington, ID  56762
-description: This is the description for Abagael Aasen.
-roomNumber: 1449
-
-dn: uid=user.7,ou=users,dc=example,dc=org
-objectClass: top
-objectClass: person
-objectClass: organizationalPerson
-objectClass: inetOrgPerson
-givenName: Abagail
-sn: Abadines
-cn: Abagail Abadines
-initials: AA
-uid: user.7
-mail: user.7@null
-userPassword: password
-telephoneNumber: 628-294-0713
-homePhone: 313-764-3970
-pager: 118-541-2978
-mobile: 111-360-9243
-employeeNumber: 7
-street: 60751 Main Street
-l: Macon
-st: MI
-postalCode: 38755
-postalAddress: Abagail Abadines$60751 Main Street$Macon, MI  38755
-description: This is the description for Abagail Abadines.
-roomNumber: 1312
-
-dn: uid=user.8,ou=users,dc=example,dc=org
-objectClass: top
-objectClass: person
-objectClass: organizationalPerson
-objectClass: inetOrgPerson
-givenName: Abahri
-sn: Abazari
-cn: Abahri Abazari
-initials: AA
-uid: user.8
-mail: user.8@null
-userPassword: password
-telephoneNumber: 760-373-5805
-homePhone: 856-861-3648
-pager: 271-218-0027
-mobile: 957-465-6928
-employeeNumber: 8
-street: 81023 River Street
-l: Monroe
-st: SD
-postalCode: 51865
-postalAddress: Abahri Abazari$81023 River Street$Monroe, SD  51865
-description: This is the description for Abahri Abazari.
-roomNumber: 1963
-
diff --git a/tests/test.integration.ui/src/main/resources/org/apache/directory/studio/test/integration/ui/ImportExportTest.ldif b/tests/test.integration.ui/src/main/resources/org/apache/directory/studio/test/integration/ui/ImportExportTest.ldif
deleted file mode 100644
index 9a4bd360b..000000000
--- a/tests/test.integration.ui/src/main/resources/org/apache/directory/studio/test/integration/ui/ImportExportTest.ldif
+++ /dev/null
@@ -1,53 +0,0 @@
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#
-dn:: Y249V29sZmdhbmcgS8O2bGJlbCxvdT11c2VycyxvdT1zeXN0ZW0=
-objectClass: person
-objectClass: organizationalPerson
-objectClass: inetOrgPerson
-objectClass: top
-cn:: V29sZmdhbmcgS8O2bGJlbA==
-sn:: S8O2bGJlbA==
-description: =1+1
-
-dn: ou=special,ou=system
-objectClass: top
-objectClass: organizationalUnit
-ou: special
-administrativeRole: accessControlSpecificArea
-
-dn: cn=alias,ou=special,ou=system
-objectClass: alias
-objectClass: top
-objectClass: extensibleObject
-cn: alias
-aliasedObjectName: ou=special,ou=system
-
-dn: cn=referral,ou=special,ou=system
-objectClass: referral
-objectClass: top
-objectClass: extensibleObject
-cn: referral
-ref: ldap://foo.example.com/ou=system
-
-dn: cn=subentry,ou=special,ou=system
-objectClass: subentry
-objectClass: top
-cn: subentry
-subtreeSpecification: { }
-
-
diff --git a/tests/test.integration.ui/src/main/resources/org/apache/directory/studio/test/integration/ui/OpenLdapConfig.ldif b/tests/test.integration.ui/src/main/resources/org/apache/directory/studio/test/integration/ui/OpenLdapConfig.ldif
deleted file mode 100644
index f28f33888..000000000
--- a/tests/test.integration.ui/src/main/resources/org/apache/directory/studio/test/integration/ui/OpenLdapConfig.ldif
+++ /dev/null
@@ -1,25 +0,0 @@
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#
-dn: olcDatabase={-1}frontend,cn=config
-changetype: modify
-replace: olcAccess
-olcAccess: {0}to * by dn.exact=gidNumber=0+uidNumber=0,cn=peercred,cn=external
- ,cn=auth manage by * break
-olcAccess: {1}to dn.exact="" by * read
-olcAccess: {2}to dn.base="cn=Subschema" by dn.exact="uid=user.1,ou=users,dc=example,dc=org" none by * read
--
diff --git a/tests/test.integration.ui/src/main/resources/org/apache/directory/studio/test/integration/ui/OpenLdapTest.ldif b/tests/test.integration.ui/src/main/resources/org/apache/directory/studio/test/integration/ui/OpenLdapTest.ldif
deleted file mode 100644
index 4e39b2f64..000000000
--- a/tests/test.integration.ui/src/main/resources/org/apache/directory/studio/test/integration/ui/OpenLdapTest.ldif
+++ /dev/null
@@ -1,221 +0,0 @@
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#
-dn: ou=users,dc=example,dc=org
-objectClass: top
-objectClass: organizationalUnit
-ou: users
-
-dn: uid=user.1,ou=users,dc=example,dc=org
-objectClass: top
-objectClass: person
-objectClass: organizationalPerson
-objectClass: inetOrgPerson
-givenName: Aaccf
-sn: Amar
-cn: Aaccf Amar
-initials: AA
-uid: user.1
-mail: user.1@null
-userPassword: password
-telephoneNumber: 976-893-3312
-homePhone: 337-310-0727
-pager: 185-156-4071
-mobile: 626-188-0934
-employeeNumber: 1
-street: 27919 Broadway Street
-l: Tallahassee
-st: DE
-postalCode: 67698
-postalAddress: Aaccf Amar$27919 Broadway Street$Tallahassee, DE  67698
-roomNumber: 1388
-
-dn: uid=user.2,ou=users,dc=example,dc=org
-objectClass: top
-objectClass: person
-objectClass: organizationalPerson
-objectClass: inetOrgPerson
-givenName: Aaren
-sn: Atp
-cn: Aaren Atp
-initials: AA
-uid: user.2
-mail: user.2@null
-userPassword: password
-telephoneNumber: 147-953-0396
-homePhone: 174-439-5329
-pager: 617-443-8449
-mobile: 045-464-2512
-employeeNumber: 2
-street: 36109 Center Street
-l: Harlingen
-st: CO
-postalCode: 21733
-postalAddress: Aaren Atp$36109 Center Street$Harlingen, CO  21733
-description: This is the description for Aaren Atp.
-roomNumber: 1198
-
-dn: uid=user.3,ou=users,dc=example,dc=org
-objectClass: top
-objectClass: person
-objectClass: organizationalPerson
-objectClass: inetOrgPerson
-givenName: Aarika
-sn: Atpco
-cn: Aarika Atpco
-initials: AA
-uid: user.3
-mail: user.3@null
-userPassword: password
-telephoneNumber: 925-356-4943
-homePhone: 099-983-0308
-pager: 806-672-7363
-mobile: 425-493-8009
-employeeNumber: 3
-street: 14730 Fourteenth Street
-l: Evansville
-st: ND
-postalCode: 95526
-postalAddress: Aarika Atpco$14730 Fourteenth Street$Evansville, ND  95526
-description: This is the description for Aarika Atpco.
-roomNumber: 1135
-
-dn: uid=user.4,ou=users,dc=example,dc=org
-objectClass: top
-objectClass: person
-objectClass: organizationalPerson
-objectClass: inetOrgPerson
-givenName: Aaron
-sn: Atrc
-cn: Aaron Atrc
-initials: AA
-uid: user.4
-mail: user.4@null
-userPassword: password
-telephoneNumber: 696-981-0488
-homePhone: 854-401-1330
-pager: 389-028-9518
-mobile: 117-882-4912
-employeeNumber: 4
-street: 98495 Fifteenth Street
-l: Miami
-st: PA
-postalCode: 16887
-postalAddress: Aaron Atrc$98495 Fifteenth Street$Miami, PA  16887
-description: This is the description for Aaron Atrc.
-roomNumber: 1311
-
-dn: uid=user.5,ou=users,dc=example,dc=org
-objectClass: top
-objectClass: person
-objectClass: organizationalPerson
-objectClass: inetOrgPerson
-givenName: Aartjan
-sn: Aalders
-cn: Aartjan Aalders
-initials: AA
-uid: user.5
-mail: user.5@null
-userPassword: password
-telephoneNumber: 657-627-9753
-homePhone: 109-158-4533
-pager: 801-392-0010
-mobile: 763-973-0947
-employeeNumber: 5
-street: 52408 Ridge Street
-l: Omaha
-st: AR
-postalCode: 08015
-postalAddress: Aartjan Aalders$52408 Ridge Street$Omaha, AR  08015
-description: This is the description for Aartjan Aalders.
-roomNumber: 1090
-
-dn: uid=user.6,ou=users,dc=example,dc=org
-objectClass: top
-objectClass: person
-objectClass: organizationalPerson
-objectClass: inetOrgPerson
-givenName: Abagael
-sn: Aasen
-cn: Abagael Aasen
-initials: AA
-uid: user.6
-mail: user.6@null
-userPassword: password
-telephoneNumber: 600-556-9017
-homePhone: 543-731-7797
-pager: 349-743-6572
-mobile: 042-921-9717
-employeeNumber: 6
-street: 87514 Dogwood Street
-l: Bloomington
-st: ID
-postalCode: 56762
-postalAddress: Abagael Aasen$87514 Dogwood Street$Bloomington, ID  56762
-description: This is the description for Abagael Aasen.
-roomNumber: 1449
-
-dn: uid=user.7,ou=users,dc=example,dc=org
-objectClass: top
-objectClass: person
-objectClass: organizationalPerson
-objectClass: inetOrgPerson
-givenName: Abagail
-sn: Abadines
-cn: Abagail Abadines
-initials: AA
-uid: user.7
-mail: user.7@null
-userPassword: password
-telephoneNumber: 628-294-0713
-homePhone: 313-764-3970
-pager: 118-541-2978
-mobile: 111-360-9243
-employeeNumber: 7
-street: 60751 Main Street
-l: Macon
-st: MI
-postalCode: 38755
-postalAddress: Abagail Abadines$60751 Main Street$Macon, MI  38755
-description: This is the description for Abagail Abadines.
-roomNumber: 1312
-
-dn: uid=user.8,ou=users,dc=example,dc=org
-objectClass: top
-objectClass: person
-objectClass: organizationalPerson
-objectClass: inetOrgPerson
-givenName: Abahri
-sn: Abazari
-cn: Abahri Abazari
-initials: AA
-uid: user.8
-mail: user.8@null
-userPassword: password
-telephoneNumber: 760-373-5805
-homePhone: 856-861-3648
-pager: 271-218-0027
-mobile: 957-465-6928
-employeeNumber: 8
-street: 81023 River Street
-l: Monroe
-st: SD
-postalCode: 51865
-postalAddress: Abahri Abazari$81023 River Street$Monroe, SD  51865
-description: This is the description for Abahri Abazari.
-roomNumber: 1963
-
diff --git a/tests/test.integration.ui/src/main/resources/org/apache/directory/studio/test/integration/ui/RenameEntryDialogTest.ldif b/tests/test.integration.ui/src/main/resources/org/apache/directory/studio/test/integration/ui/RenameEntryDialogTest.ldif
deleted file mode 100644
index 197592f45..000000000
--- a/tests/test.integration.ui/src/main/resources/org/apache/directory/studio/test/integration/ui/RenameEntryDialogTest.ldif
+++ /dev/null
@@ -1,48 +0,0 @@
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#
-dn: cn=Barbara Jensen+uid=bjensen,ou=users,ou=system
-objectClass: inetOrgPerson
-objectClass: organizationalPerson
-objectClass: person
-objectClass: top
-cn: Barbara Jensen
-sn: Jensen
-givenName: Barbara
-uid: bjensen
-
-# cn=\#\\\+\, \"öé\",ou=users,ou=system
-dn:: Y249XCNcXFwrXCwgXCLDtsOpXCIsb3U9dXNlcnMsb3U9c3lzdGVt
-objectClass: inetOrgPerson
-objectClass: organizationalPerson
-objectClass: person
-objectClass: top
-cn:: I1wrLCAiw7bDqSI=
-sn:: I1wrLCAiw7bDqSI=
-givenName:: I1wrLCAiw7bDqSI=
-uid:: I1wrLCAiw7bDqSI=
-
-dn: cn=\#123456,ou=users,ou=system
-objectClass: inetOrgPerson
-objectClass: organizationalPerson
-objectClass: person
-objectClass: top
-cn: #123456
-sn: #123456
-givenName: #123456
-uid: #123456
-