From 410704fd18acde70a0e7b149ce6e1b9aaa7560dd Mon Sep 17 00:00:00 2001 From: Ryan Ernst Date: Thu, 2 Jul 2015 11:37:18 -0700 Subject: [PATCH] fix rest tests to not depend on short name access of mappings --- .../50_field_wildcards.yaml | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_field_mapping/50_field_wildcards.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_field_mapping/50_field_wildcards.yaml index 0a820cbefae..cc5368941b1 100644 --- a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_field_mapping/50_field_wildcards.yaml +++ b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_field_mapping/50_field_wildcards.yaml @@ -87,9 +87,9 @@ setup: - do: indices.get_field_mapping: index: test_index - field: "i_*" - - match: {test_index.mappings.test_type.i_t1.full_name: obj.i_t1 } - - match: {test_index.mappings.test_type.i_t3.full_name: obj.i_t3 } + field: "obj.i_*" + - match: {test_index.mappings.test_type.obj\.i_t1.full_name: obj.i_t1 } + - match: {test_index.mappings.test_type.obj\.i_t3.full_name: obj.i_t3 } - length: {test_index.mappings.test_type: 2} --- @@ -99,12 +99,12 @@ setup: indices.get_field_mapping: index: _all type: _all - field: "i_*" - - match: {test_index.mappings.test_type.i_t1.full_name: obj.i_t1 } - - match: {test_index.mappings.test_type.i_t3.full_name: obj.i_t3 } + field: "t*" + - match: {test_index.mappings.test_type.t1.full_name: t1 } + - match: {test_index.mappings.test_type.t2.full_name: t2 } - length: {test_index.mappings.test_type: 2} - - match: {test_index_2.mappings.test_type_2.i_t1.full_name: obj.i_t1 } - - match: {test_index_2.mappings.test_type_2.i_t3.full_name: obj.i_t3 } + - match: {test_index_2.mappings.test_type_2.t1.full_name: t1 } + - match: {test_index_2.mappings.test_type_2.t2.full_name: t2 } - length: {test_index_2.mappings.test_type_2: 2} --- @@ -114,12 +114,12 @@ setup: indices.get_field_mapping: index: '*' type: '*' - field: "i_*" - - match: {test_index.mappings.test_type.i_t1.full_name: obj.i_t1 } - - match: {test_index.mappings.test_type.i_t3.full_name: obj.i_t3 } + field: "t*" + - match: {test_index.mappings.test_type.t1.full_name: t1 } + - match: {test_index.mappings.test_type.t2.full_name: t2 } - length: {test_index.mappings.test_type: 2} - - match: {test_index_2.mappings.test_type_2.i_t1.full_name: obj.i_t1 } - - match: {test_index_2.mappings.test_type_2.i_t3.full_name: obj.i_t3 } + - match: {test_index_2.mappings.test_type_2.t1.full_name: t1 } + - match: {test_index_2.mappings.test_type_2.t2.full_name: t2 } - length: {test_index_2.mappings.test_type_2: 2} --- @@ -129,11 +129,11 @@ setup: indices.get_field_mapping: index: 'test_index,test_index_2' type: 'test_type,test_type_2' - field: "i_*" - - match: {test_index.mappings.test_type.i_t1.full_name: obj.i_t1 } - - match: {test_index.mappings.test_type.i_t3.full_name: obj.i_t3 } + field: "t*" + - match: {test_index.mappings.test_type.t1.full_name: t1 } + - match: {test_index.mappings.test_type.t2.full_name: t2 } - length: {test_index.mappings.test_type: 2} - - match: {test_index_2.mappings.test_type_2.i_t1.full_name: obj.i_t1 } - - match: {test_index_2.mappings.test_type_2.i_t3.full_name: obj.i_t3 } + - match: {test_index_2.mappings.test_type_2.t1.full_name: t1 } + - match: {test_index_2.mappings.test_type_2.t2.full_name: t2 } - length: {test_index_2.mappings.test_type_2: 2}