From 534b07a3fba214e1f1b3cb24db04cde95a6d8f3f Mon Sep 17 00:00:00 2001
From: Andrew Raines <andrew@raines.me>
Date: Wed, 25 Jun 2014 16:22:20 +0200
Subject: [PATCH] [TEST] Add assertion failure messages

---
 .../search/query/ExistsMissingTests.java      | 26 +++++++++++--------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/src/test/java/org/elasticsearch/search/query/ExistsMissingTests.java b/src/test/java/org/elasticsearch/search/query/ExistsMissingTests.java
index 853d115292a..26c51cfba6a 100644
--- a/src/test/java/org/elasticsearch/search/query/ExistsMissingTests.java
+++ b/src/test/java/org/elasticsearch/search/query/ExistsMissingTests.java
@@ -33,6 +33,7 @@ import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Locale;
 
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked;
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertSearchResponse;
@@ -41,16 +42,19 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertSear
 public class ExistsMissingTests extends ElasticsearchIntegrationTest {
 
     public void testExistsMissing() throws Exception {
-        assertAcked(client().admin().indices().prepareCreate("idx").addMapping("type", XContentBuilder.builder(JsonXContent.jsonXContent)
+
+        XContentBuilder mapping = XContentBuilder.builder(JsonXContent.jsonXContent)
                 .startObject()
-                    .startObject("type")
-                        .startObject(FieldNamesFieldMapper.NAME)
-                            // by setting randomly index to no we also test the pre-1.3 behavior
-                            .field("index", randomFrom("no", "not_analyzed"))
-                            .field("store", randomFrom("no", "yes"))
-                        .endObject()
-                    .endObject()
-                .endObject()));
+                .startObject("type")
+                .startObject(FieldNamesFieldMapper.NAME)
+                        // by setting randomly index to no we also test the pre-1.3 behavior
+                .field("index", randomFrom("no", "not_analyzed"))
+                .field("store", randomFrom("no", "yes"))
+                .endObject()
+                .endObject()
+                .endObject();
+
+        assertAcked(client().admin().indices().prepareCreate("idx").addMapping("type", mapping));
             @SuppressWarnings("unchecked")
             Map<String, Object>[] sources = new Map[] {
                     // simple property
@@ -86,12 +90,12 @@ public class ExistsMissingTests extends ElasticsearchIntegrationTest {
             // exists
             SearchResponse resp = client().prepareSearch("idx").setQuery(QueryBuilders.filteredQuery(QueryBuilders.matchAllQuery(), FilterBuilders.existsFilter(fieldName))).execute().actionGet();
             assertSearchResponse(resp);
-            assertEquals(count, resp.getHits().totalHits());
+            assertEquals(String.format(Locale.ROOT, "exists(%s, %d) mapping: %s", fieldName, count, mapping.string()), count, resp.getHits().totalHits());
 
             // missing
             resp = client().prepareSearch("idx").setQuery(QueryBuilders.filteredQuery(QueryBuilders.matchAllQuery(), FilterBuilders.missingFilter(fieldName))).execute().actionGet();
             assertSearchResponse(resp);
-            assertEquals(numDocs - count, resp.getHits().totalHits());
+            assertEquals(String.format(Locale.ROOT, "missing(%s, %d) mapping: %s", fieldName, count, mapping.string()), numDocs - count, resp.getHits().totalHits());
         }
     }