From 54c897be0bd9691a547ce7bdedc785f1002ac1e5 Mon Sep 17 00:00:00 2001 From: Mohsin Husen Date: Wed, 15 May 2013 18:16:46 +0100 Subject: [PATCH] Clean up : Updated Tests which was causing build failure --- .../support/DoubleIDRepositoryTests.java | 10 +++++++++- .../support/IntegerIDRepositoryTests.java | 17 +++++++++++++---- 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/src/test/java/org/springframework/data/elasticsearch/repository/support/DoubleIDRepositoryTests.java b/src/test/java/org/springframework/data/elasticsearch/repository/support/DoubleIDRepositoryTests.java index 355d5519e..f2772e6d5 100644 --- a/src/test/java/org/springframework/data/elasticsearch/repository/support/DoubleIDRepositoryTests.java +++ b/src/test/java/org/springframework/data/elasticsearch/repository/support/DoubleIDRepositoryTests.java @@ -19,7 +19,9 @@ import org.apache.commons.lang.math.RandomUtils; 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.DoubleIDEntity; +import org.springframework.data.elasticsearch.core.ElasticsearchTemplate; import org.springframework.data.elasticsearch.repositories.DoubleIDRepository; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -41,9 +43,15 @@ public class DoubleIDRepositoryTests { @Resource private DoubleIDRepository repository; + @Autowired + private ElasticsearchTemplate elasticsearchTemplate; + + @Before public void before() { - repository.deleteAll(); + elasticsearchTemplate.deleteIndex(DoubleIDEntity.class); + elasticsearchTemplate.createIndex(DoubleIDEntity.class); + elasticsearchTemplate.refresh(DoubleIDEntity.class, true); } @Test diff --git a/src/test/java/org/springframework/data/elasticsearch/repository/support/IntegerIDRepositoryTests.java b/src/test/java/org/springframework/data/elasticsearch/repository/support/IntegerIDRepositoryTests.java index f5013c67b..cadb9ff78 100644 --- a/src/test/java/org/springframework/data/elasticsearch/repository/support/IntegerIDRepositoryTests.java +++ b/src/test/java/org/springframework/data/elasticsearch/repository/support/IntegerIDRepositoryTests.java @@ -19,7 +19,10 @@ import org.apache.commons.lang.math.RandomUtils; 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.DoubleIDEntity; import org.springframework.data.elasticsearch.IntegerIDEntity; +import org.springframework.data.elasticsearch.core.ElasticsearchTemplate; import org.springframework.data.elasticsearch.repositories.IntegerIDRepository; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -41,10 +44,16 @@ public class IntegerIDRepositoryTests { @Resource private IntegerIDRepository repository; - @Before - public void before() { - repository.deleteAll(); - } + @Autowired + private ElasticsearchTemplate elasticsearchTemplate; + + + @Before + public void before() { + elasticsearchTemplate.deleteIndex(IntegerIDEntity.class); + elasticsearchTemplate.createIndex(IntegerIDEntity.class); + elasticsearchTemplate.refresh(IntegerIDEntity.class, true); + } @Test public void shouldDoBulkIndexDocument() {