You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ti...@apache.org on 2022/03/27 09:34:26 UTC
[maven-surefire] branch SUREFIRE-2040 updated: added unit tests
This is an automated email from the ASF dual-hosted git repository.
tibordigana pushed a commit to branch SUREFIRE-2040
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git
The following commit(s) were added to refs/heads/SUREFIRE-2040 by this push:
new 1e3715f added unit tests
1e3715f is described below
commit 1e3715f45c67c5b7192bc59f4c01a2db183e4544
Author: tibordigana <ti...@apache.org>
AuthorDate: Sun Mar 27 11:34:16 2022 +0200
added unit tests
---
.../junitplatform/JUnitPlatformProvider.java | 10 ++--
.../junitplatform/JUnitPlatformProviderTest.java | 53 ++++++++++++++++++++++
2 files changed, 58 insertions(+), 5 deletions(-)
diff --git a/surefire-providers/surefire-junit-platform/src/main/java/org/apache/maven/surefire/junitplatform/JUnitPlatformProvider.java b/surefire-providers/surefire-junit-platform/src/main/java/org/apache/maven/surefire/junitplatform/JUnitPlatformProvider.java
index efcf719..a376298 100644
--- a/surefire-providers/surefire-junit-platform/src/main/java/org/apache/maven/surefire/junitplatform/JUnitPlatformProvider.java
+++ b/surefire-providers/surefire-junit-platform/src/main/java/org/apache/maven/surefire/junitplatform/JUnitPlatformProvider.java
@@ -276,11 +276,11 @@ public class JUnitPlatformProvider
.map( TagFilter::excludeTags )
.ifPresent( filters::add );
- TestListResolver filter = optionallyWildcardFilter( parameters.getTestRequest().getTestListResolver() );
- if ( !filter.isEmpty() && !filter.isWildcard() )
- {
- filters.add( new TestMethodFilter( filter ) );
- }
+ of( optionallyWildcardFilter( parameters.getTestRequest().getTestListResolver() ) )
+ .filter( f -> !f.isEmpty() )
+ .filter( f -> !f.isWildcard() )
+ .map( TestMethodFilter::new )
+ .ifPresent( filters::add );
getPropertiesList( INCLUDE_JUNIT5_ENGINES_PROP )
.map( EngineFilter::includeEngines )
diff --git a/surefire-providers/surefire-junit-platform/src/test/java/org/apache/maven/surefire/junitplatform/JUnitPlatformProviderTest.java b/surefire-providers/surefire-junit-platform/src/test/java/org/apache/maven/surefire/junitplatform/JUnitPlatformProviderTest.java
index c0b5e7b..179db2a 100644
--- a/surefire-providers/surefire-junit-platform/src/test/java/org/apache/maven/surefire/junitplatform/JUnitPlatformProviderTest.java
+++ b/surefire-providers/surefire-junit-platform/src/test/java/org/apache/maven/surefire/junitplatform/JUnitPlatformProviderTest.java
@@ -29,6 +29,7 @@ import static org.apache.maven.surefire.api.booter.ProviderParameterNames.EXCLUD
import static org.apache.maven.surefire.api.report.RunMode.NORMAL_RUN;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -43,6 +44,7 @@ import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import static org.mockito.Mockito.withSettings;
+import static org.powermock.reflect.Whitebox.getInternalState;
import java.io.PrintStream;
import java.util.ArrayList;
@@ -892,6 +894,57 @@ public class JUnitPlatformProviderTest
}
@Test
+ public void shouldFilterTestMethod()
+ {
+ ProviderParameters providerParameters = providerParametersMock();
+ TestListResolver testListResolver = new TestListResolver( "**/*Test#test*" );
+ assertFalse( testListResolver.isEmpty() );
+ assertFalse( testListResolver.isWildcard() );
+ TestRequest request = new TestRequest( null, null, testListResolver, 0 );
+ when( providerParameters.getTestRequest() ).thenReturn( request );
+
+ JUnitPlatformProvider provider = new JUnitPlatformProvider( providerParameters );
+
+ assertEquals( provider.getFilters().length, 1 );
+
+ assertThat( provider.getFilters()[0] )
+ .isInstanceOf( TestMethodFilter.class );
+
+ assertThat( (TestListResolver) getInternalState( provider.getFilters()[0], "testListResolver" ) )
+ .isSameAs( testListResolver );
+ }
+
+ @Test
+ public void shouldNotFilterEmpty()
+ {
+ ProviderParameters providerParameters = providerParametersMock();
+ TestListResolver testListResolver = new TestListResolver( "" );
+ assertTrue( testListResolver.isEmpty() );
+ assertFalse( testListResolver.isWildcard() );
+ TestRequest request = new TestRequest( null, null, testListResolver, 0 );
+ when( providerParameters.getTestRequest() ).thenReturn( request );
+
+ JUnitPlatformProvider provider = new JUnitPlatformProvider( providerParameters );
+
+ assertEquals( provider.getFilters().length, 0 );
+ }
+
+ @Test
+ public void shouldNotFilterWildcard()
+ {
+ ProviderParameters providerParameters = providerParametersMock();
+ TestListResolver testListResolver = new TestListResolver( "*.java" );
+ assertTrue( testListResolver.isWildcard() );
+ assertFalse( testListResolver.isEmpty() );
+ TestRequest request = new TestRequest( null, null, testListResolver, 0 );
+ when( providerParameters.getTestRequest() ).thenReturn( request );
+
+ JUnitPlatformProvider provider = new JUnitPlatformProvider( providerParameters );
+
+ assertEquals( provider.getFilters().length, 0 );
+ }
+
+ @Test
public void executesSingleTestIncludedByName()
throws Exception
{