Fixed test typos

Author: Kubik42

server/src/main/java/org/elasticsearch/index/IgnoreAbove.java

@@ -29,7 +29,7 @@ public int get() {
     }
 
     public boolean isSet() {
-        return value != defaultValue;
+        return value != null && value != defaultValue;
     }
 
     public boolean isIgnored(final String s) {

server/src/test/java/org/elasticsearch/index/mapper/KeywordFieldTypeTests.java

@@ -9,7 +9,6 @@
 package org.elasticsearch.index.mapper;
 
 import com.carrotsearch.randomizedtesting.generators.RandomStrings;
-
 import org.apache.lucene.analysis.Analyzer;
 import org.apache.lucene.analysis.LowerCaseFilter;
 import org.apache.lucene.analysis.TokenFilter;
@@ -327,11 +326,11 @@ public void test_ignore_above_index_level_setting() {
         );
 
         // when/then
-        assertFalse(fieldType.ignoreAbove().isSet());
+        assertTrue(fieldType.ignoreAbove().isSet());
         assertEquals(123, fieldType.ignoreAbove().get());
     }
 
-    public void test_isIgnoreAboveSet_returns_true_when_ignore_above_is_given() {
+    public void test_ignore_above_isSet_returns_true_when_ignore_above_is_given() {
         // given
         Settings settings = Settings.builder()
             .put(IndexMetadata.SETTING_VERSION_CREATED, IndexVersion.current())
@@ -363,7 +362,7 @@ public void test_isIgnoreAboveSet_returns_true_when_ignore_above_is_given() {
         assertEquals(123, fieldType.ignoreAbove().get());
     }
 
-    public void test_isIgnoreAboveSet_returns_false_when_ignore_above_is_not_given() {
+    public void test_ignore_above_isSet_returns_false_when_ignore_above_is_not_given() {
         // given
         Settings settings = Settings.builder()
             .put(IndexMetadata.SETTING_VERSION_CREATED, IndexVersion.current())
@@ -394,7 +393,7 @@ public void test_isIgnoreAboveSet_returns_false_when_ignore_above_is_not_given()
         assertEquals(IGNORE_ABOVE_DEFAULT_STANDARD_INDICES, fieldType.ignoreAbove().get());
     }
 
-    public void test_isIgnoreAboveSet_returns_false_when_ignore_above_is_given_but_its_the_same_as_default() {
+    public void test_ignore_above_isSet_returns_false_when_ignore_above_is_given_but_its_the_same_as_default() {
         // given
         Settings settings = Settings.builder()
             .put(IndexMetadata.SETTING_VERSION_CREATED, IndexVersion.current())
@@ -426,7 +425,7 @@ public void test_isIgnoreAboveSet_returns_false_when_ignore_above_is_given_but_i
         assertEquals(IGNORE_ABOVE_DEFAULT_STANDARD_INDICES, fieldType.ignoreAbove().get());
     }
 
-    public void test_isIgnoreAboveSet_returns_false_when_ignore_above_is_given_but_its_the_same_as_default_for_logsdb_indices() {
+    public void test_ignore_above_isSet_returns_false_when_ignore_above_is_given_but_its_the_same_as_default_for_logsdb_indices() {
         // given
         Settings settings = Settings.builder()
             .put(IndexMetadata.SETTING_VERSION_CREATED, IndexVersion.current())
@@ -458,7 +457,7 @@ public void test_isIgnoreAboveSet_returns_false_when_ignore_above_is_given_but_i
         assertEquals(IGNORE_ABOVE_DEFAULT_LOGSDB_INDICES, fieldType.ignoreAbove().get());
     }
 
-    public void test_isIgnoreAboveSet_returns_true_when_ignore_above_is_given_as_logsdb_default_but_index_mod_is_not_logsdb() {
+    public void test_ignore_above_isSet_returns_true_when_ignore_above_is_given_as_logsdb_default_but_index_mod_is_not_logsdb() {
         // given
         Settings settings = Settings.builder()
             .put(IndexMetadata.SETTING_VERSION_CREATED, IndexVersion.current())
@@ -490,7 +489,7 @@ public void test_isIgnoreAboveSet_returns_true_when_ignore_above_is_given_as_log
         assertEquals(IGNORE_ABOVE_DEFAULT_LOGSDB_INDICES, fieldType.ignoreAbove().get());
     }
 
-    public void test_isIgnoreAboveSet_returns_false_when_ignore_above_is_configured_at_index_level() {
+    public void test_ignore_above_isSet_returns_false_when_ignore_above_is_configured_at_index_level() {
         // given
         Settings settings = Settings.builder()
             .put(IndexMetadata.SETTING_VERSION_CREATED, IndexVersion.current())
@@ -518,11 +517,11 @@ public void test_isIgnoreAboveSet_returns_false_when_ignore_above_is_configured_
         );
 
         // when/then
-        assertFalse(fieldType.ignoreAbove().isSet());
+        assertTrue(fieldType.ignoreAbove().isSet());
         assertEquals(123, fieldType.ignoreAbove().get());
     }
 
-    public void test_isIgnoreAboveSet_returns_false_for_non_primary_constructor() {
+    public void test_ignore_above_isSet_returns_false_for_non_primary_constructor() {
         // given
         KeywordFieldType fieldType1 = new KeywordFieldType("field");
         KeywordFieldType fieldType2 = new KeywordFieldType("field", mock(FieldType.class));

server/src/test/java/org/elasticsearch/index/mapper/ObjectMapperMergeTests.java

@@ -263,12 +263,12 @@ public void testMergeSameObjectDifferentFields() {
 
         ObjectMapper parent0 = (ObjectMapper) mergedAdd0.getMapper("parent");
         assertNotNull(parent0.getMapper("child1"));
-        assertEquals(42, ((KeywordFieldMapper) parent0.getMapper("child1")).fieldType().ignoreAbove());
+        assertEquals(42, ((KeywordFieldMapper) parent0.getMapper("child1")).fieldType().ignoreAbove().get());
         assertNull(parent0.getMapper("child2"));
 
         ObjectMapper parent1 = (ObjectMapper) mergedAdd1.getMapper("parent");
         assertNotNull(parent1.getMapper("child1"));
-        assertEquals(42, ((KeywordFieldMapper) parent1.getMapper("child1")).fieldType().ignoreAbove());
+        assertEquals(42, ((KeywordFieldMapper) parent1.getMapper("child1")).fieldType().ignoreAbove().get());
         assertNotNull(parent1.getMapper("child2"));
     }
 

x-pack/plugin/wildcard/src/test/java/org/elasticsearch/xpack/wildcard/mapper/WildcardFieldMapperTests.java

@@ -721,7 +721,7 @@ protected Object getSampleValueForDocument() {
     @Override
     protected void registerParameters(ParameterChecker checker) throws IOException {
         checker.registerConflictCheck("null_value", b -> b.field("null_value", "foo"));
-        checker.registerUpdateCheck(b -> b.field("ignore_above", 256), m -> assertEquals(256, ((WildcardFieldMapper) m).ignoreAbove()));
+        checker.registerUpdateCheck(b -> b.field("ignore_above", 256), m -> assertEquals(256, ((WildcardFieldMapper) m).ignoreAbove().get()));
 
     }