From ebdfe3991fe1a0cb8ffd7ccf809ce2c467028721 Mon Sep 17 00:00:00 2001 From: pengys5 <8082209@qq.com> Date: Tue, 11 Apr 2017 19:30:08 +0800 Subject: [PATCH] fix index testcase bug --- .../worker/storage/AbstractIndexTestCase.java | 2 +- .../worker/storage/IndexCreatorTestCase.java | 62 ++++++++++++++++--- 2 files changed, 54 insertions(+), 10 deletions(-) diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/storage/AbstractIndexTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/storage/AbstractIndexTestCase.java index f53a8abf68..47f20a1c66 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/storage/AbstractIndexTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/storage/AbstractIndexTestCase.java @@ -22,7 +22,7 @@ public class AbstractIndexTestCase { @Test public void testCreateSettingBuilder() throws IOException { IndexTest indexTest = new IndexTest(); - Assert.assertEquals("{\"index.number_of_shards\":null,\"index.number_of_replicas\":null}", indexTest.createSettingBuilder().string()); + Assert.assertEquals("{\"index.number_of_shards\":\"\",\"index.number_of_replicas\":\"\"}", indexTest.createSettingBuilder().string()); } class IndexTest extends AbstractIndex { diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/storage/IndexCreatorTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/storage/IndexCreatorTestCase.java index f4c64e100e..1c4bb329f1 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/storage/IndexCreatorTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/storage/IndexCreatorTestCase.java @@ -1,8 +1,10 @@ package com.a.eye.skywalking.collector.worker.storage; +import com.a.eye.skywalking.collector.worker.config.EsConfig; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentFactory; import org.junit.Assert; +import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mockito; @@ -25,6 +27,21 @@ import static org.powermock.api.mockito.PowerMockito.*; @PowerMockIgnore({"javax.management.*"}) public class IndexCreatorTestCase { + private IndexCreator indexCreator; + private TestIndex testIndex; + + @Before + public void init() throws Exception { + testIndex = mock(TestIndex.class); + + indexCreator = mock(IndexCreator.class); + doCallRealMethod().when(indexCreator).create(); + + Set indexSet = new HashSet<>(); + indexSet.add(testIndex); + when(indexCreator, "loadIndex").thenReturn(indexSet); + } + @Test public void testLoadIndex() throws Exception { IndexCreator indexCreator = spy(IndexCreator.INSTANCE); @@ -47,20 +64,47 @@ public class IndexCreatorTestCase { } @Test - public void testCreate() throws Exception { - TestIndex testIndex = mock(TestIndex.class); - - IndexCreator indexCreator = mock(IndexCreator.class); - doCallRealMethod().when(indexCreator).create(); + public void testCreateOptionOff() throws Exception { + EsConfig.Es.Index.create = EsConfig.Create_Off; + indexCreator.create(); + Mockito.verify(testIndex, Mockito.never()).createIndex(); + Mockito.verify(testIndex, Mockito.never()).deleteIndex(); + } - Set indexSet = new HashSet<>(); - indexSet.add(testIndex); + @Test + public void testCreateOptionOverWriteIndexIsExists() throws Exception { + EsConfig.Es.Index.create = EsConfig.Create_Overwrite; + when(testIndex.isExists()).thenReturn(true); + indexCreator.create(); + Mockito.verify(testIndex).createIndex(); + Mockito.verify(testIndex).deleteIndex(); + } - when(indexCreator, "loadIndex").thenReturn(indexSet); + @Test + public void testCreateOptionOverWriteIndexNotExists() throws Exception { + EsConfig.Es.Index.create = EsConfig.Create_Overwrite; + when(testIndex.isExists()).thenReturn(false); + indexCreator.create(); + Mockito.verify(testIndex).createIndex(); + Mockito.verify(testIndex, Mockito.never()).deleteIndex(); + } + @Test + public void testCreateOptionIgnoreIndexNotExists() throws Exception { + EsConfig.Es.Index.create = EsConfig.Create_Ignore; + when(testIndex.isExists()).thenReturn(false); indexCreator.create(); Mockito.verify(testIndex).createIndex(); - Mockito.verify(testIndex).deleteIndex(); + Mockito.verify(testIndex, Mockito.never()).deleteIndex(); + } + + @Test + public void testCreateOptionIgnoreIndexExists() throws Exception { + EsConfig.Es.Index.create = EsConfig.Create_Ignore; + when(testIndex.isExists()).thenReturn(true); + indexCreator.create(); + Mockito.verify(testIndex, Mockito.never()).createIndex(); + Mockito.verify(testIndex, Mockito.never()).deleteIndex(); } class TestIndex extends AbstractIndex { -- GitLab