Removed com.carrotsearch.randomizedtesting.RandomizedRunner from tests in src/integrationTest

build.gradle

@@ -560,10 +560,6 @@ allprojects {
     afterEvaluate {
         if (project.configurations.findByName('integrationTestImplementation')) {
             dependencies {
-                //integration test framework:
-                integrationTestImplementation('com.carrotsearch.randomizedtesting:randomizedtesting-runner:2.8.3') {
-                    exclude(group: 'junit', module: 'junit')
-                }
                 integrationTestImplementation 'junit:junit:4.13.2'
                 integrationTestImplementation("org.opensearch.plugin:reindex-client:${opensearch_version}"){
                     exclude(group: 'org.slf4j', module: 'slf4j-api')

sample-resource-plugin/build.gradle

@@ -81,6 +81,8 @@ configurations {
             force "com.google.protobuf:protobuf-java:${versions.protobuf}"
             force "com.google.guava:guava:${guava_version}"
             force "com.google.guava:failureaccess:1.0.3"
+            force "io.projectreactor:reactor-core:3.8.1"
+
         }
     }
 }
@@ -100,7 +102,9 @@ dependencies {
     integrationTestImplementation rootProject.sourceSets.main.output
     integrationTestImplementation "org.opensearch.client:opensearch-rest-high-level-client:${opensearch_version}"
     integrationTestImplementation 'org.ldaptive:ldaptive:1.2.3'
-
+    integrationTestImplementation('com.carrotsearch.randomizedtesting:randomizedtesting-runner:2.8.3') {
+        exclude(group: 'junit', module: 'junit')
+    }
     // To be removed once integration test framework supports extended plugins
     integrationTestImplementation project(path: ":${rootProject.name}-spi", configuration: 'shadow')
 }

src/integrationTest/java/org/opensearch/security/AbstractDefaultConfigurationTests.java

@@ -14,12 +14,10 @@
 import java.util.Map;
 import java.util.Set;
 
-import com.carrotsearch.randomizedtesting.annotations.ThreadLeakScope;
 import com.fasterxml.jackson.databind.JsonNode;
 import org.apache.http.HttpStatus;
 import org.awaitility.Awaitility;
 import org.junit.Test;
-import org.junit.runner.RunWith;
 
 import org.opensearch.test.framework.TestSecurityConfig;
 import org.opensearch.test.framework.cluster.LocalCluster;
@@ -34,8 +32,6 @@
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.not;
 
-@RunWith(com.carrotsearch.randomizedtesting.RandomizedRunner.class)
-@ThreadLeakScope(ThreadLeakScope.Scope.NONE)
 public abstract class AbstractDefaultConfigurationTests {
     private static final TestSecurityConfig.User ADMIN_USER = new TestSecurityConfig.User("admin");
     private static final TestSecurityConfig.User NEW_USER = new TestSecurityConfig.User("new-user");

src/integrationTest/java/org/opensearch/security/CrossClusterSearchTests.java

@@ -10,16 +10,17 @@
 package org.opensearch.security;
 
 import java.io.IOException;
+import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 
-import com.carrotsearch.randomizedtesting.annotations.ParametersFactory;
-import com.carrotsearch.randomizedtesting.annotations.ThreadLeakScope;
 import org.apache.commons.lang3.tuple.Pair;
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
 
 import org.opensearch.action.search.SearchRequest;
 import org.opensearch.action.search.SearchResponse;
@@ -65,8 +66,7 @@
 * option is enabled or disabled. Method {@link #parameters()} is a source of parameters values.
 */
 
-@RunWith(com.carrotsearch.randomizedtesting.RandomizedRunner.class)
-@ThreadLeakScope(ThreadLeakScope.Scope.NONE)
+@RunWith(Parameterized.class)
 public class CrossClusterSearchTests {
 
     private static final String SONG_INDEX_NAME = "song_lyrics";
@@ -155,8 +155,8 @@ public class CrossClusterSearchTests {
         .users(ADMIN_USER, LIMITED_USER, DLS_USER_ROCK, DLS_USER_JAZZ, FLS_INCLUDE_TITLE_USER, FLS_EXCLUDE_LYRICS_USER)
         .build();
 
-    @ParametersFactory(shuffle = false)
-    public static Iterable<Object[]> parameters() {
+    @Parameters(name = "ccsMinimizeRoundtrips={0}")
+    public static Collection<Object[]> parameters() {
         return List.of(new Object[] { true }, new Object[] { false });
     }
 

src/integrationTest/java/org/opensearch/security/DefaultConfigurationSingleNodeClusterTests.java

@@ -14,17 +14,13 @@
 import java.util.List;
 import java.util.Map;
 
-import com.carrotsearch.randomizedtesting.annotations.ThreadLeakScope;
 import org.apache.commons.io.FileUtils;
 import org.junit.AfterClass;
 import org.junit.ClassRule;
-import org.junit.runner.RunWith;
 
 import org.opensearch.test.framework.cluster.ClusterManager;
 import org.opensearch.test.framework.cluster.LocalCluster;
 
-@RunWith(com.carrotsearch.randomizedtesting.RandomizedRunner.class)
-@ThreadLeakScope(ThreadLeakScope.Scope.NONE)
 public class DefaultConfigurationSingleNodeClusterTests extends AbstractDefaultConfigurationTests {
 
     static Path configurationFolder = ConfigurationFiles.createConfigurationDirectory();

src/integrationTest/java/org/opensearch/security/DlsIntegrationTests.java

@@ -18,12 +18,10 @@
 import java.util.function.BiFunction;
 import java.util.stream.Collectors;
 
-import com.carrotsearch.randomizedtesting.annotations.ThreadLeakScope;
 import org.apache.commons.lang3.tuple.Pair;
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
 import org.junit.Test;
-import org.junit.runner.RunWith;
 
 import org.opensearch.action.admin.indices.alias.IndicesAliasesRequest;
 import org.opensearch.action.get.GetRequest;
@@ -72,8 +70,6 @@
 import static org.opensearch.test.framework.matcher.SearchResponseMatchers.searchHitContainsFieldWithValue;
 import static org.opensearch.test.framework.matcher.SearchResponseMatchers.searchHitsContainDocumentsInAnyOrder;
 
-@RunWith(com.carrotsearch.randomizedtesting.RandomizedRunner.class)
-@ThreadLeakScope(ThreadLeakScope.Scope.NONE)
 public class DlsIntegrationTests {
 
     static final String FIRST_INDEX_ID_SONG_1 = "INDEX_1_S1";

src/integrationTest/java/org/opensearch/security/DoNotFailOnForbiddenTests.java

@@ -16,12 +16,10 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
-import com.carrotsearch.randomizedtesting.annotations.ThreadLeakScope;
 import org.hamcrest.Matchers;
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
 import org.junit.Test;
-import org.junit.runner.RunWith;
 
 import org.opensearch.action.admin.indices.alias.IndicesAliasesRequest;
 import org.opensearch.action.fieldcaps.FieldCapabilitiesRequest;
@@ -91,8 +89,6 @@
 import static org.opensearch.test.framework.matcher.SearchResponseMatchers.searchHitContainsFieldWithValue;
 import static org.opensearch.test.framework.matcher.SearchResponseMatchers.searchHitsContainDocumentWithId;
 
-@RunWith(com.carrotsearch.randomizedtesting.RandomizedRunner.class)
-@ThreadLeakScope(ThreadLeakScope.Scope.NONE)
 public class DoNotFailOnForbiddenTests {
 
     /**

src/integrationTest/java/org/opensearch/security/EncryptionInTransitMigrationTests.java

@@ -11,10 +11,8 @@
 
 import java.util.Map;
 
-import com.carrotsearch.randomizedtesting.annotations.ThreadLeakScope;
 import org.junit.ClassRule;
 import org.junit.Test;
-import org.junit.runner.RunWith;
 
 import org.opensearch.security.support.ConfigConstants;
 import org.opensearch.test.framework.cluster.ClusterManager;
@@ -31,8 +29,6 @@
  * Therefore, the plugin does not perform authentication and authorization. Moreover, the REST resources (e.g. /_plugins/_security/whoami,
  * /_plugins/_security/authinfo, etc.) provided by the plugin are not available.
  */
-@RunWith(com.carrotsearch.randomizedtesting.RandomizedRunner.class)
-@ThreadLeakScope(ThreadLeakScope.Scope.NONE)
 public class EncryptionInTransitMigrationTests {
 
     @ClassRule

src/integrationTest/java/org/opensearch/security/FlsAndFieldMaskingTests.java

@@ -20,13 +20,11 @@
 import java.util.stream.IntStream;
 import java.util.stream.Stream;
 
-import com.carrotsearch.randomizedtesting.annotations.ThreadLeakScope;
 import org.hamcrest.Matcher;
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
-import org.junit.runner.RunWith;
 
 import org.opensearch.action.admin.indices.alias.IndicesAliasesRequest;
 import org.opensearch.action.admin.indices.create.CreateIndexRequest;
@@ -112,8 +110,6 @@
 import static org.opensearch.test.framework.matcher.SearchResponseMatchers.searchHitDoesNotContainField;
 import static org.opensearch.test.framework.matcher.SearchResponseMatchers.searchHitsContainDocumentWithId;
 
-@RunWith(com.carrotsearch.randomizedtesting.RandomizedRunner.class)
-@ThreadLeakScope(ThreadLeakScope.Scope.NONE)
 public class FlsAndFieldMaskingTests {
 
     static final String FIRST_INDEX_ID_SONG_1 = "INDEX_1_S1";

src/integrationTest/java/org/opensearch/security/InternalAuditLogTest.java

@@ -9,13 +9,11 @@
 */
 package org.opensearch.security;
 
-import com.carrotsearch.randomizedtesting.annotations.ThreadLeakScope;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.awaitility.Awaitility;
 import org.junit.ClassRule;
 import org.junit.Test;
-import org.junit.runner.RunWith;
 
 import org.opensearch.test.framework.AuditCompliance;
 import org.opensearch.test.framework.AuditConfiguration;
@@ -28,8 +26,6 @@
 import static org.opensearch.test.framework.TestSecurityConfig.AuthcDomain.AUTHC_HTTPBASIC_INTERNAL;
 import static org.opensearch.test.framework.TestSecurityConfig.User.USER_ADMIN;
 
-@RunWith(com.carrotsearch.randomizedtesting.RandomizedRunner.class)
-@ThreadLeakScope(ThreadLeakScope.Scope.NONE)
 public class InternalAuditLogTest {
 
     private static final Logger log = LogManager.getLogger(InternalAuditLogTest.class);

src/integrationTest/java/org/opensearch/security/IpBruteForceAttacksPreventionTests.java

@@ -13,10 +13,8 @@
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
-import com.carrotsearch.randomizedtesting.annotations.ThreadLeakScope;
 import org.junit.Rule;
 import org.junit.Test;
-import org.junit.runner.RunWith;
 
 import org.opensearch.test.framework.AuthFailureListeners;
 import org.opensearch.test.framework.RateLimiting;
@@ -38,8 +36,6 @@
 import static org.opensearch.test.framework.TestSecurityConfig.Role.ALL_ACCESS;
 import static org.opensearch.test.framework.cluster.TestRestClientConfiguration.userWithSourceIp;
 
-@RunWith(com.carrotsearch.randomizedtesting.RandomizedRunner.class)
-@ThreadLeakScope(ThreadLeakScope.Scope.NONE)
 public class IpBruteForceAttacksPreventionTests {
     protected static final User USER_1 = new User("simple-user-1").roles(ALL_ACCESS);
     protected static final User USER_2 = new User("simple-user-2").roles(ALL_ACCESS);

src/integrationTest/java/org/opensearch/security/IpBruteForceAttacksPreventionWithDomainChallengeTests.java

@@ -12,17 +12,12 @@
 
 import java.util.Map;
 
-import com.carrotsearch.randomizedtesting.annotations.ThreadLeakScope;
-import org.junit.runner.RunWith;
-
 import org.opensearch.test.framework.cluster.ClusterManager;
 import org.opensearch.test.framework.cluster.LocalCluster;
 
 import static org.opensearch.security.support.ConfigConstants.SECURITY_UNSUPPORTED_RESTAPI_ALLOW_SECURITYCONFIG_MODIFICATION;
 import static org.opensearch.test.framework.TestSecurityConfig.AuthcDomain.AUTHC_HTTPBASIC_INTERNAL;
 
-@RunWith(com.carrotsearch.randomizedtesting.RandomizedRunner.class)
-@ThreadLeakScope(ThreadLeakScope.Scope.NONE)
 public class IpBruteForceAttacksPreventionWithDomainChallengeTests extends IpBruteForceAttacksPreventionTests {
     @Override
     public LocalCluster createCluster() {

src/integrationTest/java/org/opensearch/security/ParentChildRelationTests.java

@@ -12,12 +12,10 @@
 import java.util.List;
 import java.util.Map;
 
-import com.carrotsearch.randomizedtesting.annotations.ThreadLeakScope;
 import com.fasterxml.jackson.databind.JsonNode;
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
 import org.junit.Test;
-import org.junit.runner.RunWith;
 
 import org.opensearch.index.query.QueryBuilders;
 import org.opensearch.indices.TermsLookup;
@@ -37,8 +35,6 @@
 import static org.opensearch.test.framework.matcher.RestMatchers.isInternalServerError;
 import static org.opensearch.test.framework.matcher.RestMatchers.isOk;
 
-@RunWith(com.carrotsearch.randomizedtesting.RandomizedRunner.class)
-@ThreadLeakScope(ThreadLeakScope.Scope.NONE)
 public class ParentChildRelationTests {
     public static final String INDEX_NAME = "dlstest";
     public static final String TERM_LOOKUP_INDEX_NAME = "term_lookup_index";

src/integrationTest/java/org/opensearch/security/PointInTimeOperationTest.java

@@ -11,14 +11,11 @@
 
 import java.io.IOException;
 
-import com.carrotsearch.randomizedtesting.RandomizedRunner;
-import com.carrotsearch.randomizedtesting.annotations.ThreadLeakScope;
 import org.apache.commons.lang3.tuple.Pair;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
 import org.junit.Test;
-import org.junit.runner.RunWith;
 
 import org.opensearch.action.admin.indices.alias.IndicesAliasesRequest;
 import org.opensearch.action.index.IndexRequest;
@@ -58,8 +55,6 @@
 import static org.opensearch.test.framework.matcher.SearchResponseMatchers.isSuccessfulSearchResponse;
 import static org.opensearch.test.framework.matcher.SearchResponseMatchers.searchHitsContainDocumentsInAnyOrder;
 
-@RunWith(RandomizedRunner.class)
-@ThreadLeakScope(ThreadLeakScope.Scope.NONE)
 public class PointInTimeOperationTest {
 
     private static final String FIRST_SONG_INDEX = "song-index-1";

src/integrationTest/java/org/opensearch/security/ResourceFocusedTests.java

@@ -19,7 +19,6 @@
 import java.util.stream.IntStream;
 import java.util.zip.GZIPOutputStream;
 
-import com.carrotsearch.randomizedtesting.annotations.ThreadLeakScope;
 import org.apache.hc.client5.http.classic.methods.HttpPost;
 import org.apache.hc.core5.http.ContentType;
 import org.apache.hc.core5.http.io.entity.ByteArrayEntity;
@@ -30,7 +29,6 @@
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
 import org.junit.Test;
-import org.junit.runner.RunWith;
 
 import org.opensearch.action.index.IndexRequest;
 import org.opensearch.test.framework.AsyncActions;
@@ -47,8 +45,6 @@
 import static org.opensearch.test.framework.TestSecurityConfig.AuthcDomain.AUTHC_HTTPBASIC_INTERNAL;
 import static org.opensearch.test.framework.TestSecurityConfig.Role.ALL_ACCESS;
 
-@RunWith(com.carrotsearch.randomizedtesting.RandomizedRunner.class)
-@ThreadLeakScope(ThreadLeakScope.Scope.NONE)
 public class ResourceFocusedTests {
     private final static Logger LOG = LogManager.getLogger(AsyncActions.class);
     private static final User ADMIN_USER = new User("admin").roles(ALL_ACCESS);

src/integrationTest/java/org/opensearch/security/RolloverTest.java

@@ -11,12 +11,10 @@
 
 import java.io.IOException;
 
-import com.carrotsearch.randomizedtesting.annotations.ThreadLeakScope;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.junit.ClassRule;
 import org.junit.Test;
-import org.junit.runner.RunWith;
 
 import org.opensearch.core.rest.RestStatus;
 import org.opensearch.test.framework.AuditCompliance;
@@ -34,8 +32,6 @@
 import static org.opensearch.test.framework.TestSecurityConfig.AuthcDomain.AUTHC_HTTPBASIC_INTERNAL;
 import static org.opensearch.test.framework.TestSecurityConfig.Role.ALL_ACCESS;
 
-@RunWith(com.carrotsearch.randomizedtesting.RandomizedRunner.class)
-@ThreadLeakScope(ThreadLeakScope.Scope.NONE)
 public class RolloverTest {
 
     private static final Logger log = LogManager.getLogger(RolloverTest.class);