mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-09-03 04:26:12 +08:00
Add TestNG support in TestTypeExcludeFilter
See gh-7630
This commit is contained in:
parent
4d9513404a
commit
b005008cac
@ -182,6 +182,7 @@
|
||||
<statsd-client.version>3.1.0</statsd-client.version>
|
||||
<sun-mail.version>${javax-mail.version}</sun-mail.version>
|
||||
<saaj-impl.version>1.5.0</saaj-impl.version>
|
||||
<testng.version>6.10</testng.version>
|
||||
<thymeleaf.version>3.0.11.RELEASE</thymeleaf.version>
|
||||
<thymeleaf-extras-springsecurity.version>3.0.4.RELEASE</thymeleaf-extras-springsecurity.version>
|
||||
<thymeleaf-layout-dialect.version>2.3.0</thymeleaf-layout-dialect.version>
|
||||
@ -2965,6 +2966,11 @@
|
||||
<artifactId>nio-multipart-parser</artifactId>
|
||||
<version>${nio-multipart-parser.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.testng</groupId>
|
||||
<artifactId>testng</artifactId>
|
||||
<version>${testng.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.thymeleaf</groupId>
|
||||
<artifactId>thymeleaf</artifactId>
|
||||
|
@ -192,6 +192,11 @@
|
||||
<artifactId>mockito-kotlin</artifactId>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.testng</groupId>
|
||||
<artifactId>testng</artifactId>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
<build>
|
||||
<plugins>
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2012-2018 the original author or authors.
|
||||
* Copyright 2012-2019 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.
|
||||
@ -33,10 +33,11 @@ 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.jupiter.api.extension.ExtendWith", "org.testng.annotations.Test" };
|
||||
|
||||
private static final String[] METHOD_ANNOTATIONS = { "org.junit.Test",
|
||||
"org.junit.platform.commons.annotation.Testable" };
|
||||
"org.junit.platform.commons.annotation.Testable",
|
||||
"org.testng.annotations.Test" };
|
||||
|
||||
@Override
|
||||
public boolean match(MetadataReader metadataReader,
|
||||
|
@ -0,0 +1,37 @@
|
||||
/*
|
||||
* 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.context.filter;
|
||||
|
||||
import org.testng.annotations.Test;
|
||||
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
|
||||
/**
|
||||
* Abstract test with nest {@code @Configuration} and {@code @Test} used by
|
||||
* {@link TestTypeExcludeFilter}.
|
||||
*
|
||||
* @author Eddú Meléndez
|
||||
*/
|
||||
@Test
|
||||
public abstract class AbstractTestNG {
|
||||
|
||||
@Configuration
|
||||
static class Config {
|
||||
|
||||
}
|
||||
|
||||
}
|
@ -98,6 +98,13 @@ public class TestTypeExcludeFilterTests {
|
||||
this.metadataReaderFactory)).isFalse();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void matchesNestedConfigurationClassWithoutTestngAnnotation()
|
||||
throws Exception {
|
||||
assertThat(this.filter.match(getMetadataReader(AbstractTestNG.Config.class),
|
||||
this.metadataReaderFactory)).isTrue();
|
||||
}
|
||||
|
||||
private MetadataReader getMetadataReader(Class<?> source) throws IOException {
|
||||
return this.metadataReaderFactory.getMetadataReader(source.getName());
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user