From 84170260ef5000913c2604bd40eb9bf2d1c6a887 Mon Sep 17 00:00:00 2001 From: Rossen Stoyanchev Date: Tue, 28 Apr 2020 18:12:59 +0100 Subject: [PATCH] All tests are executing again Following the upgrade to JUnit 5 in gh-99, only the few remaining older style tests extending from TestCase were being executed. This change ensures JUnit 5 tests are executing as well. --- build.gradle | 6 ++++-- .../org/springframework/faces/webflow/JsfUtilsTests.java | 2 +- .../expression/el/FlowDependentELResolverTestCase.java | 9 ++++++--- .../expression/el/FlowResourceELResolverTests.java | 1 - 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index 38ea4884..64398abc 100644 --- a/build.gradle +++ b/build.gradle @@ -89,9 +89,11 @@ configure(subprojects.findAll { testRuntime("org.apache.logging.log4j:log4j-jul:${log4jVersion}") } - tasks.withType(Test).all { + test { + useJUnitPlatform() + include(["**/*Tests.class", "**/*Test.class"]) systemProperty("java.awt.headless", "true") - include "**/*Tests.class" + systemProperty("testGroups", project.properties.get("testGroups")) } javadoc { diff --git a/spring-faces/src/test/java/org/springframework/faces/webflow/JsfUtilsTests.java b/spring-faces/src/test/java/org/springframework/faces/webflow/JsfUtilsTests.java index f28161bf..b887b289 100644 --- a/spring-faces/src/test/java/org/springframework/faces/webflow/JsfUtilsTests.java +++ b/spring-faces/src/test/java/org/springframework/faces/webflow/JsfUtilsTests.java @@ -19,7 +19,7 @@ import org.apache.myfaces.test.mock.MockFacesContextFactory; import org.apache.myfaces.test.mock.MockRenderKitFactory; import org.apache.myfaces.test.mock.lifecycle.MockLifecycle; import org.apache.myfaces.test.mock.lifecycle.MockLifecycleFactory; -import org.junit.jupiter.api.Test; +import org.junit.Test; public class JsfUtilsTests extends AbstractJsfTestCase { diff --git a/spring-webflow/src/test/java/org/springframework/webflow/expression/el/FlowDependentELResolverTestCase.java b/spring-webflow/src/test/java/org/springframework/webflow/expression/el/FlowDependentELResolverTestCase.java index bd43dfaa..a4fc4024 100644 --- a/spring-webflow/src/test/java/org/springframework/webflow/expression/el/FlowDependentELResolverTestCase.java +++ b/spring-webflow/src/test/java/org/springframework/webflow/expression/el/FlowDependentELResolverTestCase.java @@ -1,15 +1,14 @@ package org.springframework.webflow.expression.el; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertNull; - import java.util.List; + import javax.el.ELContext; import javax.el.ELResolver; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; + import org.springframework.binding.expression.el.DefaultELContext; import org.springframework.binding.expression.el.DefaultELResolver; import org.springframework.webflow.engine.ViewState; @@ -17,12 +16,16 @@ import org.springframework.webflow.execution.RequestContextHolder; import org.springframework.webflow.test.MockFlowSession; import org.springframework.webflow.test.MockRequestContext; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNull; + public abstract class FlowDependentELResolverTestCase { protected ELContext context; @BeforeEach public void setUp() { + RequestContextHolder.setRequestContext(null); context = new DefaultELContext(new DefaultELResolver(getCustomResolvers()), null, null); } diff --git a/spring-webflow/src/test/java/org/springframework/webflow/expression/el/FlowResourceELResolverTests.java b/spring-webflow/src/test/java/org/springframework/webflow/expression/el/FlowResourceELResolverTests.java index 4f1d2cc9..61c96587 100644 --- a/spring-webflow/src/test/java/org/springframework/webflow/expression/el/FlowResourceELResolverTests.java +++ b/spring-webflow/src/test/java/org/springframework/webflow/expression/el/FlowResourceELResolverTests.java @@ -23,7 +23,6 @@ import org.springframework.webflow.test.MockRequestContext; public class FlowResourceELResolverTests extends FlowDependentELResolverTestCase { - @Override @AfterEach public void tearDown() { RequestContextHolder.setRequestContext(null);