From 4aeaa3bac4662e866703793dfdf4d433d257bea1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Honza=20Kr=C3=A1l?= Date: Sat, 4 Jan 2014 01:21:43 +0100 Subject: [PATCH] [TEST] Fix yaml tests after #4542 --- rest-api-spec/test/get/20_fields.yaml | 10 +++---- .../test/get/70_source_filtering.yaml | 2 +- .../test/indices.put_mapping/10_basic.yaml | 2 +- rest-api-spec/test/mget/20_fields.yaml | 30 +++++++++---------- .../test/mget/20_fields_pre_0.90.3.yaml | 30 +++++++++---------- .../test/search/10_source_filtering.yaml | 4 +-- rest-api-spec/test/update/40_routing.yaml | 2 +- rest-api-spec/test/update/50_parent.yaml | 2 +- .../test/update/55_parent_with_routing.yaml | 2 +- rest-api-spec/test/update/80_fields.yaml | 2 +- 10 files changed, 43 insertions(+), 43 deletions(-) diff --git a/rest-api-spec/test/get/20_fields.yaml b/rest-api-spec/test/get/20_fields.yaml index 803f428e6d3..15530b8be3d 100644 --- a/rest-api-spec/test/get/20_fields.yaml +++ b/rest-api-spec/test/get/20_fields.yaml @@ -17,7 +17,7 @@ - match: { _index: test_1 } - match: { _type: test } - match: { _id: '1' } - - match: { fields.foo: bar } + - match: { fields.foo: [bar] } - is_false: _source - do: @@ -27,8 +27,8 @@ id: 1 fields: [foo, count] - - match: { fields.foo: bar } - - match: { fields.count: 1 } + - match: { fields.foo: [bar] } + - match: { fields.count: [1] } - is_false: _source - do: @@ -38,8 +38,8 @@ id: 1 fields: [foo, count, _source] - - match: { fields.foo: bar } - - match: { fields.count: 1 } + - match: { fields.foo: [bar] } + - match: { fields.count: [1] } - match: { _source.foo: bar } diff --git a/rest-api-spec/test/get/70_source_filtering.yaml b/rest-api-spec/test/get/70_source_filtering.yaml index 0015e9e9724..0620ba7f2ad 100644 --- a/rest-api-spec/test/get/70_source_filtering.yaml +++ b/rest-api-spec/test/get/70_source_filtering.yaml @@ -56,5 +56,5 @@ - match: { _index: test_1 } - match: { _type: test } - match: { _id: "1" } - - match: { fields.count: 1 } + - match: { fields.count: [1] } - match: { _source.include.field1: v1 } diff --git a/rest-api-spec/test/indices.put_mapping/10_basic.yaml b/rest-api-spec/test/indices.put_mapping/10_basic.yaml index ecf42a782ae..bcab9f2ba69 100644 --- a/rest-api-spec/test/indices.put_mapping/10_basic.yaml +++ b/rest-api-spec/test/indices.put_mapping/10_basic.yaml @@ -44,4 +44,4 @@ index: test_index - match: {test_index.test_type.properties.text.type: multi_field} - - match: {test_index.test_type.properties.text.fields.text_raw.index: not_analyzed} + - match: {test_index.test_type.properties.text.fields.text_raw.index: not_analyzed } diff --git a/rest-api-spec/test/mget/20_fields.yaml b/rest-api-spec/test/mget/20_fields.yaml index 4b8c7323bde..493bd32c2b6 100644 --- a/rest-api-spec/test/mget/20_fields.yaml +++ b/rest-api-spec/test/mget/20_fields.yaml @@ -28,13 +28,13 @@ - is_false: docs.0.fields - match: { docs.0._source: { foo: bar }} - - match: { docs.1.fields.foo: bar } + - match: { docs.1.fields.foo: [bar] } - is_false: docs.1._source - - match: { docs.2.fields.foo: bar } + - match: { docs.2.fields.foo: [bar] } - is_false: docs.2._source - - match: { docs.3.fields.foo: bar } + - match: { docs.3.fields.foo: [bar] } - match: { docs.3._source: { foo: bar }} - do: @@ -49,16 +49,16 @@ - { _id: 1, fields: [foo] } - { _id: 1, fields: [foo, _source] } - - match: { docs.0.fields.foo: bar } + - match: { docs.0.fields.foo: [bar] } - is_false: docs.0._source - - match: { docs.1.fields.foo: bar } + - match: { docs.1.fields.foo: [bar] } - is_false: docs.1._source - - match: { docs.2.fields.foo: bar } + - match: { docs.2.fields.foo: [bar] } - is_false: docs.2._source - - match: { docs.3.fields.foo: bar } + - match: { docs.3.fields.foo: [bar] } - match: { docs.3._source: { foo: bar }} - do: @@ -73,16 +73,16 @@ - { _id: 1, fields: [foo] } - { _id: 1, fields: [foo, _source] } - - match: { docs.0.fields.foo: bar } + - match: { docs.0.fields.foo: [bar] } - is_false: docs.0._source - - match: { docs.1.fields.foo: bar } + - match: { docs.1.fields.foo: [bar] } - is_false: docs.1._source - - match: { docs.2.fields.foo: bar } + - match: { docs.2.fields.foo: [bar] } - is_false: docs.2._source - - match: { docs.3.fields.foo: bar } + - match: { docs.3.fields.foo: [bar] } - match: { docs.3._source: { foo: bar }} - do: @@ -97,15 +97,15 @@ - { _id: 1, fields: [foo] } - { _id: 1, fields: [foo, _source] } - - match: { docs.0.fields.foo: bar } + - match: { docs.0.fields.foo: [bar] } - match: { docs.0._source: { foo: bar }} - - match: { docs.1.fields.foo: bar } + - match: { docs.1.fields.foo: [bar] } - is_false: docs.1._source - - match: { docs.2.fields.foo: bar } + - match: { docs.2.fields.foo: [bar] } - is_false: docs.2._source - - match: { docs.3.fields.foo: bar } + - match: { docs.3.fields.foo: [bar] } - match: { docs.3._source: { foo: bar }} diff --git a/rest-api-spec/test/mget/20_fields_pre_0.90.3.yaml b/rest-api-spec/test/mget/20_fields_pre_0.90.3.yaml index 070cb1b8056..aaf18f1a25d 100644 --- a/rest-api-spec/test/mget/20_fields_pre_0.90.3.yaml +++ b/rest-api-spec/test/mget/20_fields_pre_0.90.3.yaml @@ -30,13 +30,13 @@ - is_false: docs.0.fields - match: { docs.0._source: { foo: bar }} - # - match: { docs.1.fields.foo: bar } + # - match: { docs.1.fields.foo: [bar] } # - is_false: docs.1._source - - match: { docs.2.fields.foo: bar } + - match: { docs.2.fields.foo: [bar] } - is_false: docs.2._source - - match: { docs.3.fields.foo: bar } + - match: { docs.3.fields.foo: [bar] } - match: { docs.3._source: { foo: bar }} - do: @@ -51,16 +51,16 @@ - { _id: 1, fields: [foo] } - { _id: 1, fields: [foo, _source] } - - match: { docs.0.fields.foo: bar } + - match: { docs.0.fields.foo: [bar] } - is_false: docs.0._source - - match: { docs.1.fields.foo: bar } + - match: { docs.1.fields.foo: [bar] } - is_false: docs.1._source - - match: { docs.2.fields.foo: bar } + - match: { docs.2.fields.foo: [bar] } - is_false: docs.2._source - - match: { docs.3.fields.foo: bar } + - match: { docs.3.fields.foo: [bar] } - match: { docs.3._source: { foo: bar }} - do: @@ -75,16 +75,16 @@ - { _id: 1, fields: [foo] } - { _id: 1, fields: [foo, _source] } - - match: { docs.0.fields.foo: bar } + - match: { docs.0.fields.foo: [bar] } - is_false: docs.0._source - - match: { docs.1.fields.foo: bar } + - match: { docs.1.fields.foo: [bar] } - is_false: docs.1._source - - match: { docs.2.fields.foo: bar } + - match: { docs.2.fields.foo: [bar] } - is_false: docs.2._source - - match: { docs.3.fields.foo: bar } + - match: { docs.3.fields.foo: [bar] } - match: { docs.3._source: { foo: bar }} - do: @@ -99,15 +99,15 @@ - { _id: 1, fields: [foo] } - { _id: 1, fields: [foo, _source] } - - match: { docs.0.fields.foo: bar } + - match: { docs.0.fields.foo: [bar] } - match: { docs.0._source: { foo: bar }} - # - match: { docs.1.fields.foo: bar } + # - match: { docs.1.fields.foo: [bar] } # - is_false: docs.1._source - - match: { docs.2.fields.foo: bar } + - match: { docs.2.fields.foo: [bar] } - is_false: docs.2._source - - match: { docs.3.fields.foo: bar } + - match: { docs.3.fields.foo: [bar] } - match: { docs.3._source: { foo: bar }} diff --git a/rest-api-spec/test/search/10_source_filtering.yaml b/rest-api-spec/test/search/10_source_filtering.yaml index 4e3f4f30c37..0827339fff5 100644 --- a/rest-api-spec/test/search/10_source_filtering.yaml +++ b/rest-api-spec/test/search/10_source_filtering.yaml @@ -82,7 +82,7 @@ body: fields: [ include.field2 ] query: { match_all: {} } - - match: { hits.hits.0.fields: { include.field2 : v2 }} + - match: { hits.hits.0.fields: { include.field2 : [v2] }} - is_false: hits.hits.0._source - do: @@ -90,6 +90,6 @@ body: fields: [ include.field2, _source ] query: { match_all: {} } - - match: { hits.hits.0.fields: { include.field2 : v2 }} + - match: { hits.hits.0.fields: { include.field2 : [v2] }} - is_true: hits.hits.0._source diff --git a/rest-api-spec/test/update/40_routing.yaml b/rest-api-spec/test/update/40_routing.yaml index d60acdf1a5d..6ba6a5098b0 100644 --- a/rest-api-spec/test/update/40_routing.yaml +++ b/rest-api-spec/test/update/40_routing.yaml @@ -40,5 +40,5 @@ body: doc: { foo: baz } - - match: { get.fields.foo: baz } + - match: { get.fields.foo: [baz] } diff --git a/rest-api-spec/test/update/50_parent.yaml b/rest-api-spec/test/update/50_parent.yaml index a55b406fc1d..4b2158d8137 100644 --- a/rest-api-spec/test/update/50_parent.yaml +++ b/rest-api-spec/test/update/50_parent.yaml @@ -55,7 +55,7 @@ setup: body: doc: { foo: baz } - - match: { get.fields.foo: baz } + - match: { get.fields.foo: [baz] } --- "Parent omitted post 1.0": diff --git a/rest-api-spec/test/update/55_parent_with_routing.yaml b/rest-api-spec/test/update/55_parent_with_routing.yaml index 1d0326c8715..fa90b723c8f 100644 --- a/rest-api-spec/test/update/55_parent_with_routing.yaml +++ b/rest-api-spec/test/update/55_parent_with_routing.yaml @@ -56,5 +56,5 @@ body: doc: { foo: baz } - - match: { get.fields.foo: baz } + - match: { get.fields.foo: [baz] } diff --git a/rest-api-spec/test/update/80_fields.yaml b/rest-api-spec/test/update/80_fields.yaml index 7f00848621c..86d6afa069d 100644 --- a/rest-api-spec/test/update/80_fields.yaml +++ b/rest-api-spec/test/update/80_fields.yaml @@ -12,7 +12,7 @@ upsert: { foo: bar } - match: { get._source.foo: bar } - - match: { get.fields.foo: bar } + - match: { get.fields.foo: [bar] } - is_false: get.fields.bar # TODO: