From af97fdb7d4c77d8e264921fc7c7462bca9a4f5e0 Mon Sep 17 00:00:00 2001 From: Mohsin Husen Date: Thu, 16 May 2013 10:38:04 +0100 Subject: [PATCH] Test cases clean up round 1 --- .../data/elasticsearch/NestedObjectTests.java | 14 ++++++ .../core/ElasticsearchTemplateTests.java | 44 +++---------------- .../core/query/CriteriaQueryTests.java | 5 +-- .../CustomMethodRepositoryTests.java | 6 +-- .../SimpleElasticsearchRepositoryTests.java | 16 +++++-- 5 files changed, 34 insertions(+), 51 deletions(-) diff --git a/src/test/java/org/springframework/data/elasticsearch/NestedObjectTests.java b/src/test/java/org/springframework/data/elasticsearch/NestedObjectTests.java index ad949eed8..3a6756922 100644 --- a/src/test/java/org/springframework/data/elasticsearch/NestedObjectTests.java +++ b/src/test/java/org/springframework/data/elasticsearch/NestedObjectTests.java @@ -15,8 +15,11 @@ */ package org.springframework.data.elasticsearch; +import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.elasticsearch.core.ElasticsearchTemplate; import org.springframework.data.elasticsearch.repositories.SampleElasticSearchBookRepository; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -39,6 +42,17 @@ public class NestedObjectTests { @Resource private SampleElasticSearchBookRepository repository; + @Autowired + private ElasticsearchTemplate elasticsearchTemplate; + + + @Before + public void before() { + elasticsearchTemplate.deleteIndex(Book.class); + elasticsearchTemplate.createIndex(Book.class); + elasticsearchTemplate.refresh(Book.class, true); + } + @Test public void shouldIndexNestedObject() { // given diff --git a/src/test/java/org/springframework/data/elasticsearch/core/ElasticsearchTemplateTests.java b/src/test/java/org/springframework/data/elasticsearch/core/ElasticsearchTemplateTests.java index bd4001bec..2ce114305 100644 --- a/src/test/java/org/springframework/data/elasticsearch/core/ElasticsearchTemplateTests.java +++ b/src/test/java/org/springframework/data/elasticsearch/core/ElasticsearchTemplateTests.java @@ -58,10 +58,8 @@ public class ElasticsearchTemplateTests { @Before public void before() { + elasticsearchTemplate.deleteIndex(SampleEntity.class); elasticsearchTemplate.createIndex(SampleEntity.class); - DeleteQuery deleteQuery = new DeleteQuery(); - deleteQuery.setQuery(matchAllQuery()); - elasticsearchTemplate.delete(deleteQuery, SampleEntity.class); elasticsearchTemplate.refresh(SampleEntity.class, true); } @@ -529,33 +527,7 @@ public class ElasticsearchTemplateTests { @Test public void shouldReturnResultsWithScanAndScroll() { - // given - List indexQueries = new ArrayList(); - // first document - String documentId = randomNumeric(5); - SampleEntity sampleEntity1 = new SampleEntity(); - sampleEntity1.setId(documentId); - sampleEntity1.setMessage("some message"); - sampleEntity1.setVersion(System.currentTimeMillis()); - - IndexQuery indexQuery1 = new IndexQuery(); - indexQuery1.setId(documentId); - indexQuery1.setObject(sampleEntity1); - indexQueries.add(indexQuery1); - - // second document - String documentId2 = randomNumeric(5); - SampleEntity sampleEntity2 = new SampleEntity(); - sampleEntity2.setId(documentId2); - sampleEntity2.setMessage("some message"); - sampleEntity2.setVersion(System.currentTimeMillis()); - - IndexQuery indexQuery2 = new IndexQuery(); - indexQuery2.setId(documentId2); - indexQuery2.setObject(sampleEntity2); - - indexQueries.add(indexQuery2); - + //given List entities = createSampleEntitiesWithMessage("Test message", 30); // when elasticsearchTemplate.bulkIndex(entities); @@ -601,7 +573,6 @@ public class ElasticsearchTemplateTests { } private static List createSampleEntitiesWithMessage(String message, int numberOfEntities) { - List sampleEntities = new ArrayList(); List indexQueries = new ArrayList(); for (int i = 0; i < numberOfEntities; i++) { String documentId = randomNumeric(5); @@ -610,13 +581,10 @@ public class ElasticsearchTemplateTests { sampleEntity.setMessage(message); sampleEntity.setRate(2); sampleEntity.setVersion(System.currentTimeMillis()); - IndexQuery indexQuery2 = new IndexQuery(); - indexQuery2.setId(documentId); - indexQuery2.setObject(sampleEntity); - - indexQueries.add(indexQuery2); - sampleEntities.add(sampleEntity); - + IndexQuery indexQuery = new IndexQuery(); + indexQuery.setId(documentId); + indexQuery.setObject(sampleEntity); + indexQueries.add(indexQuery); } return indexQueries; } diff --git a/src/test/java/org/springframework/data/elasticsearch/core/query/CriteriaQueryTests.java b/src/test/java/org/springframework/data/elasticsearch/core/query/CriteriaQueryTests.java index c7459e405..36c6af8d2 100644 --- a/src/test/java/org/springframework/data/elasticsearch/core/query/CriteriaQueryTests.java +++ b/src/test/java/org/springframework/data/elasticsearch/core/query/CriteriaQueryTests.java @@ -29,7 +29,6 @@ import java.util.ArrayList; import java.util.List; import static org.apache.commons.lang.RandomStringUtils.randomNumeric; -import static org.elasticsearch.index.query.QueryBuilders.matchAllQuery; import static org.hamcrest.Matchers.*; import static org.junit.Assert.*; @@ -46,10 +45,8 @@ public class CriteriaQueryTests { @Before public void before() { + elasticsearchTemplate.deleteIndex(SampleEntity.class); elasticsearchTemplate.createIndex(SampleEntity.class); - DeleteQuery deleteQuery = new DeleteQuery(); - deleteQuery.setQuery(matchAllQuery()); - elasticsearchTemplate.delete(deleteQuery, SampleEntity.class); elasticsearchTemplate.refresh(SampleEntity.class, true); } diff --git a/src/test/java/org/springframework/data/elasticsearch/repositories/CustomMethodRepositoryTests.java b/src/test/java/org/springframework/data/elasticsearch/repositories/CustomMethodRepositoryTests.java index 2c70a0983..1ae94bc99 100644 --- a/src/test/java/org/springframework/data/elasticsearch/repositories/CustomMethodRepositoryTests.java +++ b/src/test/java/org/springframework/data/elasticsearch/repositories/CustomMethodRepositoryTests.java @@ -24,7 +24,6 @@ import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Sort; import org.springframework.data.elasticsearch.SampleEntity; import org.springframework.data.elasticsearch.core.ElasticsearchTemplate; -import org.springframework.data.elasticsearch.core.query.DeleteQuery; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -34,7 +33,6 @@ import java.util.List; import static org.apache.commons.lang.RandomStringUtils.random; import static org.apache.commons.lang.RandomStringUtils.randomNumeric; -import static org.elasticsearch.index.query.QueryBuilders.matchAllQuery; import static org.hamcrest.Matchers.*; import static org.junit.Assert.assertThat; @@ -54,10 +52,8 @@ public class CustomMethodRepositoryTests { @Before public void before() { + elasticsearchTemplate.deleteIndex(SampleEntity.class); elasticsearchTemplate.createIndex(SampleEntity.class); - DeleteQuery deleteQuery = new DeleteQuery(); - deleteQuery.setQuery(matchAllQuery()); - elasticsearchTemplate.delete(deleteQuery, SampleEntity.class); elasticsearchTemplate.refresh(SampleEntity.class, true); } diff --git a/src/test/java/org/springframework/data/elasticsearch/repository/support/SimpleElasticsearchRepositoryTests.java b/src/test/java/org/springframework/data/elasticsearch/repository/support/SimpleElasticsearchRepositoryTests.java index f148d472f..e109c5e57 100644 --- a/src/test/java/org/springframework/data/elasticsearch/repository/support/SimpleElasticsearchRepositoryTests.java +++ b/src/test/java/org/springframework/data/elasticsearch/repository/support/SimpleElasticsearchRepositoryTests.java @@ -19,10 +19,12 @@ import org.junit.Before; import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Sort; import org.springframework.data.elasticsearch.SampleEntity; +import org.springframework.data.elasticsearch.core.ElasticsearchTemplate; import org.springframework.data.elasticsearch.core.query.NativeSearchQueryBuilder; import org.springframework.data.elasticsearch.core.query.SearchQuery; import org.springframework.data.elasticsearch.repositories.SampleElasticsearchRepository; @@ -51,10 +53,16 @@ public class SimpleElasticsearchRepositoryTests { @Resource private SampleElasticsearchRepository repository; - @Before - public void before() { - repository.deleteAll(); - } + @Autowired + private ElasticsearchTemplate elasticsearchTemplate; + + + @Before + public void before() { + elasticsearchTemplate.deleteIndex(SampleEntity.class); + elasticsearchTemplate.createIndex(SampleEntity.class); + elasticsearchTemplate.refresh(SampleEntity.class, true); + } @Test public void shouldDoBulkIndexDocument() {