Fix assertions

7 files changed, 43 insertions, 21 deletions

diff --git a/tests/test.integration.core/src/main/java/org/apache/directory/studio/test/integration/junit5/LdapServersArgumentsProvider.java b/tests/test.integration.core/src/main/java/org/apache/directory/studio/test/integration/junit5/LdapServersArgumentsProvider.java
index f37725a76..2ffb5cdb4 100644
--- a/tests/test.integration.core/src/main/java/org/apache/directory/studio/test/integration/junit5/LdapServersArgumentsProvider.java
+++ b/tests/test.integration.core/src/main/java/org/apache/directory/studio/test/integration/junit5/LdapServersArgumentsProvider.java
@@ -29,6 +29,7 @@ import java.util.Random;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import org.apache.directory.studio.test.integration.junit5.LdapServersSource.Mode;
 import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.ArgumentsProvider;
@@ -57,7 +58,10 @@ public class LdapServersArgumentsProvider implements ArgumentsProvider
         if ( !available.isEmpty() )
         {
             // Pick a random one
-            available = Collections.singletonList( available.get( new Random().nextInt( available.size() ) ) );
+            if ( annotation.mode() == Mode.One )
+            {
+                available = Collections.singletonList( available.get( new Random().nextInt( available.size() ) ) );
+            }
 
             // Prepare the available servers
             for ( LdapServerType type : available )
diff --git a/tests/test.integration.core/src/main/java/org/apache/directory/studio/test/integration/junit5/LdapServersSource.java b/tests/test.integration.core/src/main/java/org/apache/directory/studio/test/integration/junit5/LdapServersSource.java
index dd391cda8..1261137ec 100644
--- a/tests/test.integration.core/src/main/java/org/apache/directory/studio/test/integration/junit5/LdapServersSource.java
+++ b/tests/test.integration.core/src/main/java/org/apache/directory/studio/test/integration/junit5/LdapServersSource.java
@@ -36,7 +36,21 @@ import org.junit.jupiter.params.provider.ArgumentsSource;
 @ArgumentsSource(LdapServersArgumentsProvider.class)
 public @interface LdapServersSource
 {
-    LdapServerType[] only() default {};
-    LdapServerType[] except() default {};
+    Mode mode() default Mode.One;
+
+
+    LdapServerType[] only() default
+        {};
+
+
+    LdapServerType[] except() default
+        {};
+
+
     String reason() default "";
+
+    enum Mode
+    {
+        One, All;
+    }
 }
diff --git a/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/BrowserTest.java b/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/BrowserTest.java
index ca4255b43..615173f40 100644
--- a/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/BrowserTest.java
+++ b/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/BrowserTest.java
@@ -62,6 +62,7 @@ import org.apache.directory.studio.ldapbrowser.ui.BrowserUIPlugin;
 import org.apache.directory.studio.ldapbrowser.ui.editors.entry.EntryEditor;
 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.LdapServersSource.Mode;
 import org.apache.directory.studio.test.integration.junit5.TestLdapServer;
 import org.apache.directory.studio.test.integration.ui.bots.DeleteDialogBot;
 import org.apache.directory.studio.test.integration.ui.bots.EntryEditorBot;
@@ -112,7 +113,7 @@ public class BrowserTest extends AbstractTestBase
 
         assertEquals( 1, countMatchesAfter - countMatchesBefore, "Expected exactly 1 search request" );
 
-        assertEquals( "No modification expected", "", modificationLogsViewBot.getModificationLogsText() );
+        assertEquals( "", modificationLogsViewBot.getModificationLogsText(), "No modification expected" );
     }
 
 
@@ -183,7 +184,7 @@ public class BrowserTest extends AbstractTestBase
         assertEquals( 23, attributeValues.size() );
         assertTrue( attributeValues.contains( "uid: user.1" ) );
 
-        assertEquals( "No modification expected", "", modificationLogsViewBot.getModificationLogsText() );
+        assertEquals( "", modificationLogsViewBot.getModificationLogsText(), "No modification expected" );
     }
 
 
