Add better validation error message and a dedicated test

1 files changed, 6 insertions, 0 deletions

diff --git a/core/src/test/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingRequestTests.java b/core/src/test/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingRequestTests.java
index 967a902646..65b9ff0dd2 100644
--- a/core/src/test/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingRequestTests.java
+++ b/core/src/test/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingRequestTests.java
@@ -20,6 +20,7 @@
 package org.elasticsearch.action.admin.indices.mapping.put;
 
 import org.elasticsearch.action.ActionRequestValidationException;
+import org.elasticsearch.index.Index;
 import org.elasticsearch.test.ESTestCase;
 
 public class PutMappingRequestTests extends ESTestCase {
@@ -48,5 +49,10 @@ public class PutMappingRequestTests extends ESTestCase {
         r.source("somevalidmapping");
         ex = r.validate();
         assertNull("validation should succeed", ex);
+
+        r.setConcreteIndex(new Index("foo", "bar"));
+        ex = r.validate();
+        assertNotNull("source validation should fail", ex);
+        assertTrue(ex.getMessage().contains("either concreteIndices or unresolved indices can be set"));
     }
 }