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

Remove createSampleIndexRequest method and provide ids

This commit is contained in:
David Pilato 2017-02-20 10:09:44 +01:00
parent efa28e05f8
commit 0ee74f9c28
1 changed files with 15 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
client/rest-high-level/src/test/java/org/elasticsearch/client/CrudIT.java
View File

@ -49,16 +49,18 @@ public class CrudIT extends ESRestHighLevelClientTestCase {
public void testDelete() throws IOException { public void testDelete() throws IOException {
{ {
// Testing non existing document // Testing non existing document
DeleteRequest deleteRequest = new DeleteRequest("index", "type", "does_not_exist"); String docId = "does_not_exist";
DeleteRequest deleteRequest = new DeleteRequest("index", "type", docId);
DeleteResponse deleteResponse = execute(deleteRequest, highLevelClient()::delete, highLevelClient()::deleteAsync); DeleteResponse deleteResponse = execute(deleteRequest, highLevelClient()::delete, highLevelClient()::deleteAsync);
assertEquals("index", deleteResponse.getIndex()); assertEquals("index", deleteResponse.getIndex());
assertEquals("type", deleteResponse.getType()); assertEquals("type", deleteResponse.getType());
assertEquals("does_not_exist", deleteResponse.getId()); assertEquals(docId, deleteResponse.getId());
assertEquals(DocWriteResponse.Result.NOT_FOUND, deleteResponse.getResult()); assertEquals(DocWriteResponse.Result.NOT_FOUND, deleteResponse.getResult());
} }
{ {
// Testing deletion // Testing deletion
String docId = createSampleDocument(createSampleIndexRequest()); String docId = "id";
createSampleDocument(new IndexRequest("index", "type", docId).source(Collections.singletonMap("foo", "bar")));
DeleteRequest deleteRequest = new DeleteRequest("index", "type", docId); DeleteRequest deleteRequest = new DeleteRequest("index", "type", docId);
if (randomBoolean()) { if (randomBoolean()) {
deleteRequest.version(1L); deleteRequest.version(1L);
@ -71,7 +73,8 @@ public class CrudIT extends ESRestHighLevelClientTestCase {
} }
{ {
// Testing version conflict // Testing version conflict
String docId = createSampleDocument(createSampleIndexRequest()); String docId = "version_conflict";
createSampleDocument(new IndexRequest("index", "type", docId).source(Collections.singletonMap("foo", "bar")));
DeleteRequest deleteRequest = new DeleteRequest("index", "type", docId).version(2); DeleteRequest deleteRequest = new DeleteRequest("index", "type", docId).version(2);
ElasticsearchException exception = expectThrows(ElasticsearchException.class, ElasticsearchException exception = expectThrows(ElasticsearchException.class,
() -> execute(deleteRequest, highLevelClient()::delete, highLevelClient()::deleteAsync)); () -> execute(deleteRequest, highLevelClient()::delete, highLevelClient()::deleteAsync));
@ -83,8 +86,8 @@ public class CrudIT extends ESRestHighLevelClientTestCase {
} }
{ {
// Testing version type // Testing version type
String docId = createSampleDocument(createSampleIndexRequest() String docId = "version_type";
.id(randomAsciiOfLength(15)) createSampleDocument(new IndexRequest("index", "type", docId).source(Collections.singletonMap("foo", "bar"))
.versionType(VersionType.EXTERNAL).version(12)); .versionType(VersionType.EXTERNAL).version(12));
DeleteRequest deleteRequest = new DeleteRequest("index", "type", docId).versionType(VersionType.EXTERNAL).version(13); DeleteRequest deleteRequest = new DeleteRequest("index", "type", docId).versionType(VersionType.EXTERNAL).version(13);
DeleteResponse deleteResponse = execute(deleteRequest, highLevelClient()::delete, highLevelClient()::deleteAsync); DeleteResponse deleteResponse = execute(deleteRequest, highLevelClient()::delete, highLevelClient()::deleteAsync);
@ -95,8 +98,8 @@ public class CrudIT extends ESRestHighLevelClientTestCase {
} }
{ {
// Testing version type with a wrong version // Testing version type with a wrong version
String docId = createSampleDocument(createSampleIndexRequest() String docId = "wrong_version";
.id(randomAsciiOfLength(15)) createSampleDocument(new IndexRequest("index", "type", docId).source(Collections.singletonMap("foo", "bar"))
.versionType(VersionType.EXTERNAL).version(12)); .versionType(VersionType.EXTERNAL).version(12));
ElasticsearchStatusException exception = expectThrows(ElasticsearchStatusException.class, () -> { ElasticsearchStatusException exception = expectThrows(ElasticsearchStatusException.class, () -> {
DeleteRequest deleteRequest = new DeleteRequest("index", "type", docId).versionType(VersionType.EXTERNAL).version(10); DeleteRequest deleteRequest = new DeleteRequest("index", "type", docId).versionType(VersionType.EXTERNAL).version(10);
@ -109,7 +112,8 @@ public class CrudIT extends ESRestHighLevelClientTestCase {
} }
{ {
// Testing routing // Testing routing
String docId = createSampleDocument(createSampleIndexRequest().routing("foo")); String docId = "routing";
createSampleDocument(new IndexRequest("index", "type", docId).source(Collections.singletonMap("foo", "bar")).routing("foo"));
DeleteRequest deleteRequest = new DeleteRequest("index", "type", docId).routing("foo"); DeleteRequest deleteRequest = new DeleteRequest("index", "type", docId).routing("foo");
DeleteResponse deleteResponse = execute(deleteRequest, highLevelClient()::delete, highLevelClient()::deleteAsync); DeleteResponse deleteResponse = execute(deleteRequest, highLevelClient()::delete, highLevelClient()::deleteAsync);
assertEquals("index", deleteResponse.getIndex()); assertEquals("index", deleteResponse.getIndex());
@ -342,25 +346,12 @@ public class CrudIT extends ESRestHighLevelClientTestCase {
} }
/** /**
* @return A sample index request * Index a document
* @throws IOException If problem when generating the content
*/
private IndexRequest createSampleIndexRequest() throws IOException {
final XContentType xContentType = randomFrom(XContentType.values());
IndexRequest indexRequest = new IndexRequest("index", "type");
indexRequest.source(XContentBuilder.builder(xContentType.xContent()).startObject().field("test", "test").endObject());
return indexRequest;
}
/**
* Executes an index request and returns the document _id
* @param request index request * @param request index request
* @return the document _id
* @throws IOException if something goes wrong while executing the index request * @throws IOException if something goes wrong while executing the index request
*/ */
private String createSampleDocument(IndexRequest request) throws IOException { private void createSampleDocument(IndexRequest request) throws IOException {
IndexResponse indexResponse = execute(request, highLevelClient()::index, highLevelClient()::indexAsync); IndexResponse indexResponse = execute(request, highLevelClient()::index, highLevelClient()::indexAsync);
assertEquals(RestStatus.CREATED, indexResponse.status()); assertEquals(RestStatus.CREATED, indexResponse.status());
return indexResponse.getId();
} }
} }