github
/
halo
mirror of https://github.com/halo-dev/halo
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix test errors

pull/147/head
johnniang 2019-05-09 00:47:32 +08:00
parent 4255fc715e
commit 3738b7adde
2 changed files with 15 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/test/java/run/halo/app/event/LogEventListenerTest.java
View File

@ -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()));
}
}

20
src/test/java/run/halo/app/service/impl/OptionServiceImplTest.java
View File

@ -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()));