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

Polish

Browse Source 
Closes gh-5836
This commit is contained in:
Johnny Lim
2016-05-02 22:13:04 +09:00
committed by Phillip Webb
parent 02bd3dc62d
commit e5715df7e3
12 changed files with 29 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -38,28 +38,28 @@ public class MockitoContextCustomizerFactoryTests {
public void getContextCustomizerWithoutAnnotationReturnsCustomizer()
throws Exception {
ContextCustomizer customizer = this.factory
.createContextCustomizer(NoRegisterMocksAnnotation.class, null);
.createContextCustomizer(NoMockBeanAnnotation.class, null);
assertThat(customizer).isNotNull();
}
@Test
public void getContextCustomizerWithAnnotationReturnsCustomizer() throws Exception {
ContextCustomizer customizer = this.factory
.createContextCustomizer(WithRegisterMocksAnnotation.class, null);
.createContextCustomizer(WithMockBeanAnnotation.class, null);
assertThat(customizer).isNotNull();
}
@Test
public void getContextCustomizerUsesMocksAsCacheKey() throws Exception {
ContextCustomizer customizer = this.factory
.createContextCustomizer(WithRegisterMocksAnnotation.class, null);
.createContextCustomizer(WithMockBeanAnnotation.class, null);
assertThat(customizer).isNotNull();
ContextCustomizer same = this.factory
.createContextCustomizer(WithSameRegisterMocksAnnotation.class, null);
.createContextCustomizer(WithSameMockBeanAnnotation.class, null);
assertThat(customizer).isNotNull();
ContextCustomizer different = this.factory.createContextCustomizer(
WithDifferentRegisterMocksAnnotation.class, null);
assertThat(customizer).isNotNull();
WithDifferentMockBeanAnnotation.class, null);
assertThat(different).isNotNull();
assertThat(customizer.hashCode()).isEqualTo(same.hashCode());
assertThat(customizer.hashCode()).isNotEqualTo(different.hashCode());
assertThat(customizer).isEqualTo(customizer);
@@ -67,22 +67,22 @@ public class MockitoContextCustomizerFactoryTests {
assertThat(customizer).isNotEqualTo(different);
}
static class NoRegisterMocksAnnotation {
static class NoMockBeanAnnotation {
}
@MockBean({ Service1.class, Service2.class })
static class WithRegisterMocksAnnotation {
static class WithMockBeanAnnotation {
}
@MockBean({ Service2.class, Service1.class })
static class WithSameRegisterMocksAnnotation {
static class WithSameMockBeanAnnotation {
}
@MockBean({ Service1.class })
static class WithDifferentRegisterMocksAnnotation {
static class WithDifferentMockBeanAnnotation {
}

12
spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockitoInitializeTestExecutionListenerTests.java
View File

@@ -62,16 +62,16 @@ public class MockitoInitializeTestExecutionListenerTests {
}
@Test
public void prepareTestInstanceShouldInitMockitoAnnotation() throws Exception {
WithMockitoAnnotation instance = new WithMockitoAnnotation();
public void prepareTestInstanceShouldInitMockitoAnnotations() throws Exception {
WithMockitoAnnotations instance = new WithMockitoAnnotations();
this.listener.prepareTestInstance(mockTestContext(instance));
assertThat(instance.mock).isNotNull();
assertThat(instance.captor).isNotNull();
}
@Test
public void prepareTestInstanceShouldInjectMockBeans() throws Exception {
WithMockBeans instance = new WithMockBeans();
public void prepareTestInstanceShouldInjectMockBean() throws Exception {
WithMockBean instance = new WithMockBean();
this.listener.prepareTestInstance(mockTestContext(instance));
verify(this.postProcessor).inject(this.fieldCaptor.capture(), eq(instance),
(MockDefinition) any());
@@ -87,7 +87,7 @@ public class MockitoInitializeTestExecutionListenerTests {
return testContext;
}
static class WithMockitoAnnotation {
static class WithMockitoAnnotations {
@Mock
InputStream mock;
@@ -97,7 +97,7 @@ public class MockitoInitializeTestExecutionListenerTests {
}
static class WithMockBeans {
static class WithMockBean {
@MockBean
InputStream mockBean;

3
spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/ResetMocksTestExecutionListenerTests.java
View File

@@ -41,8 +41,6 @@ import static org.mockito.Mockito.mock;
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
public class ResetMocksTestExecutionListenerTests {
static boolean test001executed;
@Autowired
private ApplicationContext context;
@@ -51,7 +49,6 @@ public class ResetMocksTestExecutionListenerTests {
given(getMock("none").greeting()).willReturn("none");
given(getMock("before").greeting()).willReturn("before");
given(getMock("after").greeting()).willReturn("after");
test001executed = true;
}
@Test

4
spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/example/ExampleServiceCaller.java
View File

@@ -16,10 +16,8 @@
package org.springframework.boot.test.mock.mockito.example;
import java.security.Provider.Service;
/**
* Example bean for mocking tests that calls {@link Service}.
* Example bean for mocking tests that calls {@link ExampleService}.
*
* @author Phillip Webb
*/

2
spring-boot-test/src/test/java/org/springframework/boot/test/web/htmlunit/webdriver/LocalHostWebConnectionHtmlUnitDriverTests.java
View File

@@ -85,7 +85,7 @@ public class LocalHostWebConnectionHtmlUnitDriverTests {
}
@Test
public void getPageWhenUrlIsRelativeAndNoPortWillUseLocalhost8080() throws Exception {
public void getWhenUrlIsRelativeAndNoPortWillUseLocalhost8080() throws Exception {
MockEnvironment environment = new MockEnvironment();
LocalHostWebConnectionHtmlUnitDriver driver = new TestLocalHostWebConnectionHtmlUnitDriver(
environment);