Skip to content

Commit

Permalink
[TEST] Fix yaml tests after #4542
Browse files Browse the repository at this point in the history
  • Loading branch information
@honzakral
honzakral committed Jan 7, 2014
1 parent 107ae66 commit 4aeaa3b
Show file tree
Hide file tree
Showing 10 changed files with 43 additions and 43 deletions.
10 changes: 5 additions & 5 deletions rest-api-spec/test/get/20_fields.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand All @@ -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 }


2 changes: 1 addition & 1 deletion rest-api-spec/test/get/70_source_filtering.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
2 changes: 1 addition & 1 deletion rest-api-spec/test/indices.put_mapping/10_basic.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
30 changes: 15 additions & 15 deletions rest-api-spec/test/mget/20_fields.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand All @@ -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:
Expand All @@ -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 }}

30 changes: 15 additions & 15 deletions rest-api-spec/test/mget/20_fields_pre_0.90.3.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand All @@ -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:
Expand All @@ -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 }}

4 changes: 2 additions & 2 deletions rest-api-spec/test/search/10_source_filtering.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,14 +82,14 @@
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:
search:
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

2 changes: 1 addition & 1 deletion rest-api-spec/test/update/40_routing.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,5 +40,5 @@
body:
doc: { foo: baz }

- match: { get.fields.foo: baz }
- match: { get.fields.foo: [baz] }

2 changes: 1 addition & 1 deletion rest-api-spec/test/update/50_parent.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ setup:
body:
doc: { foo: baz }

- match: { get.fields.foo: baz }
- match: { get.fields.foo: [baz] }

---
"Parent omitted post 1.0":
Expand Down
2 changes: 1 addition & 1 deletion rest-api-spec/test/update/55_parent_with_routing.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,5 +56,5 @@
body:
doc: { foo: baz }

- match: { get.fields.foo: baz }
- match: { get.fields.foo: [baz] }

2 changes: 1 addition & 1 deletion rest-api-spec/test/update/80_fields.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit 4aeaa3b

Please sign in to comment.