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

Don't use MockitoJUnitRunner

Browse Source 
Replace `@RunWith(MockitoJUnitRunner.class)` with direct Mockito
initialization since the running doesn't support parallel test
execution.
This commit is contained in:
Phillip Webb
2016-06-09 20:55:59 -07:00
parent 77f6b4c983
commit 99c6194e17
11 changed files with 57 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockitoContextCustomizerFactoryTests.java
View File

@@ -16,9 +16,9 @@
package org.springframework.boot.test.mock.mockito;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.runners.MockitoJUnitRunner;
import org.mockito.MockitoAnnotations;
import org.springframework.test.context.ContextCustomizer;
@@ -29,11 +29,15 @@ import static org.assertj.core.api.Assertions.assertThat;
*
* @author Phillip Webb
*/
@RunWith(MockitoJUnitRunner.class)
public class MockitoContextCustomizerFactoryTests {
private final MockitoContextCustomizerFactory factory = new MockitoContextCustomizerFactory();
@Before
public void setup() {
MockitoAnnotations.initMocks(this);
}
@Test
public void getContextCustomizerWithoutAnnotationReturnsCustomizer()
throws Exception {
@@ -57,8 +61,8 @@ public class MockitoContextCustomizerFactoryTests {
ContextCustomizer same = this.factory
.createContextCustomizer(WithSameMockBeanAnnotation.class, null);
assertThat(customizer).isNotNull();
ContextCustomizer different = this.factory.createContextCustomizer(
WithDifferentMockBeanAnnotation.class, null);
ContextCustomizer different = this.factory
.createContextCustomizer(WithDifferentMockBeanAnnotation.class, null);
assertThat(different).isNotNull();
assertThat(customizer.hashCode()).isEqualTo(same.hashCode());
assertThat(customizer.hashCode()).isNotEqualTo(different.hashCode());