root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Move `Assume` to spring-boot-test-support 

Fixes gh-10866
This commit is contained in:
Phillip Webb 2017-11-03 14:08:39 -07:00
parent 427d262297
commit b6166dc12a
3 changed files with 12 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnJavaTests.java
View File

@ -25,9 +25,9 @@ import org.junit.Test;
import org.springframework.boot.autoconfigure.condition.ConditionalOnJava.Range;
import org.springframework.boot.system.JavaVersion;
import org.springframework.boot.test.Assume;
import org.springframework.boot.test.context.HideClassesClassLoader;
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
import org.springframework.boot.testsupport.Assume;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.util.ReflectionUtils;
@ -48,7 +48,7 @@ public class ConditionalOnJavaTests {
@Test
public void doesNotMatchIfBetterVersionIsRequired() {
Assume.javaVersion(JavaVersion.EIGHT);
Assume.javaEight();
this.contextRunner.withUserConfiguration(Java9Required.class)
.run((context) -> assertThat(context).doesNotHaveBean(String.class));
}
@ -93,13 +93,13 @@ public class ConditionalOnJavaTests {
@Test
public void java8IsDetected() throws Exception {
Assume.javaVersion(JavaVersion.EIGHT);
Assume.javaEight();
assertThat(getJavaVersion()).isEqualTo("1.8");
}
@Test
public void java8IsTheFallback() throws Exception {
Assume.javaVersion(JavaVersion.EIGHT);
Assume.javaEight();
assertThat(getJavaVersion(Function.class, Files.class, ServiceLoader.class))
.isEqualTo("1.8");
}

5
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/liquibase/LiquibaseAutoConfigurationTests.java
View File

@ -36,12 +36,11 @@ import org.springframework.boot.autoconfigure.jdbc.EmbeddedDataSourceConfigurati
import org.springframework.boot.jdbc.DataSourceBuilder;
import org.springframework.boot.liquibase.CommonsLoggingLiquibaseLogger;
import org.springframework.boot.liquibase.LiquibaseServiceLocatorApplicationListener;
import org.springframework.boot.system.JavaVersion;
import org.springframework.boot.test.Assume;
import org.springframework.boot.test.context.assertj.AssertableApplicationContext;
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
import org.springframework.boot.test.context.runner.ContextConsumer;
import org.springframework.boot.test.rule.OutputCapture;
import org.springframework.boot.testsupport.Assume;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Primary;
@ -114,7 +113,7 @@ public class LiquibaseAutoConfigurationTests {
@Test
public void changelogSql() {
Assume.javaVersion(JavaVersion.EIGHT);
Assume.javaEight();
this.contextRunner.withUserConfiguration(EmbeddedDataSourceConfiguration.class)
.withPropertyValues(
"spring.liquibase.change-log:classpath:/db/changelog/db.changelog-override.sql")

19
spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/Assume.java → spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/Assume.java
View File

@ -14,11 +14,11 @@
* limitations under the License.
*/
package org.springframework.boot.test;
package org.springframework.boot.testsupport;
import org.junit.AssumptionViolatedException;
import org.springframework.boot.system.JavaVersion;
import org.springframework.util.ClassUtils;
/**
* Provides utility methods that allow JUnit tests to {@link org.junit.Assume} certain
@ -26,20 +26,13 @@ import org.springframework.boot.system.JavaVersion;
* skipped.
*
* @author Stephane Nicoll
* @since 2.0.0
*/
public abstract class Assume {
/**
* Assume that the specified {@link JavaVersion} is the one currently available.
* @param version the expected Java version
* @throws AssumptionViolatedException if the assumption fails
*/
public static void javaVersion(JavaVersion version) {
JavaVersion current = JavaVersion.getJavaVersion();
org.junit.Assume.assumeTrue(
String.format("This test should run on %s (got %s)", version, current),
current == version);
public static void javaEight() {
if (ClassUtils.isPresent("java.security.cert.URICertStoreParameters", null)) {
throw new AssumptionViolatedException("Assumed Java 8 but got Java 9");
}
}
}