honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Test: Fix removed queryString -> queryStringQuery

This commit is contained in:
David Pilato 2014-12-03 18:31:53 +01:00
parent 11b1287610
commit e3d80af54e
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/test/java/org/elasticsearch/plugin/mapper/attachments/test/MultipleAttachmentIntegrationTests.java
View File

@ -32,7 +32,7 @@ import static org.elasticsearch.common.io.Streams.copyToBytesFromClasspath;
import static org.elasticsearch.common.io.Streams.copyToStringFromClasspath; import static org.elasticsearch.common.io.Streams.copyToStringFromClasspath;
import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilder; import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilder;
import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder;
import static org.elasticsearch.index.query.QueryBuilders.queryString; import static org.elasticsearch.index.query.QueryBuilders.queryStringQuery;
import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.equalTo;
/** /**
@ -77,10 +77,10 @@ public class MultipleAttachmentIntegrationTests extends ElasticsearchIntegration
refresh(); refresh();
CountResponse countResponse = client().prepareCount("test").setQuery(queryString("World").defaultField("file1")).execute().get(); CountResponse countResponse = client().prepareCount("test").setQuery(queryStringQuery("World").defaultField("file1")).execute().get();
assertThat(countResponse.getCount(), equalTo(1l)); assertThat(countResponse.getCount(), equalTo(1l));
countResponse = client().prepareCount("test").setQuery(queryString("World").defaultField("hello")).execute().get(); countResponse = client().prepareCount("test").setQuery(queryStringQuery("World").defaultField("hello")).execute().get();
assertThat(countResponse.getCount(), equalTo(1l)); assertThat(countResponse.getCount(), equalTo(1l));
} }

14
src/test/java/org/elasticsearch/plugin/mapper/attachments/test/SimpleAttachmentIntegrationTests.java
View File

@ -33,7 +33,7 @@ import static org.elasticsearch.client.Requests.putMappingRequest;
import static org.elasticsearch.common.io.Streams.copyToBytesFromClasspath; import static org.elasticsearch.common.io.Streams.copyToBytesFromClasspath;
import static org.elasticsearch.common.io.Streams.copyToStringFromClasspath; import static org.elasticsearch.common.io.Streams.copyToStringFromClasspath;
import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder;
import static org.elasticsearch.index.query.QueryBuilders.queryString; import static org.elasticsearch.index.query.QueryBuilders.queryStringQuery;
import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.is;
@ -67,10 +67,10 @@ public class SimpleAttachmentIntegrationTests extends ElasticsearchIntegrationTe
index("test", "person", jsonBuilder().startObject().field("file", html).endObject()); index("test", "person", jsonBuilder().startObject().field("file", html).endObject());
refresh(); refresh();
CountResponse countResponse = client().prepareCount("test").setQuery(queryString("test document").defaultField("file.title")).execute().get(); CountResponse countResponse = client().prepareCount("test").setQuery(queryStringQuery("test document").defaultField("file.title")).execute().get();
assertThat(countResponse.getCount(), equalTo(1l)); assertThat(countResponse.getCount(), equalTo(1l));
countResponse = client().prepareCount("test").setQuery(queryString("tests the ability").defaultField("file")).execute().get(); countResponse = client().prepareCount("test").setQuery(queryStringQuery("tests the ability").defaultField("file")).execute().get();
assertThat(countResponse.getCount(), equalTo(1l)); assertThat(countResponse.getCount(), equalTo(1l));
} }
@ -85,10 +85,10 @@ public class SimpleAttachmentIntegrationTests extends ElasticsearchIntegrationTe
index("test", "person", jsonBuilder().startObject().field("file").startObject().field("_content", txt).field("_indexed_chars", CONTENT_LENGTH_LIMIT).endObject()); index("test", "person", jsonBuilder().startObject().field("file").startObject().field("_content", txt).field("_indexed_chars", CONTENT_LENGTH_LIMIT).endObject());
refresh(); refresh();
CountResponse countResponse = client().prepareCount("test").setQuery(queryString("BeforeLimit").defaultField("file")).execute().get(); CountResponse countResponse = client().prepareCount("test").setQuery(queryStringQuery("BeforeLimit").defaultField("file")).execute().get();
assertThat(countResponse.getCount(), equalTo(1l)); assertThat(countResponse.getCount(), equalTo(1l));
countResponse = client().prepareCount("test").setQuery(queryString("AfterLimit").defaultField("file")).execute().get(); countResponse = client().prepareCount("test").setQuery(queryStringQuery("AfterLimit").defaultField("file")).execute().get();
assertThat(countResponse.getCount(), equalTo(0l)); assertThat(countResponse.getCount(), equalTo(0l));
} }
@ -103,10 +103,10 @@ public class SimpleAttachmentIntegrationTests extends ElasticsearchIntegrationTe
index("test", "person", jsonBuilder().startObject().field("file").startObject().field("_content", txt).field("_indexed_chars", CONTENT_LENGTH_LIMIT).endObject()); index("test", "person", jsonBuilder().startObject().field("file").startObject().field("_content", txt).field("_indexed_chars", CONTENT_LENGTH_LIMIT).endObject());
refresh(); refresh();
CountResponse countResponse = client().prepareCount("test").setQuery(queryString("Begin").defaultField("file")).execute().get(); CountResponse countResponse = client().prepareCount("test").setQuery(queryStringQuery("Begin").defaultField("file")).execute().get();
assertThat(countResponse.getCount(), equalTo(1l)); assertThat(countResponse.getCount(), equalTo(1l));
countResponse = client().prepareCount("test").setQuery(queryString("End").defaultField("file")).execute().get(); countResponse = client().prepareCount("test").setQuery(queryStringQuery("End").defaultField("file")).execute().get();
assertThat(countResponse.getCount(), equalTo(1l)); assertThat(countResponse.getCount(), equalTo(1l));
} }