Added javadoc, removed duplicate check from test

elastic · Dec 11, 2018 · 033bfca · 033bfca
1 parent 7cfd502
commit 033bfca
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/test/framework/src/main/java/org/elasticsearch/test/rest/ESRestTestCase.java b/test/framework/src/main/java/org/elasticsearch/test/rest/ESRestTestCase.java
@@ -182,8 +182,10 @@ public void initClient() throws IOException {
         assert nodeVersions != null;
     }
 
-    // Helper class to check warnings in REST responses with sensitivity to versions
-    // used in the target cluster.
+    /**
+     * Helper class to check warnings in REST responses with sensitivity to versions
+     * used in the target cluster.
+     */
     public static class VersionSensitiveWarningsHandler implements WarningsHandler {
         Set<String> requiredSameVersionClusterWarnings = new HashSet<>();
         Set<String> allowedWarnings = new HashSet<>();

diff --git a/...ework/src/test/java/org/elasticsearch/test/rest/VersionSensitiveWarningsHandlerTests.java b/...ework/src/test/java/org/elasticsearch/test/rest/VersionSensitiveWarningsHandlerTests.java
@@ -55,7 +55,6 @@ public void testMixedVersionCluster() throws IOException {
         assertFalse(handler.warningsShouldFailRequest(Arrays.asList("expectedCurrent1")));
         assertFalse(handler.warningsShouldFailRequest(Arrays.asList("Expected legacy warning")));
         assertFalse(handler.warningsShouldFailRequest(Arrays.asList("expectedCurrent1", "Expected legacy warning")));
-        assertFalse(handler.warningsShouldFailRequest(Arrays.asList("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()));