Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polish mockito usage

Browse Source 
Consistent use of BDDMockito rather than standard Mockito.
This commit is contained in:
Phillip Webb
2014-08-11 11:17:46 -07:00
parent 4db258b9e3
commit ac8326d2df
37 changed files with 317 additions and 354 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
spring-context/src/test/java/org/springframework/cache/interceptor/CacheErrorHandlerTests.java vendored
View File

@@ -16,10 +16,6 @@
package org.springframework.cache.interceptor;
import static org.hamcrest.CoreMatchers.*;
import static org.junit.Assert.*;
import static org.mockito.BDDMockito.*;
import java.util.Arrays;
import java.util.concurrent.atomic.AtomicLong;
@@ -27,7 +23,6 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
import org.springframework.cache.Cache;
import org.springframework.cache.CacheManager;
import org.springframework.cache.annotation.CacheConfig;
@@ -42,6 +37,10 @@ import org.springframework.context.annotation.AnnotationConfigApplicationContext
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import static org.hamcrest.CoreMatchers.*;
import static org.junit.Assert.*;
import static org.mockito.BDDMockito.*;
/**
*
* @author Stephane Nicoll
@@ -71,7 +70,7 @@ public class CacheErrorHandlerTests {
@Test
public void getFail() {
UnsupportedOperationException exception = new UnsupportedOperationException("Test exception on get");
doThrow(exception).when(cache).get(0L);
willThrow(exception).given(cache).get(0L);
Object result = this.simpleService.get(0L);
verify(errorHandler).handleCacheGetError(exception, cache, 0L);
@@ -82,12 +81,12 @@ public class CacheErrorHandlerTests {
@Test
public void getAndPutFail() {
UnsupportedOperationException exception = new UnsupportedOperationException("Test exception on get");
doThrow(exception).when(cache).get(0L);
doThrow(exception).when(cache).put(0L, 0L); // Update of the cache will fail as well
willThrow(exception).given(cache).get(0L);
willThrow(exception).given(cache).put(0L, 0L); // Update of the cache will fail as well
Object counter = this.simpleService.get(0L);
doReturn(new SimpleValueWrapper(2L)).when(cache).get(0L);
willReturn(new SimpleValueWrapper(2L)).given(cache).get(0L);
Object counter2 = this.simpleService.get(0L);
Object counter3 = this.simpleService.get(0L);
assertNotSame(counter, counter2);
@@ -97,7 +96,7 @@ public class CacheErrorHandlerTests {
@Test
public void getFailProperException() {
UnsupportedOperationException exception = new UnsupportedOperationException("Test exception on get");
doThrow(exception).when(cache).get(0L);
willThrow(exception).given(cache).get(0L);
cacheInterceptor.setErrorHandler(new SimpleCacheErrorHandler());
@@ -108,7 +107,7 @@ public class CacheErrorHandlerTests {
@Test
public void putFail() {
UnsupportedOperationException exception = new UnsupportedOperationException("Test exception on put");
doThrow(exception).when(cache).put(0L, 0L);
willThrow(exception).given(cache).put(0L, 0L);
this.simpleService.put(0L);
verify(errorHandler).handleCachePutError(exception, cache, 0L, 0L);
@@ -117,7 +116,7 @@ public class CacheErrorHandlerTests {
@Test
public void putFailProperException() {
UnsupportedOperationException exception = new UnsupportedOperationException("Test exception on put");
doThrow(exception).when(cache).put(0L, 0L);
willThrow(exception).given(cache).put(0L, 0L);
cacheInterceptor.setErrorHandler(new SimpleCacheErrorHandler());
@@ -128,7 +127,7 @@ public class CacheErrorHandlerTests {
@Test
public void evictFail() {
UnsupportedOperationException exception = new UnsupportedOperationException("Test exception on evict");
doThrow(exception).when(cache).evict(0L);
willThrow(exception).given(cache).evict(0L);
this.simpleService.evict(0L);
verify(errorHandler).handleCacheEvictError(exception, cache, 0L);
@@ -137,7 +136,7 @@ public class CacheErrorHandlerTests {
@Test
public void evictFailProperException() {
UnsupportedOperationException exception = new UnsupportedOperationException("Test exception on evict");
doThrow(exception).when(cache).evict(0L);
willThrow(exception).given(cache).evict(0L);
cacheInterceptor.setErrorHandler(new SimpleCacheErrorHandler());
@@ -148,7 +147,7 @@ public class CacheErrorHandlerTests {
@Test
public void clearFail() {
UnsupportedOperationException exception = new UnsupportedOperationException("Test exception on evict");
doThrow(exception).when(cache).clear();
willThrow(exception).given(cache).clear();
this.simpleService.clear();
verify(errorHandler).handleCacheClearError(exception, cache);
@@ -157,7 +156,7 @@ public class CacheErrorHandlerTests {
@Test
public void clearFailProperException() {
UnsupportedOperationException exception = new UnsupportedOperationException("Test exception on evict");
doThrow(exception).when(cache).clear();
willThrow(exception).given(cache).clear();
cacheInterceptor.setErrorHandler(new SimpleCacheErrorHandler());

5
spring-context/src/test/java/org/springframework/context/event/ApplicationContextEventTests.java
View File

@@ -22,7 +22,6 @@ import java.util.concurrent.Executor;
import org.aopalliance.intercept.MethodInvocation;
import org.junit.Test;
import org.springframework.aop.framework.ProxyFactory;
import org.springframework.beans.factory.config.RuntimeBeanReference;
import org.springframework.beans.factory.support.RootBeanDefinition;
@@ -91,7 +90,7 @@ public class ApplicationContextEventTests {
smc.addApplicationListener(listener);
RuntimeException thrown = new RuntimeException();
doThrow(thrown).when(listener).onApplicationEvent(evt);
willThrow(thrown).given(listener).onApplicationEvent(evt);
try {
smc.multicastEvent(evt);
fail("Should have thrown RuntimeException");
@@ -111,7 +110,7 @@ public class ApplicationContextEventTests {
smc.setErrorHandler(TaskUtils.LOG_AND_SUPPRESS_ERROR_HANDLER);
smc.addApplicationListener(listener);
doThrow(new RuntimeException()).when(listener).onApplicationEvent(evt);
willThrow(new RuntimeException()).given(listener).onApplicationEvent(evt);
smc.multicastEvent(evt);
}