Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Removes typed calls from YAML REST tests #37611

Merged
merged 18 commits into from
Jan 30, 2019
Merged

Removes typed calls from YAML REST tests #37611

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
c537b98
Fixes tests in directory starting a to search
colings86 Jan 18, 2019
82def67
the rest of the tests
colings86 Jan 18, 2019
b73f9ee
addresses tests in plugins
colings86 Jan 18, 2019
8c87b2a
Addresses module rest tests
colings86 Jan 18, 2019
7ab3edc
review comments
colings86 Jan 21, 2019
da8f57e
Fixes Tests
colings86 Jan 22, 2019
144c09b
Fix tests
colings86 Jan 22, 2019
1c5d5a8
Fixes tests
colings86 Jan 23, 2019
354a5b6
Trying to fix test
colings86 Jan 23, 2019
e5c0cce
Fixes tests
colings86 Jan 23, 2019
0369bc1
Fixes tests
colings86 Jan 23, 2019
a89354e
Makes test harness insert type in mixed version tests
colings86 Jan 24, 2019
0cea5f7
Fixes tests and adds types to get requests
colings86 Jan 28, 2019
ae27a70
Fixes tests
colings86 Jan 28, 2019
52f9252
Fix Test
colings86 Jan 28, 2019
0cc6bb0
Fix Test
colings86 Jan 29, 2019
a20c1af
fixup! Makes test harness insert type in mixed version tests
colings86 Jan 29, 2019
9c8cbb9
Fixes style
colings86 Jan 30, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 6 additions & 8 deletions modules/aggs-matrix-stats/src/test/resources/rest-api-spec/test/stats/20_empty_bucket.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,29 +2,27 @@
"Empty Bucket Aggregation":
- do:
indices.create:
include_type_name: false
index: empty_bucket_idx
body:
settings:
number_of_shards: "3"
mappings:
test:
"properties":
"value":
"type": "integer"
"val1":
"type": "double"
"properties":
"value":
"type": "integer"
"val1":
"type": "double"

- do:
index:
index: empty_bucket_idx
type: test
id: 1
body: { "value": 0, "val1": 3.1 }

- do:
index:
index: empty_bucket_idx
type: test
id: 2
body: { "value": 2, "val1": -3.1 }

Expand Down
31 changes: 8 additions & 23 deletions ...s/aggs-matrix-stats/src/test/resources/rest-api-spec/test/stats/30_single_value_field.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,20 @@ setup:

- do:
indices.create:
include_type_name: false
index: test
body:
settings:
number_of_shards: 3
number_of_routing_shards: 3
mappings:
test:
"properties":
"val1":
"type": "double"
"val2":
"type": "double"
"val3":
"type": "double"
"properties":
"val1":
"type": "double"
"val2":
"type": "double"
"val3":
"type": "double"

- do:
indices.create:
Expand All @@ -28,91 +28,76 @@ setup:
- do:
index:
index: test
type: test
id: 1
body: { "val1": 1.9, "val2": 3.1, "val3": 2.3 }
- do:
index:
index: test
type: test
id: 2
body: { "val1": -5.2, "val2": -3.4, "val3": 2.3}
- do:
index:
index: test
type: test
id: 3
body: { "val1": -5.2, "val3": 2.3}
- do:
index:
index: test
type: test
id: 4
body: { "val1": 18.3, "val2": 104.4, "val3": 2.3}
- do:
index:
index: test
type: test
id: 5
body: { "val1": -53.2, "val2": -322.4, "val3": 2.3}
- do:
index:
index: test
type: test
id: 6
body: { "val1": -578.9, "val2": 69.9, "val3": 2.3}
- do:
index:
index: test
type: test
id: 7
body: { "val1": 16.2, "val2": 17.2, "val3": 2.3}
- do:
index:
index: test
type: test
id: 8
body: { "val1": -4222.63, "val2": 316.44, "val3": 2.3}
- do:
index:
index: test
type: test
id: 9
body: { "val1": -59999.55, "val2": -3163.4, "val3": 2.3}
- do:
index:
index: test
type: test
id: 10
body: { "val1": 782.7, "val2": 789.7, "val3": 2.3}
- do:
index:
index: test
type: test
id: 11
body: { "val1": -1.2, "val2": 6.3, "val3": 2.3}
- do:
index:
index: test
type: test
id: 12
body: { "val1": 0, "val2": 1.11, "val3": 2.3}
- do:
index:
index: test
type: test
id: 13
body: { "val1": 0.1, "val2": 0.92, "val3": 2.3}
- do:
index:
index: test
type: test
id: 14
body: { "val1": 0.12, "val2": -82.4, "val3": 2.3}
- do:
index:
index: test
type: test
id: 15
body: { "val1": 98.2, "val2": 32.4, "val3": 2.3}

Expand Down
31 changes: 8 additions & 23 deletions ...es/aggs-matrix-stats/src/test/resources/rest-api-spec/test/stats/40_multi_value_field.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,20 @@ setup:

- do:
indices.create:
include_type_name: false
index: test
body:
settings:
number_of_shards: 3
number_of_routing_shards: 3
mappings:
test:
"properties":
"val1":
"type": "double"
"val2":
"type": "double"
"val3":
"type": "double"
"properties":
"val1":
"type": "double"
"val2":
"type": "double"
"val3":
"type": "double"

