-
Notifications
You must be signed in to change notification settings - Fork 24.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Tests- added helper methods to ESRestTestCase for checking warnings (#…
…36443) Added helper methods to ESRestTestCase for checking warnings in mixed and current-version-only clusters. This is supported by a new VersionSpecificWarningsHandler class with associated unit test. Closes #36251
- Loading branch information
1 parent
eead8a1
commit a9eccbc
Showing
3 changed files
with
150 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
70 changes: 70 additions & 0 deletions
70
...ework/src/test/java/org/elasticsearch/test/rest/VersionSensitiveWarningsHandlerTests.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,70 @@ | ||
/* | ||
* Licensed to Elasticsearch under one or more contributor | ||
* license agreements. See the NOTICE file distributed with | ||
* this work for additional information regarding copyright | ||
* ownership. Elasticsearch 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.elasticsearch.test.rest; | ||
|
||
import org.elasticsearch.Version; | ||
import org.elasticsearch.client.WarningsHandler; | ||
import org.elasticsearch.test.ESTestCase; | ||
import org.elasticsearch.test.rest.ESRestTestCase.VersionSensitiveWarningsHandler; | ||
|
||
import java.io.IOException; | ||
import java.util.Arrays; | ||
import java.util.Collections; | ||
import java.util.HashSet; | ||
import java.util.Set; | ||
import java.util.function.Consumer; | ||
|
||
public class VersionSensitiveWarningsHandlerTests extends ESTestCase { | ||
|
||
public void testSameVersionCluster() throws IOException { | ||
Set<Version> nodeVersions= new HashSet<>(); | ||
nodeVersions.add(Version.CURRENT); | ||
WarningsHandler handler = expectVersionSpecificWarnings(nodeVersions, (v)->{ | ||
v.current("expectedCurrent1"); | ||
}); | ||
assertFalse(handler.warningsShouldFailRequest(Arrays.asList("expectedCurrent1"))); | ||
assertTrue(handler.warningsShouldFailRequest(Arrays.asList("expectedCurrent1", "unexpected"))); | ||
assertTrue(handler.warningsShouldFailRequest(Collections.emptyList())); | ||
|
||
} | ||
public void testMixedVersionCluster() throws IOException { | ||
Set<Version> nodeVersions= new HashSet<>(); | ||
nodeVersions.add(Version.CURRENT); | ||
nodeVersions.add(Version.CURRENT.minimumIndexCompatibilityVersion()); | ||
WarningsHandler handler = expectVersionSpecificWarnings(nodeVersions, (v)->{ | ||
v.current("expectedCurrent1"); | ||
v.compatible("Expected legacy warning"); | ||
}); | ||
assertFalse(handler.warningsShouldFailRequest(Arrays.asList("expectedCurrent1"))); | ||
assertFalse(handler.warningsShouldFailRequest(Arrays.asList("Expected legacy warning"))); | ||
assertFalse(handler.warningsShouldFailRequest(Arrays.asList("expectedCurrent1", "Expected legacy warning"))); | ||
assertTrue(handler.warningsShouldFailRequest(Arrays.asList("expectedCurrent1", "Unexpected legacy warning"))); | ||
assertTrue(handler.warningsShouldFailRequest(Arrays.asList("Unexpected legacy warning"))); | ||
assertFalse(handler.warningsShouldFailRequest(Collections.emptyList())); | ||
} | ||
|
||
private static WarningsHandler expectVersionSpecificWarnings(Set<Version> nodeVersions, | ||
Consumer<VersionSensitiveWarningsHandler> expectationsSetter) { | ||
//Based on EsRestTestCase.expectVersionSpecificWarnings helper method but without ESRestTestCase dependency | ||
VersionSensitiveWarningsHandler warningsHandler = new VersionSensitiveWarningsHandler(nodeVersions); | ||
expectationsSetter.accept(warningsHandler); | ||
return warningsHandler; | ||
} | ||
} |