@@ -423,7 +424,7 @@ public class BrowserTest extends AbstractTestBase
      * (Error reading objects with # in DN)
      */
     @ParameterizedTest
-    @LdapServersSource
+    @LdapServersSource(mode = Mode.All)
     public void testBrowseDnWithSharpAndHexSequence( TestLdapServer server ) throws Exception
     {
         Dn dn = DN_WITH_LEADING_SHARP_BACKSLASH_PREFIXED;
@@ -436,7 +437,7 @@ public class BrowserTest extends AbstractTestBase
         assertTrue( browserViewBot.existsEntry( path( dn ) ) );
         browserViewBot.selectEntry( path( dn ) );
 
-        assertEquals( "No modification expected", "", modificationLogsViewBot.getModificationLogsText() );
+        assertEquals( "", modificationLogsViewBot.getModificationLogsText(), "No modification expected" );
     }
 
 
@@ -444,7 +445,7 @@ public class BrowserTest extends AbstractTestBase
      * Test for DIRSTUDIO-1172: Studio doesn't display entries with trailing =.
      */
     @ParameterizedTest
-    @LdapServersSource
+    @LdapServersSource(mode = Mode.All)
     public void testBrowseDnWithTrailingEqualsCharacter( TestLdapServer server ) throws Exception
     {
         Dn dn = DN_WITH_TRAILING_EQUALS_CHARACTER;
@@ -494,7 +495,7 @@ public class BrowserTest extends AbstractTestBase
      * Test for DIRSTUDIO-1151: DN with backslash not displayed
      */
     @ParameterizedTest
-    @LdapServersSource
+    @LdapServersSource(mode = Mode.All)
     public void testBrowseDnWithBackslash( TestLdapServer server ) throws Exception
     {
         Dn dn = DN_WITH_ESCAPED_CHARACTERS_BACKSLASH_PREFIXED;
@@ -558,7 +559,7 @@ public class BrowserTest extends AbstractTestBase
 
         // check that modification logs is still empty
         // to ensure that no modification was sent to the server
-        assertEquals( "No modification expected", "", modificationLogsViewBot.getModificationLogsText() );
+        assertEquals( "", modificationLogsViewBot.getModificationLogsText(), "No modification expected" );
     }
 
 
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 3daa7ae73..a3e8792f0 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
@@ -52,6 +52,7 @@ import org.apache.directory.studio.ldifparser.model.lines.LdifAttrValLine;
 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.junit5.LdapServersSource.Mode;
 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;
@@ -158,7 +159,7 @@ public class EntryEditorTest extends AbstractTestBase
      * Test adding, editing and deleting of attributes without equality matching rule in the entry editor.
      */
     @ParameterizedTest
-    @LdapServersSource
+    @LdapServersSource(mode = Mode.All)
     public void testAddEditDeleteAttributeWithoutEqualityMatchingRule( TestLdapServer server ) throws Exception
     {
         Connection connection = connectionsViewBot.createTestConnection( server );
diff --git a/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/ExtendedOperationsTest.java b/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/ExtendedOperationsTest.java
index 756fdc018..f2c867f08 100644
--- a/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/ExtendedOperationsTest.java
+++ b/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/ExtendedOperationsTest.java
@@ -32,6 +32,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
 import org.apache.commons.lang3.RandomStringUtils;
 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.LdapServersSource.Mode;
 import org.apache.directory.studio.test.integration.junit5.TestLdapServer;
 import org.apache.directory.studio.test.integration.ui.bots.BotUtils;
 import org.apache.directory.studio.test.integration.ui.bots.EntryEditorBot;
@@ -153,7 +154,7 @@ public class ExtendedOperationsTest extends AbstractTestBase
 
 
     @ParameterizedTest
-    @LdapServersSource(except = LdapServerType.Fedora389ds, reason = "389ds requires secure connection")
+    @LdapServersSource(mode=Mode.All, except = LdapServerType.Fedora389ds, reason = "389ds requires secure connection")
     public void testPasswordModifyExtendedOperationDialogGenerateNewPassword( TestLdapServer server ) throws Exception
     {
         connectionsViewBot.createTestConnection( server );
@@ -227,7 +228,7 @@ public class ExtendedOperationsTest extends AbstractTestBase
 
 
     @ParameterizedTest
-    @LdapServersSource
+    @LdapServersSource(mode=Mode.All)
     public void testPasswordModifyExtendedOperationDialogError( TestLdapServer server ) throws Exception
     {
         connectionsViewBot.createTestConnection( server );
diff --git a/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/ImportExportTest.java b/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/ImportExportTest.java
index 33bf46bd6..ff49b4073 100644
--- a/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/ImportExportTest.java
+++ b/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/ImportExportTest.java
@@ -114,10 +114,10 @@ public class ImportExportTest extends AbstractTestBase
 
         List<String> lines = FileUtils.readLines( new File( file ), StandardCharsets.UTF_8 );
         // verify that the first line of exported LDIF is "version: 1"
-        assertEquals( "LDIF must start with version: 1", lines.get( 0 ), "version: 1" );
+        assertEquals( lines.get( 0 ), "version: 1", "LDIF must start with version: 1" );
         // verify that the third line of exported LDIF is the Base64 encoded DN
-        assertEquals( "Expected Base64 encoded DN", lines.get( 2 ),
-            "dn:: Y249V29sZmdhbmcgS8O2bGJlbCxvdT1taXNjLGRjPWV4YW1wbGUsZGM9b3Jn" );
+        assertEquals( lines.get( 2 ), "dn:: Y249V29sZmdhbmcgS8O2bGJlbCxvdT1taXNjLGRjPWV4YW1wbGUsZGM9b3Jn",
+            "Expected Base64 encoded DN" );
 
         // delete entry
         DeleteDialogBot dialogBot = browserViewBot.openDeleteDialog();
@@ -215,7 +215,7 @@ public class ImportExportTest extends AbstractTestBase
         wizardBot.waitTillExportFinished( file, 50 );
 
         List<String> lines = FileUtils.readLines( new File( file ), StandardCharsets.UTF_8 );
-        assertEquals( "LDIF must start with version: 1", lines.get( 0 ), "version: 1" );
+        assertEquals( lines.get( 0 ), "version: 1", "LDIF must start with version: 1" );
         assertTrue( lines.contains( "dn: " + ALIAS_DN.getName() ) );
 
         // delete entry
@@ -263,7 +263,7 @@ public class ImportExportTest extends AbstractTestBase
         wizardBot.waitTillExportFinished( file, 20 );
 
         List<String> lines = FileUtils.readLines( new File( file ), StandardCharsets.UTF_8 );
-        assertEquals( "LDIF must start with version: 1", lines.get( 0 ), "version: 1" );
+        assertEquals( lines.get( 0 ), "version: 1", "LDIF must start with version: 1" );
         assertTrue( lines.contains( "dn: " + REFERRAL_TO_USER1_DN.getName() ) );
         assertTrue( lines.contains( "ref: " + server.getLdapUrl() + "/" + USER1_DN.getName() ) );
 
@@ -312,7 +312,7 @@ public class ImportExportTest extends AbstractTestBase
         wizardBot.waitTillExportFinished( file, 20 );
 
         List<String> lines = FileUtils.readLines( new File( file ), StandardCharsets.UTF_8 );
-        assertEquals( "LDIF must start with version: 1", lines.get( 0 ), "version: 1" );
+        assertEquals( lines.get( 0 ), "version: 1", "LDIF must start with version: 1" );
         assertTrue( lines.contains( "dn: " + SUBENTRY_DN.getName() ) );
         assertTrue( lines.contains( "subtreeSpecification: {}" ) );
 
@@ -527,7 +527,7 @@ public class ImportExportTest extends AbstractTestBase
         wizardBot.waitTillExportFinished( file, 2500 );
 
         List<String> lines = FileUtils.readLines( new File( file ), StandardCharsets.UTF_8 );
-        assertEquals( "LDIF must start with version: 1", lines.get( 0 ), "version: 1" );
+        assertEquals( lines.get( 0 ), "version: 1", "LDIF must start with version: 1" );
         assertTrue( lines.contains( "dn: cn=adsconfig,ou=schema" ) );
         assertTrue( lines.contains( "dn: cn=apachemeta,ou=schema" ) );
         assertTrue( lines.contains( "dn: cn=core,ou=schema" ) );
diff --git a/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/utils/ResourceUtils.java b/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/utils/ResourceUtils.java
index dc706ce14..dac7de29e 100644
--- a/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/utils/ResourceUtils.java
+++ b/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/utils/ResourceUtils.java
@@ -28,6 +28,7 @@ import java.net.URL;
 import java.util.UUID;
 
 import org.apache.directory.api.util.IOUtils;
+import org.apache.directory.studio.test.integration.ui.Activator;
 import org.eclipse.core.runtime.Platform;
 
 
@@ -38,7 +39,7 @@ public class ResourceUtils
         URL url = Platform.getInstanceLocation().getURL();
         String destFile = url.getFile() + UUID.randomUUID().toString();
 
-        try ( InputStream is = ResourceUtils.class.getResourceAsStream( inputFileName );
+        try ( InputStream is = Activator.class.getResourceAsStream( inputFileName );
             FileOutputStream fos = new FileOutputStream( new File( destFile ) ); )
         {
             IOUtils.copy( is, fos );