Skip to content

Use ApplicationContextRunner in ConditionalOnNotWebApplicationTests #12495

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Use ApplicationContextRunner in ConditionalOnNotWebApplicationTests #12495

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 15 additions & 34 deletions ...org/springframework/boot/autoconfigure/condition/ConditionalOnNotWebApplicationTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2012-2017 the original author or authors.
* Copyright 2012-2018 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.
Expand All @@ -16,20 +16,17 @@

package org.springframework.boot.autoconfigure.condition;

import org.junit.After;
import org.junit.Test;
import reactor.core.publisher.Mono;

import org.springframework.boot.autoconfigure.web.reactive.MockReactiveWebServerFactory;
import org.springframework.boot.web.reactive.context.AnnotationConfigReactiveWebApplicationContext;
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
import org.springframework.boot.test.context.runner.ReactiveWebApplicationContextRunner;
import org.springframework.boot.test.context.runner.WebApplicationContextRunner;
import org.springframework.boot.web.reactive.server.ReactiveWebServerFactory;
import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.http.server.reactive.HttpHandler;
import org.springframework.mock.web.MockServletContext;
import org.springframework.web.context.support.AnnotationConfigWebApplicationContext;

import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.entry;
Expand All @@ -42,43 +39,27 @@
*/
public class ConditionalOnNotWebApplicationTests {

private ConfigurableApplicationContext context;

@After
public void closeContext() {
if (this.context != null) {
this.context.close();
}
}

@Test
public void testNotWebApplicationWithServletContext() {
AnnotationConfigWebApplicationContext ctx = new AnnotationConfigWebApplicationContext();
ctx.register(NotWebApplicationConfiguration.class);
ctx.setServletContext(new MockServletContext());
ctx.refresh();
this.context = ctx;
assertThat(this.context.getBeansOfType(String.class)).isEmpty();
new WebApplicationContextRunner()
.withUserConfiguration(NotWebApplicationConfiguration.class)
.run(context -> assertThat(context).doesNotHaveBean(String.class));
}

@Test
public void testNotWebApplicationWithReactiveContext() {
AnnotationConfigReactiveWebApplicationContext context = new AnnotationConfigReactiveWebApplicationContext();
context.register(ReactiveApplicationConfig.class,
NotWebApplicationConfiguration.class);
context.refresh();
this.context = context;
assertThat(this.context.getBeansOfType(String.class)).isEmpty();
new ReactiveWebApplicationContextRunner()
.withUserConfiguration(ReactiveApplicationConfig.class,
NotWebApplicationConfiguration.class)
.run(context -> assertThat(context).doesNotHaveBean(String.class));
}

@Test
public void testNotWebApplication() {
AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext();
ctx.register(NotWebApplicationConfiguration.class);
ctx.refresh();
this.context = ctx;
assertThat(this.context.getBeansOfType(String.class))
.containsExactly(entry("none", "none"));
new ApplicationContextRunner()
.withUserConfiguration(NotWebApplicationConfiguration.class)
.run(context -> assertThat(context).getBeans(String.class)
.containsExactly(entry("none", "none")));
}

@Configuration
Expand Down