- do:
indices.create:
Expand All @@ -28,91 +28,76 @@ setup:
- do:
index:
index: test
type: test
id: 1
body: { "val1": 1.9, "val2": 3.1, "val3": 2.3, "vals" : [1.9, 16.143] }
- do:
index:
index: test
type: test
id: 2
body: { "val1": -5.2, "val2": -3.4, "val3": 2.3, "vals" : [155, 16.23]}
- do:
index:
index: test
type: test
id: 3
body: { "val1": -5.2, "val3": 2.3, "vals" : [-455, -32.32]}
- do:
index:
index: test
type: test
id: 4
body: { "val1": 18.3, "val2": 104.4, "val3": 2.3, "vals" : [0.14, 92.1]}
- do:
index:
index: test
type: test
id: 5
body: { "val1": -53.2, "val2": -322.4, "val3": 2.3, "vals" : [16, 16]}
- do:
index:
index: test
type: test
id: 6
body: { "val1": -578.9, "val2": 69.9, "val3": 2.3}
- do:
index:
index: test
type: test
id: 7
body: { "val1": 16.2, "val2": 17.2, "val3": 2.3, "vals" : [1234.3, -3433]}
- do:
index:
index: test
type: test
id: 8
body: { "val1": -4222.63, "val2": 316.44, "val3": 2.3, "vals" : [177.2, -93.333]}
- do:
index:
index: test
type: test
id: 9
body: { "val1": -59999.55, "val2": -3163.4, "val3": 2.3, "vals" : [-29.9, 163.0]}
- do:
index:
index: test
type: test
id: 10
body: { "val1": 782.7, "val2": 789.7, "val3": 2.3, "vals" : [-0.2, 1343.3]}
- do:
index:
index: test
type: test
id: 11
body: { "val1": -1.2, "val2": 6.3, "val3": 2.3, "vals" : [15.3, 16.9]}
- do:
index:
index: test
type: test
id: 12
body: { "val1": 0, "val2": 1.11, "val3": 2.3, "vals" : [-644.4, -644.4]}
- do:
index:
index: test
type: test
id: 13
body: { "val1": 0.1, "val2": 0.92, "val3": 2.3, "vals" : [73.2, 0.12]}
- do:
index:
index: test
type: test
id: 14
body: { "val1": 0.12, "val2": -82.4, "val3": 2.3, "vals" : [-0.001, 1295.3]}
- do:
index:
index: test
type: test
id: 15
body: { "val1": 98.2, "val2": 32.4, "val3": 2.3, "vals" : [15.5, 16.5]}

Expand Down
12 changes: 5 additions & 7 deletions modules/analysis-common/src/test/resources/rest-api-spec/test/indices.analyze/10_analyze.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@

- do:
indices.create:
include_type_name: false
index: test_deprecated_htmlstrip
body:
settings:
Expand All @@ -33,18 +34,16 @@
tokenizer: keyword
char_filter: ["htmlStrip"]
mappings:
type:
properties:
name:
type: text
analyzer: my_htmlStripWithCharfilter
properties:
name:
type: text
analyzer: my_htmlStripWithCharfilter

- do:
warnings:
- 'The [htmpStrip] char filter name is deprecated and will be removed in a future version. Please change the filter name to [html_strip] instead.'
index:
index: test_deprecated_htmlstrip
type: type
id: 1
body: { "name": "foo bar" }

Expand All @@ -53,7 +52,6 @@
- 'The [htmpStrip] char filter name is deprecated and will be removed in a future version. Please change the filter name to [html_strip] instead.'
index:
index: test_deprecated_htmlstrip
type: type
id: 2
body: { "name": "foo baz" }

Expand Down
13 changes: 5 additions & 8 deletions ...lysis-common/src/test/resources/rest-api-spec/test/indices/validate_query/10_synonyms.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"validate query with synonyms":
- do:
indices.create:
include_type_name: false
index: test
body:
settings:
Expand All @@ -16,11 +17,10 @@
tokenizer: standard
filter: [ syns ]
mappings:
test:
properties:
field:
type: text
analyzer: syns
properties:
field:
type: text
analyzer: syns

- do:
indices.validate_query:
Expand Down Expand Up @@ -77,6 +77,3 @@
- is_true: valid
- length: { explanations: 1 }
- match: { explanations.0.explanation: "field:\"foo (one* two*)\"" }



14 changes: 6 additions & 8 deletions modules/analysis-common/src/test/resources/rest-api-spec/test/search.query/10_match.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
# versions in the same position.
- do:
indices.create:
include_type_name: false
index: test
body:
settings:
Expand All @@ -24,17 +25,15 @@
type: unique
only_on_same_position: true
mappings:
doc:
properties:
text:
type: text
analyzer: index
search_analyzer: search
properties:
text:
type: text
analyzer: index
search_analyzer: search

- do:
index:
index: test
type: doc
id: 1
body: { "text": "the fox runs across the street" }
refresh: true
Expand All @@ -53,7 +52,6 @@
- do:
index:
index: test
type: doc
id: 2
body: { "text": "run fox run" }
refresh: true
Expand Down
Loading