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

69
spring-context/src/test/java/org/springframework/context/support/PropertyResourceConfigurerIntegrationTests.java
View File

@@ -18,7 +18,6 @@ package org.springframework.context.support;
import java.io.FileNotFoundException;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.springframework.beans.MutablePropertyValues;
@@ -31,6 +30,7 @@ import org.springframework.context.ApplicationContext;
import org.springframework.tests.sample.beans.TestBean;
import org.springframework.util.StringUtils;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
/**
@@ -40,6 +40,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
* as opposed to using only a BeanFactory during testing.
*
* @author Chris Beams
* @author Sam Brannen
* @see org.springframework.beans.factory.config.PropertyResourceConfigurerTests
*/
public class PropertyResourceConfigurerIntegrationTests {
@@ -54,8 +55,8 @@ public class PropertyResourceConfigurerIntegrationTests {
pvs.add("location", "${user.dir}/test");
ac.registerSingleton("configurer", PropertyPlaceholderConfigurer.class, pvs);
String userDir = getUserDir();
assertThatExceptionOfType(BeanInitializationException.class).isThrownBy(
ac::refresh)
assertThatExceptionOfType(BeanInitializationException.class)
.isThrownBy(ac::refresh)
.withCauseInstanceOf(FileNotFoundException.class)
.withMessageContaining(userDir);
}
@@ -70,8 +71,8 @@ public class PropertyResourceConfigurerIntegrationTests {
pvs.add("location", "${user.dir}/test/${user.dir}");
ac.registerSingleton("configurer", PropertyPlaceholderConfigurer.class, pvs);
String userDir = getUserDir();
assertThatExceptionOfType(BeanInitializationException.class).isThrownBy(
ac::refresh)
assertThatExceptionOfType(BeanInitializationException.class)
.isThrownBy(ac::refresh)
.withCauseInstanceOf(FileNotFoundException.class)
.matches(ex -> ex.getMessage().contains(userDir + "/test/" + userDir) ||
ex.getMessage().contains(userDir + "/test//" + userDir));
@@ -95,8 +96,8 @@ public class PropertyResourceConfigurerIntegrationTests {
pvs = new MutablePropertyValues();
pvs.add("location", "${myprop}/test/${myprop}");
ac.registerSingleton("configurer", PropertyPlaceholderConfigurer.class, pvs);
assertThatExceptionOfType(BeanInitializationException.class).isThrownBy(
ac::refresh)
assertThatExceptionOfType(BeanInitializationException.class)
.isThrownBy(ac::refresh)
.withMessageContaining("myprop");
}
@@ -109,8 +110,7 @@ public class PropertyResourceConfigurerIntegrationTests {
pvs = new MutablePropertyValues();
pvs.add("properties", "var=${m}var\nm=${var2}\nvar2=${var}");
ac.registerSingleton("configurer1", PropertyPlaceholderConfigurer.class, pvs);
assertThatExceptionOfType(BeanDefinitionStoreException.class).isThrownBy(
ac::refresh);
assertThatExceptionOfType(BeanDefinitionStoreException.class).isThrownBy(ac::refresh);
}
@Test
@@ -122,8 +122,7 @@ public class PropertyResourceConfigurerIntegrationTests {
pvs = new MutablePropertyValues();
pvs.add("properties", "var=${m}var\nm=${var2}\nvar2=${m}");
ac.registerSingleton("configurer1", PropertyPlaceholderConfigurer.class, pvs);
assertThatExceptionOfType(BeanDefinitionStoreException.class).isThrownBy(
ac::refresh);
assertThatExceptionOfType(BeanDefinitionStoreException.class).isThrownBy(ac::refresh);
}
@Test
@@ -135,31 +134,35 @@ public class PropertyResourceConfigurerIntegrationTests {
pvs = new MutablePropertyValues();
pvs.add("properties", "var=${m}var\nm=${var2}\nvar2=${m2}");
ac.registerSingleton("configurer1", PropertyPlaceholderConfigurer.class, pvs);
assertThatExceptionOfType(BeanDefinitionStoreException.class).isThrownBy(
ac::refresh);
assertThatExceptionOfType(BeanDefinitionStoreException.class).isThrownBy(ac::refresh);
}
@Disabled // this test was breaking after the 3.0 repackaging
@Test
public void testPropertyPlaceholderConfigurerWithAutowireByType() {
// StaticApplicationContext ac = new StaticApplicationContext();
// MutablePropertyValues pvs = new MutablePropertyValues();
// pvs.addPropertyValue("touchy", "${test}");
// ac.registerSingleton("tb", TestBean.class, pvs);
// pvs = new MutablePropertyValues();
// pvs.addPropertyValue("target", new RuntimeBeanReference("tb"));
// // uncomment when fixing this test
// // ac.registerSingleton("tbProxy", org.springframework.aop.framework.ProxyFactoryBean.class, pvs);
// pvs = new MutablePropertyValues();
// Properties props = new Properties();
// props.put("test", "mytest");
// pvs.addPropertyValue("properties", new Properties(props));
// RootBeanDefinition ppcDef = new RootBeanDefinition(PropertyPlaceholderConfigurer.class, pvs);
// ppcDef.setAutowireMode(RootBeanDefinition.AUTOWIRE_BY_TYPE);
// ac.registerBeanDefinition("configurer", ppcDef);
// ac.refresh();
// TestBean tb = (TestBean) ac.getBean("tb");
// assertEquals("mytest", tb.getTouchy());
public void testPropertyPlaceholderConfigurerWithValueFromSystemProperty() {
final String propertyName = getClass().getName() + ".test";
try {
System.setProperty(propertyName, "mytest");
StaticApplicationContext context = new StaticApplicationContext();
MutablePropertyValues pvs = new MutablePropertyValues();
pvs.addPropertyValue("touchy", "${" + propertyName + "}");
context.registerSingleton("tb", TestBean.class, pvs);
pvs = new MutablePropertyValues();
pvs.addPropertyValue("target", new RuntimeBeanReference("tb"));
context.registerSingleton("tbProxy", org.springframework.aop.framework.ProxyFactoryBean.class, pvs);
context.registerSingleton("configurer", PropertyPlaceholderConfigurer.class);
context.refresh();
TestBean testBean = context.getBean("tb", TestBean.class);
assertThat(testBean.getTouchy()).isEqualTo("mytest");
}
finally {
System.clearProperty(propertyName);
}
}
}

5
spring-context/src/test/java/org/springframework/scheduling/concurrent/ScheduledExecutorFactoryBeanTests.java
View File

@@ -20,7 +20,6 @@ import java.util.concurrent.RejectedExecutionHandler;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.ThreadFactory;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.springframework.core.task.NoOpRunnable;
@@ -142,8 +141,8 @@ public class ScheduledExecutorFactoryBeanTests {
verify(runnable, atLeast(2)).run();
}
@Disabled
@Test
@EnabledForTestGroups(PERFORMANCE)
public void testWithInitialDelayRepeatedExecutionIsSetUpAndFiresCorrectly() throws Exception {
Runnable runnable = mock(Runnable.class);
@@ -162,8 +161,8 @@ public class ScheduledExecutorFactoryBeanTests {
verify(runnable, never()).run();
}
@Disabled
@Test
@EnabledForTestGroups(PERFORMANCE)
public void testWithInitialDelayRepeatedExecutionIsSetUpAndFiresCorrectlyAfterException() throws Exception {
Runnable runnable = mock(Runnable.class);
willThrow(new IllegalStateException()).given(runnable).run();