From 9065c4997dc4b7edd8da819b71bae634b1ef1f77 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 16 Sep 2019 09:50:58 +0200 Subject: [PATCH] Fix rebase from master --- .../boot/test/context/filter/TestTypeExcludeFilter.java | 3 +-- .../filter/AbstractJupiterTestWithConfigAndTestable.java | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/filter/TestTypeExcludeFilter.java b/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/filter/TestTypeExcludeFilter.java index 444b976884..7deca5eba6 100644 --- a/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/filter/TestTypeExcludeFilter.java +++ b/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/filter/TestTypeExcludeFilter.java @@ -33,8 +33,7 @@ import org.springframework.core.type.classreading.MetadataReaderFactory; class TestTypeExcludeFilter extends TypeExcludeFilter { private static final String[] CLASS_ANNOTATIONS = { "org.junit.runner.RunWith", - "org.junit.jupiter.api.extension.ExtendWith", "org.junit.platform.commons.annotation.Testable", - "org.testng.annotations.Test", }; + "org.junit.jupiter.api.extension.ExtendWith", "org.junit.platform.commons.annotation.Testable" }; private static final String[] METHOD_ANNOTATIONS = { "org.junit.Test", "org.junit.platform.commons.annotation.Testable" }; diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/filter/AbstractJupiterTestWithConfigAndTestable.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/filter/AbstractJupiterTestWithConfigAndTestable.java index 5e81cf1a82..59b80d0463 100644 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/filter/AbstractJupiterTestWithConfigAndTestable.java +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/filter/AbstractJupiterTestWithConfigAndTestable.java @@ -23,7 +23,7 @@ import org.springframework.context.annotation.Configuration; @Testable public abstract class AbstractJupiterTestWithConfigAndTestable { - @Configuration(proxyBeanMethods = false) + @Configuration static class Config { }