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

Merge branch '1.4.x' into 1.5.x

Browse Source
This commit is contained in:
Stephane Nicoll
2016-10-02 11:08:33 +02:00
parent 75f475f2c8 4dfdce5a49
commit e643fc5bd1
11 changed files with 26 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-boot-test/src/test/java/org/springframework/boot/test/context/bootstrap/SpringBootTestContextBootstrapperIntegrationTests.java
View File

@@ -24,7 +24,6 @@ import org.springframework.boot.test.context.SpringBootTestContextBootstrapper;
import org.springframework.boot.test.context.TestConfiguration;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.stereotype.Component;
import org.springframework.test.context.BootstrapWith;
import org.springframework.test.context.junit4.SpringRunner;
@@ -83,9 +82,4 @@ public class SpringBootTestContextBootstrapperIntegrationTests {
}
@Component
static class ExampleTestComponent {
}
}

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

@@ -169,6 +169,8 @@ public class DefinitionsParserTests {
QualifierDefinition qualifier = QualifierDefinition.forElement(
ReflectionUtils.findField(SpyBeanOnClassAndField.class, "caller"));
assertThat(fieldDefinition.getQualifier()).isNotNull().isEqualTo(qualifier);
assertThat(fieldDefinition.getTypeToSpy().resolve())
.isEqualTo(ExampleServiceCaller.class);
}
@Test

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

@@ -36,6 +36,9 @@ import static org.mockito.Mockito.verify;
/**
* Test {@link MockBean} on a test class field can be used to replace existing bean while
* preserving qualifiers.
*
* @author Stephane Nicoll
* @author Phillip Webb
*/
@RunWith(SpringRunner.class)
public class MockBeanOnTestFieldForExistingBeanWithQualifierIntegrationTests {

5
spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/example/CustomQualifier.java
View File

@@ -21,6 +21,11 @@ import java.lang.annotation.RetentionPolicy;
import org.springframework.beans.factory.annotation.Qualifier;
/**
* Custom qualifier for testing.
*
* @author Stephane Nicoll
*/
@Qualifier
@Retention(RetentionPolicy.RUNTIME)
public @interface CustomQualifier {

37
spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/example/MyMockBean.java
View File

@@ -1,37 +0,0 @@
/*
* Copyright 2012-2016 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.boot.test.mock.mockito.example;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.core.annotation.AliasFor;
@Target({ ElementType.TYPE, ElementType.FIELD })
@Retention(RetentionPolicy.RUNTIME)
@Documented
@MockBean
public @interface MyMockBean {
@AliasFor(annotation = MockBean.class, attribute = "value")
Class<?> value();
}