Cwikius-Spring/spring-data-elasticsearch
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-data-elasticsearch.git synced 2025-06-24 04:52:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

DATAES-163 - Modified tests to work with new version of spring-data-elasticsearch base on ES2.x

Browse Source
This commit is contained in:
Artur Konczak 2016-03-31 15:11:15 +01:00
parent 063d8ed983
commit 53b587101d
2 changed files with 16 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/test/java/org/springframework/data/elasticsearch/entities/SampleEntityUUIDKeyed.java
View File

@ -15,10 +15,9 @@
*/ */
package org.springframework.data.elasticsearch.entities; package org.springframework.data.elasticsearch.entities;
import lombok.*;
import java.util.UUID; import java.util.UUID;
import lombok.*;
import org.springframework.data.annotation.Id; import org.springframework.data.annotation.Id;
import org.springframework.data.annotation.Version; import org.springframework.data.annotation.Version;
import org.springframework.data.elasticsearch.annotations.Document; import org.springframework.data.elasticsearch.annotations.Document;
@ -36,7 +35,7 @@ import org.springframework.data.elasticsearch.core.geo.GeoPoint;
@NoArgsConstructor @NoArgsConstructor
@AllArgsConstructor @AllArgsConstructor
@Builder @Builder
@Document(indexName = "test-index-uuid-keyed", type = "test-type-uuid-keyed", indexStoreType = "memory", shards = 1, replicas = 0, refreshInterval = "-1") @Document(indexName = "test-index-uuid-keyed", type = "test-type-uuid-keyed", shards = 1, replicas = 0, refreshInterval = "-1")
public class SampleEntityUUIDKeyed { public class SampleEntityUUIDKeyed {
@Id @Id

35
src/test/java/org/springframework/data/elasticsearch/repository/support/UUIDElasticsearchRepositoryTests.java
View File

@ -15,23 +15,12 @@
*/ */
package org.springframework.data.elasticsearch.repository.support; package org.springframework.data.elasticsearch.repository.support;
import static org.elasticsearch.index.query.QueryBuilders.matchAllQuery; import static org.elasticsearch.index.query.QueryBuilders.*;
import static org.elasticsearch.index.query.QueryBuilders.termQuery; import static org.hamcrest.Matchers.*;
import static org.hamcrest.Matchers.equalTo; import static org.junit.Assert.*;
import static org.hamcrest.Matchers.greaterThanOrEqualTo;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.notNullValue;
import static org.hamcrest.Matchers.nullValue;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertThat;
import java.util.ArrayList; import java.util.*;
import java.util.Arrays;
import java.util.List;
import java.util.UUID;
import org.elasticsearch.common.collect.Lists;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
@ -68,8 +57,8 @@ public class UUIDElasticsearchRepositoryTests {
public void before() { public void before() {
elasticsearchTemplate.deleteIndex(SampleEntityUUIDKeyed.class); elasticsearchTemplate.deleteIndex(SampleEntityUUIDKeyed.class);
elasticsearchTemplate.createIndex(SampleEntityUUIDKeyed.class); elasticsearchTemplate.createIndex(SampleEntityUUIDKeyed.class);
elasticsearchTemplate.putMapping(SampleEntityUUIDKeyed.class); elasticsearchTemplate.putMapping(SampleEntityUUIDKeyed.class);
elasticsearchTemplate.refresh(SampleEntityUUIDKeyed.class, true); elasticsearchTemplate.refresh(SampleEntityUUIDKeyed.class);
} }
@Test @Test
@ -222,12 +211,13 @@ public class UUIDElasticsearchRepositoryTests {
repository.save(sampleEntityUUIDKeyed2); repository.save(sampleEntityUUIDKeyed2);
// when // when
Iterable<SampleEntityUUIDKeyed> sampleEntities = repository.findAll(Arrays.asList(documentId, documentId2)); LinkedList<SampleEntityUUIDKeyed> sampleEntities = (LinkedList<SampleEntityUUIDKeyed>) repository.findAll(Arrays.asList(documentId, documentId2));
// then // then
assertNotNull("sample entities cant be null..", sampleEntities); assertNotNull("sample entities cant be null..", sampleEntities);
List<SampleEntityUUIDKeyed> entities = Lists.newArrayList(sampleEntities); assertThat(sampleEntities.size(), is(2));
assertThat(entities.size(), is(2)); assertThat(sampleEntities.get(0).getId(), isIn(Arrays.asList(documentId, documentId2)));
assertThat(sampleEntities.get(1).getId(), isIn(Arrays.asList(documentId, documentId2)));
} }
@Test @Test
@ -324,6 +314,7 @@ public class UUIDElasticsearchRepositoryTests {
repository.save(Arrays.asList(sampleEntityUUIDKeyed1, sampleEntityUUIDKeyed2, sampleEntityUUIDKeyed3)); repository.save(Arrays.asList(sampleEntityUUIDKeyed1, sampleEntityUUIDKeyed2, sampleEntityUUIDKeyed3));
// when // when
List<SampleEntityUUIDKeyed> result = repository.deleteByAvailable(true); List<SampleEntityUUIDKeyed> result = repository.deleteByAvailable(true);
repository.refresh();
// then // then
assertThat(result.size(), equalTo(2)); assertThat(result.size(), equalTo(2));
SearchQuery searchQuery = new NativeSearchQueryBuilder().withQuery(matchAllQuery()).build(); SearchQuery searchQuery = new NativeSearchQueryBuilder().withQuery(matchAllQuery()).build();
@ -354,6 +345,7 @@ public class UUIDElasticsearchRepositoryTests {
repository.save(Arrays.asList(sampleEntityUUIDKeyed1, sampleEntityUUIDKeyed2, sampleEntityUUIDKeyed3)); repository.save(Arrays.asList(sampleEntityUUIDKeyed1, sampleEntityUUIDKeyed2, sampleEntityUUIDKeyed3));
// when // when
List<SampleEntityUUIDKeyed> result = repository.deleteByMessage("hello world 3"); List<SampleEntityUUIDKeyed> result = repository.deleteByMessage("hello world 3");
repository.refresh();
// then // then
assertThat(result.size(), equalTo(1)); assertThat(result.size(), equalTo(1));
SearchQuery searchQuery = new NativeSearchQueryBuilder().withQuery(matchAllQuery()).build(); SearchQuery searchQuery = new NativeSearchQueryBuilder().withQuery(matchAllQuery()).build();
@ -384,6 +376,7 @@ public class UUIDElasticsearchRepositoryTests {
repository.save(Arrays.asList(sampleEntityUUIDKeyed1, sampleEntityUUIDKeyed2, sampleEntityUUIDKeyed3)); repository.save(Arrays.asList(sampleEntityUUIDKeyed1, sampleEntityUUIDKeyed2, sampleEntityUUIDKeyed3));
// when // when
repository.deleteByType("article"); repository.deleteByType("article");
repository.refresh();
// then // then
SearchQuery searchQuery = new NativeSearchQueryBuilder().withQuery(matchAllQuery()).build(); SearchQuery searchQuery = new NativeSearchQueryBuilder().withQuery(matchAllQuery()).build();
Page<SampleEntityUUIDKeyed> sampleEntities = repository.search(searchQuery); Page<SampleEntityUUIDKeyed> sampleEntities = repository.search(searchQuery);
@ -391,7 +384,6 @@ public class UUIDElasticsearchRepositoryTests {
} }
@Test @Test
public void shouldDeleteEntity() { public void shouldDeleteEntity() {
// given // given
@ -403,6 +395,7 @@ public class UUIDElasticsearchRepositoryTests {
repository.save(sampleEntityUUIDKeyed); repository.save(sampleEntityUUIDKeyed);
// when // when
repository.delete(sampleEntityUUIDKeyed); repository.delete(sampleEntityUUIDKeyed);
repository.refresh();
// then // then
SearchQuery searchQuery = new NativeSearchQueryBuilder().withQuery(termQuery("id", documentId)).build(); SearchQuery searchQuery = new NativeSearchQueryBuilder().withQuery(termQuery("id", documentId)).build();
Page<SampleEntityUUIDKeyed> sampleEntities = repository.search(searchQuery); Page<SampleEntityUUIDKeyed> sampleEntities = repository.search(searchQuery);