From 3738b7addec1ed2dffa3034b0b68795a39fa8a56 Mon Sep 17 00:00:00 2001
From: johnniang <johnniang@riseup.net>
Date: Thu, 9 May 2019 00:47:32 +0800
Subject: [PATCH] Fix test errors

---
 .../halo/app/event/LogEventListenerTest.java  | 33 -------------------
 .../service/impl/OptionServiceImplTest.java   | 20 ++++++++---
 2 files changed, 15 insertions(+), 38 deletions(-)
 delete mode 100644 src/test/java/run/halo/app/event/LogEventListenerTest.java

diff --git a/src/test/java/run/halo/app/event/LogEventListenerTest.java b/src/test/java/run/halo/app/event/LogEventListenerTest.java
deleted file mode 100644
index 45bc218c6..000000000
--- a/src/test/java/run/halo/app/event/LogEventListenerTest.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package run.halo.app.event;
-
-import lombok.extern.slf4j.Slf4j;
-import org.junit.Test;
-import org.springframework.context.ApplicationListener;
-import run.halo.app.event.logger.LogEvent;
-import run.halo.app.event.logger.LogEventListener;
-import run.halo.app.utils.ReflectionUtils;
-
-import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Type;
-import java.util.Objects;
-
-import static org.hamcrest.Matchers.equalTo;
-import static org.junit.Assert.*;
-
-/**
- * Log event listener test.
- *
- * @author johnniang
- * @date 19-4-21
- */
-@Slf4j
-public class LogEventListenerTest {
-
-    @Test
-    public void getGenericTypeTest() {
-        ParameterizedType parameterizedType = ReflectionUtils.getParameterizedType(ApplicationListener.class, LogEventListener.class);
-        Type[] actualTypeArguments = Objects.requireNonNull(parameterizedType).getActualTypeArguments();
-        Type actualTypeArgument = actualTypeArguments[0];
-        assertThat(actualTypeArgument.getTypeName(), equalTo(LogEvent.class.getTypeName()));
-    }
-}
\ No newline at end of file
diff --git a/src/test/java/run/halo/app/service/impl/OptionServiceImplTest.java b/src/test/java/run/halo/app/service/impl/OptionServiceImplTest.java
index 88a3e44b1..834e0a8d6 100644
--- a/src/test/java/run/halo/app/service/impl/OptionServiceImplTest.java
+++ b/src/test/java/run/halo/app/service/impl/OptionServiceImplTest.java
@@ -1,15 +1,19 @@
 package run.halo.app.service.impl;
 
-import run.halo.app.model.entity.Option;
-import run.halo.app.model.properties.QnYunProperties;
-import run.halo.app.repository.OptionRepository;
 import com.qiniu.common.Zone;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
+import run.halo.app.cache.StringCacheStore;
+import run.halo.app.model.entity.Option;
+import run.halo.app.model.properties.QnYunProperties;
+import run.halo.app.repository.OptionRepository;
+import run.halo.app.service.OptionService;
 
+import java.util.HashMap;
+import java.util.Map;
 import java.util.Optional;
 
 import static org.hamcrest.Matchers.equalTo;
@@ -30,6 +34,9 @@ public class OptionServiceImplTest {
     @Mock
     private OptionRepository optionRepository;
 
+    @Mock
+    private StringCacheStore cacheStore;
+
     @InjectMocks
     private OptionServiceImpl optionService;
 
@@ -76,13 +83,16 @@ public class OptionServiceImplTest {
         QnYunProperties zoneProperty = QnYunProperties.ZONE;
 
         // Given
-        given(optionRepository.findByKey(zoneProperty.getValue())).willReturn(Optional.ofNullable(option));
+//        given(optionRepository.findByKey(zoneProperty.getValue())).willReturn(Optional.ofNullable(option));
+        Map<String, Object> optionMap = new HashMap<>(1);
+        optionMap.put(zoneProperty.getValue(), Optional.ofNullable(option).map(Option::getValue).orElse(null));
+        given(cacheStore.getAny(OptionService.OPTIONS_KEY, Map.class)).willReturn(Optional.of(optionMap));
 
         // When
         Zone zone = optionService.getQnYunZone();
 
         // Then
-        then(optionRepository).should().findByKey(zoneProperty.getValue());
+        then(cacheStore).should().getAny(OptionService.OPTIONS_KEY, Map.class);
 
         assertNotNull(zone);
         assertThat(zone.getRegion(), equalTo(actualZone.getRegion()));