Remarks after CR applied to DNFOF tests

Signed-off-by: Lukasz Soszynski <[email protected]>
opensearch-project · Oct 19, 2022 · 7e5adb7 · 7e5adb7
1 parent da19106
commit 7e5adb7
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 26 deletions.
diff --git a/src/integrationTest/java/org/opensearch/security/DoNotFailOnForbiddenTests.java b/src/integrationTest/java/org/opensearch/security/DoNotFailOnForbiddenTests.java
@@ -35,11 +35,9 @@
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.aMapWithSize;
-import static org.hamcrest.Matchers.arrayContaining;
 import static org.hamcrest.Matchers.arrayContainingInAnyOrder;
 import static org.hamcrest.Matchers.arrayWithSize;
 import static org.hamcrest.Matchers.hasKey;
-import static org.hamcrest.Matchers.notNullValue;
 import static org.hamcrest.Matchers.nullValue;
 import static org.opensearch.action.admin.indices.alias.IndicesAliasesRequest.AliasActions.Type.ADD;
 import static org.opensearch.action.support.WriteRequest.RefreshPolicy.IMMEDIATE;
@@ -125,13 +123,17 @@ public void shouldPerformSimpleSearch_positive() throws IOException {
 
 			SearchResponse searchResponse = restHighLevelClient.search(searchRequest, DEFAULT);
 
-			assertThat(searchResponse, isSuccessfulSearchResponse());
-			assertThat(searchResponse, numberOfTotalHitsIsEqualTo(1));
-			assertThat(searchResponse, searchHitsContainDocumentWithId(0, MARVELOUS_SONGS, "1"));
-			assertThat(searchResponse, searchHitContainsFieldWithValue(0, FIELD_TITLE, TITLE_MAGNUM_OPUS));
+			assertThatContainOneSong(searchResponse, "1", TITLE_MAGNUM_OPUS);
 		}
 	}
 
+	private static void assertThatContainOneSong(SearchResponse searchResponse, String documentId, String title) {
+		assertThat(searchResponse, isSuccessfulSearchResponse());
+		assertThat(searchResponse, numberOfTotalHitsIsEqualTo(1));
+		assertThat(searchResponse, searchHitsContainDocumentWithId(0, MARVELOUS_SONGS, documentId));
+		assertThat(searchResponse, searchHitContainsFieldWithValue(0, FIELD_TITLE, title));
+	}
+
 	@Test
 	public void shouldPerformSimpleSearch_negative() throws IOException {
 		try (RestHighLevelClient restHighLevelClient = cluster.getRestHighLevelClient(LIMITED_USER)) {
@@ -148,10 +150,7 @@ public void shouldSearchForDocumentsViaIndexPattern_positive() throws IOExceptio
 
 			SearchResponse searchResponse = restHighLevelClient.search(searchRequest, DEFAULT);
 
-			assertThat(searchResponse, isSuccessfulSearchResponse());
-			assertThat(searchResponse, numberOfTotalHitsIsEqualTo(1));
-			assertThat(searchResponse, searchHitsContainDocumentWithId(0, MARVELOUS_SONGS, "1"));
-			assertThat(searchResponse, searchHitContainsFieldWithValue(0, FIELD_TITLE, TITLE_MAGNUM_OPUS));
+			assertThatContainOneSong(searchResponse, "1", TITLE_MAGNUM_OPUS);
 		}
 	}
 
@@ -171,10 +170,7 @@ public void shouldSearchForDocumentsViaAlias_positive() throws IOException {
 
 			SearchResponse searchResponse = restHighLevelClient.search(searchRequest, DEFAULT);
 
-			assertThat(searchResponse, isSuccessfulSearchResponse());
-			assertThat(searchResponse, numberOfTotalHitsIsEqualTo(1));
-			assertThat(searchResponse, searchHitsContainDocumentWithId(0, MARVELOUS_SONGS, "1"));
-			assertThat(searchResponse, searchHitContainsFieldWithValue(0, FIELD_TITLE, TITLE_MAGNUM_OPUS));
+			assertThatContainOneSong(searchResponse, "1", TITLE_MAGNUM_OPUS);
 		}
 	}
 
@@ -194,10 +190,7 @@ public void shouldSearchForDocumentsViaAll_positive() throws IOException {
 
 			SearchResponse searchResponse = restHighLevelClient.search(searchRequest, DEFAULT);
 
-			assertThat(searchResponse, isSuccessfulSearchResponse());
-			assertThat(searchResponse, numberOfTotalHitsIsEqualTo(1));
-			assertThat(searchResponse, searchHitsContainDocumentWithId(0, MARVELOUS_SONGS, "1"));
-			assertThat(searchResponse, searchHitContainsFieldWithValue(0, FIELD_TITLE, TITLE_MAGNUM_OPUS));
+			assertThatContainOneSong(searchResponse, "1", TITLE_MAGNUM_OPUS);
 		}
 	}
 
@@ -222,13 +215,8 @@ public void shouldMSearchDocument_positive() throws IOException {
 
 			MultiSearchResponse response = restHighLevelClient.msearch(request, DEFAULT);
 
-			assertThat(response, notNullValue());
 			MultiSearchResponse.Item[] responses = response.getResponses();
 			assertThat(responses, Matchers.arrayWithSize(2));
-			assertThat(responses, arrayContaining(
-				notNullValue(),
-				notNullValue()
-			));
 			assertThat(responses[0].getFailure(), nullValue());
 			assertThat(responses[1].getFailure(), nullValue());
 
@@ -256,7 +244,6 @@ public void shouldGetFieldCapabilities_positive() throws IOException {
 
 			FieldCapabilitiesResponse response = restHighLevelClient.fieldCaps(request, DEFAULT);
 
-			assertThat(response, notNullValue());
 			assertThat(response.get(), aMapWithSize(1));
 			assertThat(response.getIndices(), arrayWithSize(1));
 			assertThat(response.getField(FIELD_TITLE), hasKey("text"));

diff --git a/src/integrationTest/resources/log4j2-test.properties b/src/integrationTest/resources/log4j2-test.properties
@@ -19,5 +19,3 @@ logger.testsecconfig.name=org.opensearch.test.framework.TestSecurityConfig
 logger.testsecconfig.level = info
 logger.localopensearchcluster.name=org.opensearch.test.framework.cluster.LocalOpenSearchCluster
 logger.localopensearchcluster.level = info
-logger.eveluator.name=org.opensearch.security.privileges.PrivilegesEvaluator
-logger.eveluator.level=debug