Test fixes

Signed-off-by: Nils Bandener <nils.bandener@eliatra.com>

Author: nibix

src/integrationTest/java/org/opensearch/security/privileges/actionlevel/RoleBasedActionPrivilegesTest.java

@@ -589,12 +589,7 @@ public void positive_partial() throws Exception {
                 if (covers(ctx, "data_stream_a11", "data_stream_a12")) {
                     assertThat(result, isAllowed());
                 } else if (covers(ctx, "data_stream_a11")) {
-                    assertThat(
-                        result,
-                        isPartiallyOk(
-                            "data_stream_a11"
-                        )
-                    );
+                    assertThat(result, isPartiallyOk("data_stream_a11"));
                 } else {
                     assertThat(result, isForbidden(missingPrivileges(requiredActions)));
                 }
@@ -604,27 +599,17 @@ public void positive_partial() throws Exception {
             public void positive_partial_breakDownAliases() throws Exception {
                 PrivilegesEvaluationContext ctx = ctx().roles("test_role").indexMetadata(INDEX_METADATA).get();
                 PrivilegesEvaluatorResponse result = subject(true).hasIndexPrivilege(
-                        ctx,
-                        requiredActions,
-                        resolved("data_stream_a11", "data_stream_a12")
+                    ctx,
+                    requiredActions,
+                    resolved("data_stream_a11", "data_stream_a12")
                 );
 
                 if (covers(ctx, "data_stream_a11", "data_stream_a12")) {
                     assertThat(result, isAllowed());
                 } else if (covers(ctx, "data_stream_a11")) {
-                    assertThat(
-                            result,
-                            isPartiallyOk(
-                                    "data_stream_a11"
-                            )
-                    );
+                    assertThat(result, isPartiallyOk("data_stream_a11"));
                 } else if (covers(ctx, ".ds-data_stream_a11")) {
-                    assertThat(
-                            result,
-                            isPartiallyOk(
-                                    "data_stream_a11"
-                            )
-                    );
+                    assertThat(result, isPartiallyOk("data_stream_a11"));
                 } else {
                     assertThat(result, isForbidden(missingPrivileges(requiredActions)));
                 }
@@ -713,19 +698,19 @@ private RoleBasedActionPrivileges subject(boolean breakDownAliases) {
                 Settings settings = Settings.EMPTY;
                 if (statefulness == Statefulness.STATEFUL_LIMITED) {
                     settings = Settings.builder()
-                            .put(
-                                    RoleBasedActionPrivileges.PRECOMPUTED_PRIVILEGES_MAX_HEAP_SIZE.getKey(),
-                                    new ByteSizeValue(10, ByteSizeUnit.BYTES)
-                            )
-                            .build();
+                        .put(
+                            RoleBasedActionPrivileges.PRECOMPUTED_PRIVILEGES_MAX_HEAP_SIZE.getKey(),
+                            new ByteSizeValue(10, ByteSizeUnit.BYTES)
+                        )
+                        .build();
                 }
 
                 RoleBasedActionPrivileges result = new RoleBasedActionPrivileges(
-                        roles,
-                        FlattenedActionGroups.EMPTY,
-                        RuntimeOptimizedActionPrivileges.SpecialIndexProtection.NONE,
-                        settings,
-                        breakDownAliases
+                    roles,
+                    FlattenedActionGroups.EMPTY,
+                    RuntimeOptimizedActionPrivileges.SpecialIndexProtection.NONE,
+                    settings,
+                    breakDownAliases
                 );
 
                 if (statefulness == Statefulness.STATEFUL || statefulness == Statefulness.STATEFUL_LIMITED) {

src/integrationTest/java/org/opensearch/security/privileges/actionlevel/SubjectBasedActionPrivilegesTest.java

@@ -421,12 +421,7 @@ public void positive_partial() throws Exception {
                 if (covers(ctx, "data_stream_a11", "data_stream_a12")) {
                     assertThat(result, isAllowed());
                 } else if (covers(ctx, "data_stream_a11")) {
-                    assertThat(
-                        result,
-                        isPartiallyOk(
-                            "data_stream_a11"
-                        )
-                    );
+                    assertThat(result, isPartiallyOk("data_stream_a11"));
                 } else {
                     assertThat(result, isForbidden(missingPrivileges(requiredActions)));
                 }

src/integrationTest/resources/log4j2-test.properties

@@ -55,3 +55,8 @@ logger.securenetty4transport.name = org.opensearch.transport.netty4.ssl.SecureNe
 logger.securenetty4transport.level = error
 logger.securenetty4transport.appenderRef.capturing.ref = logCapturingAppender
 
+logger.p.name=org.opensearch.security.privileges
+logger.p.level=DEBUG
+
+logger.pi.name=org.opensearch.security.configuration.PrivilegesInterceptorImpl
+logger.pi.level=TRACE

src/test/java/org/opensearch/security/multitenancy/test/MultitenancyTests.java

@@ -406,7 +406,8 @@ public void testMtMulti() throws Exception {
         Assert.assertTrue(res.getBody().contains(dashboardsIndex));
 
         // get
-        assertThat(res.getBody(),
+        assertThat(
+            res.getBody(),
             HttpStatus.SC_OK,
             is(
                 (res = rh.executeGetRequest(
@@ -416,10 +417,10 @@ public void testMtMulti() throws Exception {
                 )).getStatusCode()
             )
         );
-        Assert.assertFalse(res.getBody(),res.getBody().contains("exception"));
-        Assert.assertTrue(res.getBody(),res.getBody().contains("humanresources"));
-        Assert.assertTrue(res.getBody(),res.getBody().contains("\"found\" : true"));
-        Assert.assertTrue(res.getBody(),res.getBody().contains(dashboardsIndex));
+        Assert.assertFalse(res.getBody(), res.getBody().contains("exception"));
+        Assert.assertTrue(res.getBody(), res.getBody().contains("humanresources"));
+        Assert.assertTrue(res.getBody(), res.getBody().contains("\"found\" : true"));
+        Assert.assertTrue(res.getBody(), res.getBody().contains(dashboardsIndex));
 
         // mget
         body = "{\"docs\" : [{\"_index\" : \".kibana\",\"_id\" : \"index-pattern:9fbbd1a0-c3c5-11e8-a13f-71b8ea5a4f7b\"}]}";

src/test/java/org/opensearch/security/tools/democonfig/SecuritySettingsConfigurerTests.java

@@ -29,12 +29,10 @@
 import java.util.List;
 import java.util.Map;
 
-import com.carrotsearch.randomizedtesting.RandomizedRunner;
 import org.apache.commons.lang3.RandomStringUtils;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import org.junit.runner.RunWith;
 
 import org.opensearch.security.support.ConfigConstants;
 import org.opensearch.security.tools.Hasher;