This is an automated email from the ASF dual-hosted git repository. tibordigana pushed a commit to branch release/2.22.3 in repository https://gitbox.apache.org/repos/asf/maven-surefire.git
commit bb839bb9406f89dc28a51499a2d739ba77f372df Author: Tibor Digaňa <[email protected]> AuthorDate: Sun Jan 23 20:57:40 2022 +0100 enabled and fixed tests in surefire-junit-platform --- surefire-providers/surefire-junit-platform/pom.xml | 4 ++ .../surefire/junitplatform/JUnit47SuiteTest.java | 44 ++++++++++++++++++++++ .../junitplatform/RunListenerAdapterTest.java | 5 ++- .../junitplatform/TestMethodFilterTest.java | 5 ++- 4 files changed, 56 insertions(+), 2 deletions(-) diff --git a/surefire-providers/surefire-junit-platform/pom.xml b/surefire-providers/surefire-junit-platform/pom.xml index b50dc6d..da34605 100644 --- a/surefire-providers/surefire-junit-platform/pom.xml +++ b/surefire-providers/surefire-junit-platform/pom.xml @@ -138,6 +138,10 @@ <artifactId>maven-surefire-plugin</artifactId> <configuration> <jvm>${java.home}/bin/java</jvm> + <redirectTestOutputToFile>true</redirectTestOutputToFile> + <includes> + <include>**/JUnit47SuiteTest.java</include> + </includes> </configuration> </plugin> <plugin> diff --git a/surefire-providers/surefire-junit-platform/src/test/java/org/apache/maven/surefire/junitplatform/JUnit47SuiteTest.java b/surefire-providers/surefire-junit-platform/src/test/java/org/apache/maven/surefire/junitplatform/JUnit47SuiteTest.java new file mode 100644 index 0000000..6e56760 --- /dev/null +++ b/surefire-providers/surefire-junit-platform/src/test/java/org/apache/maven/surefire/junitplatform/JUnit47SuiteTest.java @@ -0,0 +1,44 @@ +package org.apache.maven.surefire.junitplatform; + +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import junit.framework.JUnit4TestAdapter; +import junit.framework.Test; +import org.junit.runner.RunWith; +import org.junit.runners.Suite; +import org.junit.runners.Suite.SuiteClasses; + +/** + * + */ +@SuiteClasses( { + JUnitPlatformProviderTest.class, + RunListenerAdapterTest.class, + TestMethodFilterTest.class, + TestPlanScannerFilterTest.class +} ) +@RunWith( Suite.class ) +public class JUnit47SuiteTest +{ + public static Test suite() + { + return new JUnit4TestAdapter( JUnit47SuiteTest.class ); + } +} diff --git a/surefire-providers/surefire-junit-platform/src/test/java/org/apache/maven/surefire/junitplatform/RunListenerAdapterTest.java b/surefire-providers/surefire-junit-platform/src/test/java/org/apache/maven/surefire/junitplatform/RunListenerAdapterTest.java index a6cbddd..a0ba6b7 100644 --- a/surefire-providers/surefire-junit-platform/src/test/java/org/apache/maven/surefire/junitplatform/RunListenerAdapterTest.java +++ b/surefire-providers/surefire-junit-platform/src/test/java/org/apache/maven/surefire/junitplatform/RunListenerAdapterTest.java @@ -46,9 +46,11 @@ import org.apache.maven.surefire.report.SimpleReportEntry; import org.junit.Before; import org.junit.Test; import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.engine.config.DefaultJupiterConfiguration; import org.junit.jupiter.engine.config.JupiterConfiguration; import org.junit.jupiter.engine.descriptor.ClassTestDescriptor; import org.junit.jupiter.engine.descriptor.TestMethodTestDescriptor; +import org.junit.platform.engine.ConfigurationParameters; import org.junit.platform.engine.TestDescriptor; import org.junit.platform.engine.TestDescriptor.Type; import org.junit.platform.engine.TestExecutionResult; @@ -69,7 +71,8 @@ import org.mockito.InOrder; */ public class RunListenerAdapterTest { - private static final JupiterConfiguration JUPITER_CONFIGURATION = mock(JupiterConfiguration.class); + private static final JupiterConfiguration JUPITER_CONFIGURATION = + new DefaultJupiterConfiguration( mock( ConfigurationParameters.class ) ); private RunListener listener; diff --git a/surefire-providers/surefire-junit-platform/src/test/java/org/apache/maven/surefire/junitplatform/TestMethodFilterTest.java b/surefire-providers/surefire-junit-platform/src/test/java/org/apache/maven/surefire/junitplatform/TestMethodFilterTest.java index 3633faa..b5cb528 100644 --- a/surefire-providers/surefire-junit-platform/src/test/java/org/apache/maven/surefire/junitplatform/TestMethodFilterTest.java +++ b/surefire-providers/surefire-junit-platform/src/test/java/org/apache/maven/surefire/junitplatform/TestMethodFilterTest.java @@ -29,9 +29,11 @@ import java.lang.reflect.Method; import org.apache.maven.surefire.testset.TestListResolver; import org.junit.Test; +import org.junit.jupiter.engine.config.DefaultJupiterConfiguration; import org.junit.jupiter.engine.config.JupiterConfiguration; import org.junit.jupiter.engine.descriptor.ClassTestDescriptor; import org.junit.jupiter.engine.descriptor.TestMethodTestDescriptor; +import org.junit.platform.engine.ConfigurationParameters; import org.junit.platform.engine.FilterResult; import org.junit.platform.engine.UniqueId; @@ -42,7 +44,8 @@ import org.junit.platform.engine.UniqueId; */ public class TestMethodFilterTest { - private static final JupiterConfiguration JUPITER_CONFIGURATION = mock(JupiterConfiguration.class); + private static final JupiterConfiguration JUPITER_CONFIGURATION = + new DefaultJupiterConfiguration( mock( ConfigurationParameters.class ) ); private final TestListResolver resolver = mock( TestListResolver.class );
