root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge pull request #5836 from izeye/polish-20160502 

* pr/5836:
  Polish
This commit is contained in:
Phillip Webb 2016-05-02 17:08:57 -07:00
parent 02bd3dc62d e5715df7e3
commit 50de70e2eb
12 changed files with 29 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockBean.java
View File

@ -105,7 +105,7 @@ public @interface MockBean {
* When {@code @MockBean} also defines a {@code name} this attribute can only contain
* a single value.
* <p>
* If this is the only attribute specified consider using the {@code value} alias
* If this is the only specified attribute consider using the {@code value} alias
* instead.
* @return the classes to mock
*/

6
spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockDefinition.java
View File

@ -70,7 +70,7 @@ class MockDefinition extends Definition {
}
/**
* Return the classes that should be mocked.
* Return the class that should be mocked.
* @return the class to mock; never {@code null}
*/
public Class<?> getClassToMock() {
@ -79,7 +79,7 @@ class MockDefinition extends Definition {
/**
* Return the extra interfaces.
* @return the extra interfaces or an empty array
* @return the extra interfaces or an empty set
*/
public Set<Class<?>> getExtraInterfaces() {
return this.extraInterfaces;
@ -87,7 +87,7 @@ class MockDefinition extends Definition {
/**
* Return the answers mode.
* @return the answer the answers mode; never {@code null}
* @return the answers mode; never {@code null}
*/
public Answers getAnswer() {
return this.answer;

6
spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockReset.java
View File

@ -55,7 +55,7 @@ public enum MockReset {
private static final MockUtil util = new MockUtil();
/**
* Create {@link MockSettings settings} to be use used with mocks where reset should
* Create {@link MockSettings settings} to be used with mocks where reset should
* occur before each test method runs.
* @return mock settings
*/
@ -64,7 +64,7 @@ public enum MockReset {
}
/**
* Create {@link MockSettings settings} to be use used with mocks where reset should
* Create {@link MockSettings settings} to be used with mocks where reset should
* occur after each test method runs.
* @return mock settings
*/
@ -73,7 +73,7 @@ public enum MockReset {
}
/**
* Create {@link MockSettings settings} to be use used with mocks where a specific
* Create {@link MockSettings settings} to be used with mocks where a specific
* reset should occur.
* @param reset the reset type
* @return mock settings

2
spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockitoContextCustomizerFactory.java
View File

@ -33,7 +33,7 @@ class MockitoContextCustomizerFactory implements ContextCustomizerFactory {
public ContextCustomizer createContextCustomizer(Class<?> testClass,
List<ContextConfigurationAttributes> configAttributes) {
// We gather the explicit mock definitions here since they form part of the
// MergedContextConfiguration key. Different mocks need to have a different key
// MergedContextConfiguration key. Different mocks need to have a different key.
DefinitionsParser parser = new DefinitionsParser();
parser.parse(testClass);
return new MockitoContextCustomizer(parser.getDefinitions());

2
spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockitoPostProcessor.java
View File

@ -114,7 +114,7 @@ public class MockitoPostProcessor extends InstantiationAwareBeanPostProcessorAda
public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory)
throws BeansException {
Assert.isInstanceOf(BeanDefinitionRegistry.class, beanFactory,
"@RegisterMocks can only be used on bean factories that "
"@MockBean can only be used on bean factories that "
+ "implement BeanDefinitionRegistry");
postProcessBeanFactory(beanFactory, (BeanDefinitionRegistry) beanFactory);
}

2
spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockitoTestExecutionListener.java
View File

@ -75,7 +75,7 @@ class MockitoTestExecutionListener extends AbstractTestExecutionListener {
}
/**
* {@link FieldCallback} to collect mockito annotations.
* {@link FieldCallback} to collect Mockito annotations.
*/
private static class MockitoAnnotationCollection implements FieldCallback {

2
spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/SpyBean.java
View File

@ -102,7 +102,7 @@ public @interface SpyBean {
* When {@code @MockBean} also defines a {@code name} this attribute can only contain
* a single value.
* <p>
* If this is the only attribute specified consider using the {@code value} alias
* If this is the only specified attribute consider using the {@code value} alias
* instead.
* @return the classes to mock
*/

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