commit
32d30a0a26
|
@ -375,7 +375,7 @@ public class HttpTunnelServer {
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Start asynchronous support or if unavailble return {@code null} to cause
|
* Start asynchronous support or if unavailable return {@code null} to cause
|
||||||
* {@link #waitForResponse()} to block.
|
* {@link #waitForResponse()} to block.
|
||||||
* @return the async request control
|
* @return the async request control
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -299,13 +299,13 @@ public class SpringApplicationTests {
|
||||||
SpringApplication application = new SpringApplication(ExampleConfig.class);
|
SpringApplication application = new SpringApplication(ExampleConfig.class);
|
||||||
application.setWebEnvironment(false);
|
application.setWebEnvironment(false);
|
||||||
final AtomicReference<ApplicationContext> reference = new AtomicReference<ApplicationContext>();
|
final AtomicReference<ApplicationContext> reference = new AtomicReference<ApplicationContext>();
|
||||||
class InitalizerListener implements ApplicationListener<ContextRefreshedEvent> {
|
class InitializerListener implements ApplicationListener<ContextRefreshedEvent> {
|
||||||
@Override
|
@Override
|
||||||
public void onApplicationEvent(ContextRefreshedEvent event) {
|
public void onApplicationEvent(ContextRefreshedEvent event) {
|
||||||
reference.set(event.getApplicationContext());
|
reference.set(event.getApplicationContext());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
application.setListeners(Arrays.asList(new InitalizerListener()));
|
application.setListeners(Arrays.asList(new InitializerListener()));
|
||||||
this.context = application.run("--foo=bar");
|
this.context = application.run("--foo=bar");
|
||||||
assertThat(this.context, sameInstance(reference.get()));
|
assertThat(this.context, sameInstance(reference.get()));
|
||||||
// Custom initializers do not switch off the defaults
|
// Custom initializers do not switch off the defaults
|
||||||
|
|
|
@ -41,7 +41,7 @@ public class PoolingConnectionFactoryBeanTests {
|
||||||
};
|
};
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void sensbileDefaults() throws Exception {
|
public void sensibleDefaults() throws Exception {
|
||||||
assertThat(this.bean.getMaxPoolSize(), equalTo(10));
|
assertThat(this.bean.getMaxPoolSize(), equalTo(10));
|
||||||
assertThat(this.bean.getTestConnections(), equalTo(true));
|
assertThat(this.bean.getTestConnections(), equalTo(true));
|
||||||
assertThat(this.bean.getAutomaticEnlistingEnabled(), equalTo(true));
|
assertThat(this.bean.getAutomaticEnlistingEnabled(), equalTo(true));
|
||||||
|
|
|
@ -39,7 +39,7 @@ public class PoolingDataSourceBeanTests {
|
||||||
private PoolingDataSourceBean bean = new PoolingDataSourceBean();
|
private PoolingDataSourceBean bean = new PoolingDataSourceBean();
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void sensbileDefaults() throws Exception {
|
public void sensibleDefaults() throws Exception {
|
||||||
assertThat(this.bean.getMaxPoolSize(), equalTo(10));
|
assertThat(this.bean.getMaxPoolSize(), equalTo(10));
|
||||||
assertThat(this.bean.getAutomaticEnlistingEnabled(), equalTo(true));
|
assertThat(this.bean.getAutomaticEnlistingEnabled(), equalTo(true));
|
||||||
assertThat(this.bean.isEnableJdbc4ConnectionTest(), equalTo(true));
|
assertThat(this.bean.isEnableJdbc4ConnectionTest(), equalTo(true));
|
||||||
|
|
|
@ -41,7 +41,7 @@ public abstract class AbstractLoggingSystemTests {
|
||||||
private String originalTempFolder;
|
private String originalTempFolder;
|
||||||
|
|
||||||
@Before
|
@Before
|
||||||
public void configureTempdir() throws IOException {
|
public void configureTempDir() throws IOException {
|
||||||
this.originalTempFolder = System.getProperty(JAVA_IO_TMPDIR);
|
this.originalTempFolder = System.getProperty(JAVA_IO_TMPDIR);
|
||||||
System.setProperty(JAVA_IO_TMPDIR, this.temp.newFolder().getAbsolutePath());
|
System.setProperty(JAVA_IO_TMPDIR, this.temp.newFolder().getAbsolutePath());
|
||||||
}
|
}
|
||||||
|
|
|
@ -70,7 +70,7 @@ public class LevelRemappingAppenderTests {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void defaltRemapsInfo() throws Exception {
|
public void defaultRemapsInfo() throws Exception {
|
||||||
this.appender.append(mockLogEvent(Level.INFO));
|
this.appender.append(mockLogEvent(Level.INFO));
|
||||||
verify(this.logger).callAppenders(this.logCaptor.capture());
|
verify(this.logger).callAppenders(this.logCaptor.capture());
|
||||||
assertThat(this.logCaptor.getValue().getLevel(), equalTo(Level.DEBUG));
|
assertThat(this.logCaptor.getValue().getLevel(), equalTo(Level.DEBUG));
|
||||||
|
|
|
@ -47,7 +47,7 @@ public class RedisTestServer implements TestRule {
|
||||||
return new RedisStatement(base, this.connectionFactory);
|
return new RedisStatement(base, this.connectionFactory);
|
||||||
}
|
}
|
||||||
catch (Exception ex) {
|
catch (Exception ex) {
|
||||||
logger.error("No Redis server availble", ex);
|
logger.error("No Redis server available", ex);
|
||||||
return new SkipStatement();
|
return new SkipStatement();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -38,7 +38,7 @@ public class TestRestTemplateTests {
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void simple() {
|
public void simple() {
|
||||||
// The Apache client is on the classpath so we get the fully-leaded factory
|
// The Apache client is on the classpath so we get the fully-fledged factory
|
||||||
assertTrue(new TestRestTemplate()
|
assertTrue(new TestRestTemplate()
|
||||||
.getRequestFactory() instanceof HttpComponentsClientHttpRequestFactory);
|
.getRequestFactory() instanceof HttpComponentsClientHttpRequestFactory);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue