From c25de57d5d6e1ea1e3961f46c4b12b105f3f9fca Mon Sep 17 00:00:00 2001 From: Clinton Gormley Date: Tue, 10 Jun 2014 21:34:03 +0200 Subject: [PATCH] Tests: Fixed CompletionSuggester test which relied on a bug --- .../search/suggest/CompletionSuggestSearchTests.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/test/java/org/elasticsearch/search/suggest/CompletionSuggestSearchTests.java b/src/test/java/org/elasticsearch/search/suggest/CompletionSuggestSearchTests.java index b5ca8a1f39f..407f55cc71f 100644 --- a/src/test/java/org/elasticsearch/search/suggest/CompletionSuggestSearchTests.java +++ b/src/test/java/org/elasticsearch/search/suggest/CompletionSuggestSearchTests.java @@ -18,6 +18,7 @@ */ package org.elasticsearch.search.suggest; +import com.carrotsearch.hppc.ObjectLongOpenHashMap; import com.carrotsearch.randomizedtesting.generators.RandomStrings; import com.google.common.collect.Lists; import org.elasticsearch.ExceptionsHelper; @@ -662,7 +663,7 @@ public class CompletionSuggestSearchTests extends ElasticsearchIntegrationTest { PutMappingResponse putMappingResponse = client().admin().indices().preparePutMapping(INDEX).setType(TYPE).setSource(jsonBuilder().startObject() .startObject(TYPE).startObject("properties") - .startObject(FIELD) + .startObject(FIELD.toString()) .field("type", "completion").field("analyzer", "simple") .endObject() .startObject(otherField) @@ -691,7 +692,8 @@ public class CompletionSuggestSearchTests extends ElasticsearchIntegrationTest { // regexes IndicesStatsResponse regexFieldStats = client().admin().indices().prepareStats(INDEX).setIndices(INDEX).setCompletion(true).setCompletionFields("*").get(); - long regexSizeInBytes = regexFieldStats.getIndex(INDEX).getPrimaries().completion.getFields().get("*"); + ObjectLongOpenHashMap fields = regexFieldStats.getIndex(INDEX).getPrimaries().completion.getFields(); + long regexSizeInBytes = fields.get(FIELD) + fields.get(otherField); assertThat(regexSizeInBytes, is(totalSizeInBytes)); } @@ -863,7 +865,7 @@ public class CompletionSuggestSearchTests extends ElasticsearchIntegrationTest { .startArray("input").value(input[i]).endArray() .field("output", surface[i]) .startObject("payload").field("id", i).endObject() - .field("weight", 1) // WE FORCEFULLY INDEX A BOGUS WEIGHT + .field("weight", 1) // WE FORCEFULLY INDEX A BOGUS WEIGHT .endObject() .endObject() );