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

Merge branch '1.5.x'

This commit is contained in:
Andy Wilkinson 2017-02-28 15:58:22 +00:00
parent 20bd0f94d6 545b29552d
commit e20219aac9
2 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-test/src/main/java/org/springframework/boot/test/context/ImportsContextCustomizer.java
View File

@ -401,8 +401,8 @@ class ImportsContextCustomizer implements ContextCustomizer {
@Override @Override
public boolean isIgnored(Annotation annotation) { public boolean isIgnored(Annotation annotation) {
return annotation.annotationType().getName() return annotation.annotationType().getName().startsWith("org.spockframework.")
.startsWith("org.spockframework."); || annotation.annotationType().getName().startsWith("spock.");
} }
} }

30
spring-boot-test/src/test/java/org/springframework/boot/test/context/ImportsContextCustomizerTests.java
View File

@ -24,6 +24,8 @@ import java.util.Set;
import kotlin.Metadata; import kotlin.Metadata;
import org.junit.Test; import org.junit.Test;
import org.spockframework.runtime.model.SpecMetadata; import org.spockframework.runtime.model.SpecMetadata;
import spock.lang.Issue;
import spock.lang.Stepwise;
import org.springframework.boot.context.annotation.DeterminableImports; import org.springframework.boot.context.annotation.DeterminableImports;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
@ -63,10 +65,18 @@ public class ImportsContextCustomizerTests {
} }
@Test @Test
public void customizersForTestClassesWithDifferentSpockMetadataAreEqual() { public void customizersForTestClassesWithDifferentSpockFrameworkAnnotationsAreEqual() {
assertThat(new ImportsContextCustomizer(FirstSpockAnnotatedTestClass.class)) assertThat(
new ImportsContextCustomizer(FirstSpockFrameworkAnnotatedTestClass.class))
.isEqualTo(new ImportsContextCustomizer(
SecondSpockFrameworkAnnotatedTestClass.class));
}
@Test
public void customizersForTestClassesWithDifferentSpockLangAnnotationsAreEqual() {
assertThat(new ImportsContextCustomizer(FirstSpockLangAnnotatedTestClass.class))
.isEqualTo(new ImportsContextCustomizer( .isEqualTo(new ImportsContextCustomizer(
SecondSpockAnnotatedTestClass.class)); SecondSpockLangAnnotatedTestClass.class));
} }
@Import(TestImportSelector.class) @Import(TestImportSelector.class)
@ -104,12 +114,22 @@ public class ImportsContextCustomizerTests {
} }
@SpecMetadata(filename = "foo", line = 10) @SpecMetadata(filename = "foo", line = 10)
static class FirstSpockAnnotatedTestClass { static class FirstSpockFrameworkAnnotatedTestClass {
} }
@SpecMetadata(filename = "bar", line = 10) @SpecMetadata(filename = "bar", line = 10)
static class SecondSpockAnnotatedTestClass { static class SecondSpockFrameworkAnnotatedTestClass {
}
@Stepwise
static class FirstSpockLangAnnotatedTestClass {
}
@Issue("1234")
static class SecondSpockLangAnnotatedTestClass {
} }