Disable remaining JavaScript-based tests on Java 15+
This commit disables all remaining JavaScript-based tests on Java 15 or higher since the Nashorn JavaScript engine is no longer part of the JDK.
This commit is contained in:
parent
71ed8143a1
commit
c3f439417e
|
|
@ -36,7 +36,7 @@ import static org.junit.jupiter.api.condition.JRE.JAVA_15;
|
|||
* @author Juergen Hoeller
|
||||
* @since 4.2
|
||||
*/
|
||||
@DisabledForJreRange(min = JAVA_15)
|
||||
@DisabledForJreRange(min = JAVA_15) // Nashorn JavaScript engine removed in Java 15
|
||||
public class StandardScriptFactoryTests {
|
||||
|
||||
@Test
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright 2002-2019 the original author or authors.
|
||||
* Copyright 2002-2020 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.
|
||||
|
|
@ -20,6 +20,7 @@ import java.util.HashMap;
|
|||
import java.util.Map;
|
||||
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.junit.jupiter.api.condition.DisabledForJreRange;
|
||||
|
||||
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
|
||||
import org.springframework.context.annotation.Bean;
|
||||
|
|
@ -36,12 +37,14 @@ import org.springframework.web.testfixture.http.server.reactive.MockServerHttpRe
|
|||
import org.springframework.web.testfixture.server.MockServerWebExchange;
|
||||
|
||||
import static org.assertj.core.api.Assertions.assertThat;
|
||||
import static org.junit.jupiter.api.condition.JRE.JAVA_15;
|
||||
|
||||
/**
|
||||
* Unit tests for pure JavaScript templates running on Nashorn engine.
|
||||
*
|
||||
* @author Sebastien Deleuze
|
||||
*/
|
||||
@DisabledForJreRange(min = JAVA_15) // Nashorn JavaScript engine removed in Java 15
|
||||
public class NashornScriptTemplateTests {
|
||||
|
||||
@Test
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright 2002-2019 the original author or authors.
|
||||
* Copyright 2002-2020 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.
|
||||
|
|
@ -29,6 +29,7 @@ import javax.script.ScriptEngine;
|
|||
|
||||
import org.junit.jupiter.api.BeforeEach;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.junit.jupiter.api.condition.DisabledForJreRange;
|
||||
|
||||
import org.springframework.beans.DirectFieldAccessor;
|
||||
import org.springframework.context.ApplicationContextException;
|
||||
|
|
@ -37,6 +38,7 @@ import org.springframework.context.support.StaticApplicationContext;
|
|||
import static org.assertj.core.api.Assertions.assertThat;
|
||||
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
|
||||
import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
|
||||
import static org.junit.jupiter.api.condition.JRE.JAVA_15;
|
||||
import static org.mockito.BDDMockito.given;
|
||||
import static org.mockito.Mockito.mock;
|
||||
|
||||
|
|
@ -45,6 +47,7 @@ import static org.mockito.Mockito.mock;
|
|||
*
|
||||
* @author Sebastien Deleuze
|
||||
*/
|
||||
@DisabledForJreRange(min = JAVA_15) // Nashorn JavaScript engine removed in Java 15
|
||||
public class ScriptTemplateViewTests {
|
||||
|
||||
private ScriptTemplateView view;
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright 2002-2019 the original author or authors.
|
||||
* Copyright 2002-2020 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.
|
||||
|
|
@ -23,6 +23,7 @@ import javax.servlet.ServletContext;
|
|||
|
||||
import org.junit.jupiter.api.BeforeEach;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.junit.jupiter.api.condition.DisabledForJreRange;
|
||||
|
||||
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
|
||||
import org.springframework.context.annotation.Bean;
|
||||
|
|
@ -33,13 +34,15 @@ import org.springframework.web.testfixture.servlet.MockHttpServletResponse;
|
|||
import org.springframework.web.testfixture.servlet.MockServletContext;
|
||||
|
||||
import static org.assertj.core.api.Assertions.assertThat;
|
||||
import static org.junit.jupiter.api.condition.JRE.JAVA_15;
|
||||
import static org.mockito.Mockito.mock;
|
||||
|
||||
/**
|
||||
* Unit tests for pure Javascript templates running on Nashorn engine.
|
||||
* Unit tests for pure JavaScript templates running on Nashorn engine.
|
||||
*
|
||||
* @author Sebastien Deleuze
|
||||
*/
|
||||
@DisabledForJreRange(min = JAVA_15) // Nashorn JavaScript engine removed in Java 15
|
||||
public class NashornScriptTemplateTests {
|
||||
|
||||
private WebApplicationContext webAppContext;
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright 2002-2019 the original author or authors.
|
||||
* Copyright 2002-2020 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.
|
||||
|
|
@ -31,6 +31,7 @@ import javax.script.ScriptEngine;
|
|||
|
||||
import org.junit.jupiter.api.BeforeEach;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.junit.jupiter.api.condition.DisabledForJreRange;
|
||||
|
||||
import org.springframework.beans.DirectFieldAccessor;
|
||||
import org.springframework.context.ApplicationContextException;
|
||||
|
|
@ -46,6 +47,7 @@ import org.springframework.web.testfixture.servlet.MockServletContext;
|
|||
import static org.assertj.core.api.Assertions.assertThat;
|
||||
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
|
||||
import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
|
||||
import static org.junit.jupiter.api.condition.JRE.JAVA_15;
|
||||
import static org.mockito.ArgumentMatchers.any;
|
||||
import static org.mockito.BDDMockito.given;
|
||||
import static org.mockito.Mockito.mock;
|
||||
|
|
@ -55,6 +57,7 @@ import static org.mockito.Mockito.mock;
|
|||
*
|
||||
* @author Sebastien Deleuze
|
||||
*/
|
||||
@DisabledForJreRange(min = JAVA_15) // Nashorn JavaScript engine removed in Java 15
|
||||
public class ScriptTemplateViewTests {
|
||||
|
||||
private ScriptTemplateView view;
|
||||
|
|
|
|||
Loading…
Reference in New Issue