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

Polish and revive disabled tests

Browse Source 
This commit revives some previously disabled tests and converts
some usage of @Disabled to @EnabledForTestGroups(...).
This commit is contained in:
Sam Brannen
2019-09-06 15:57:27 +02:00
parent 35b967a801
commit 591995ecc8
7 changed files with 58 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
spring-beans/src/test/java/org/springframework/beans/factory/serviceloader/ServiceLoaderTests.java
View File

@@ -21,6 +21,7 @@ import java.util.ServiceLoader;
import javax.xml.parsers.DocumentBuilderFactory;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
@@ -33,12 +34,15 @@ import static org.junit.jupiter.api.Assumptions.assumeTrue;
* @author Juergen Hoeller
* @author Chris Beams
*/
public class ServiceLoaderTests {
class ServiceLoaderTests {
@BeforeAll
static void assumeDocumentBuilderFactoryCanBeLoaded() {
assumeTrue(ServiceLoader.load(DocumentBuilderFactory.class).iterator().hasNext());
}
@Test
public void testServiceLoaderFactoryBean() {
assumeTrue(ServiceLoader.load(DocumentBuilderFactory.class).iterator().hasNext());
void testServiceLoaderFactoryBean() {
DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
RootBeanDefinition bd = new RootBeanDefinition(ServiceLoaderFactoryBean.class);
bd.getPropertyValues().add("serviceType", DocumentBuilderFactory.class.getName());
@@ -49,9 +53,7 @@ public class ServiceLoaderTests {
}
@Test
public void testServiceFactoryBean() {
assumeTrue(ServiceLoader.load(DocumentBuilderFactory.class).iterator().hasNext());
void testServiceFactoryBean() {
DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
RootBeanDefinition bd = new RootBeanDefinition(ServiceFactoryBean.class);
bd.getPropertyValues().add("serviceType", DocumentBuilderFactory.class.getName());
@@ -61,9 +63,7 @@ public class ServiceLoaderTests {
}
@Test
public void testServiceListFactoryBean() {
assumeTrue(ServiceLoader.load(DocumentBuilderFactory.class).iterator().hasNext());
void testServiceListFactoryBean() {
DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
RootBeanDefinition bd = new RootBeanDefinition(ServiceListFactoryBean.class);
bd.getPropertyValues().add("serviceType", DocumentBuilderFactory.class.getName());