Adding junit5 runners - fix stream

PaulienVa · Nov 24, 2020 · e875fd3 · e875fd3
1 parent 2fe0ca4
commit e875fd3
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 37 deletions.
diff --git a/pom.xml b/pom.xml
@@ -22,6 +22,7 @@
 		<assertj.version>3.9.0</assertj.version>
 		<mockito.version>3.6.0</mockito.version>
 		<pitest.version>1.5.2</pitest.version>
+		<junit-jupiter.version>5.6.3</junit-jupiter.version>
 	</properties>
 
 	<scm>
@@ -119,6 +120,19 @@
 			<scope>test</scope>
 		</dependency>
 
+		<dependency>
+			<groupId>org.junit.jupiter</groupId>
+			<artifactId>junit-jupiter-api</artifactId>
+			<version>${junit-jupiter.version}</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.junit.jupiter</groupId>
+			<artifactId>junit-jupiter-engine</artifactId>
+			<version>${junit-jupiter.version}</version>
+			<scope>test</scope>
+		</dependency>
+
 
 		<dependency>
 			<groupId>org.pitest</groupId>
@@ -137,8 +151,6 @@
 	</dependencies>
 
 	<build>
-
-
 		<plugins>
 			<plugin>
 				<groupId>org.jetbrains.kotlin</groupId>
@@ -166,38 +178,41 @@
 						</goals>
 					</execution>
 				</executions>
-				<configuration>
-					<jvmTarget>1.8</jvmTarget>
-				</configuration>
 			</plugin>
-
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jar-plugin</artifactId>
-				<version>3.2.0</version>
-				<configuration>
-					<archive>
-						<manifest>
-							<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-						</manifest>
-						<manifestEntries>
-							<Implementation-Vendor>${project.groupId}</Implementation-Vendor>
-							<Implementation-Title>${project.artifactId}</Implementation-Title>
-						</manifestEntries>
-					</archive>
-				</configuration>
-			</plugin>
-			<plugin>
-				<artifactId>maven-release-plugin</artifactId>
-				<version>2.5.3</version>
-				<dependencies>
-					<dependency>
-						<groupId>org.apache.maven.scm</groupId>
-						<artifactId>maven-scm-provider-gitexe</artifactId>
-						<version>1.11.2</version>
-					</dependency>
-				</dependencies>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<version>2.22.2</version>
 			</plugin>
+
+
+<!--			<plugin>-->
+<!--				<groupId>org.apache.maven.plugins</groupId>-->
+<!--				<artifactId>maven-jar-plugin</artifactId>-->
+<!--				<version>3.2.0</version>-->
+<!--				<configuration>-->
+<!--					<archive>-->
+<!--						<manifest>-->
+<!--							<addDefaultImplementationEntries>true</addDefaultImplementationEntries>-->
+<!--						</manifest>-->
+<!--						<manifestEntries>-->
+<!--							<Implementation-Vendor>${project.groupId}</Implementation-Vendor>-->
+<!--							<Implementation-Title>${project.artifactId}</Implementation-Title>-->
+<!--						</manifestEntries>-->
+<!--					</archive>-->
+<!--				</configuration>-->
+<!--			</plugin>-->
+<!--			<plugin>-->
+<!--				<artifactId>maven-release-plugin</artifactId>-->
+<!--				<version>2.5.3</version>-->
+<!--				<dependencies>-->
+<!--					<dependency>-->
+<!--						<groupId>org.apache.maven.scm</groupId>-->
+<!--						<artifactId>maven-scm-provider-gitexe</artifactId>-->
+<!--						<version>1.11.2</version>-->
+<!--					</dependency>-->
+<!--				</dependencies>-->
+<!--			</plugin>-->
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-source-plugin</artifactId>
@@ -212,10 +227,6 @@
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
 				<version>3.8.1</version>
-				<configuration>
-					<source>1.8</source>
-					<target>1.8</target>
-				</configuration>
 				<executions>
 					<execution>
 						<id>compile</id>

diff --git a/src/main/java/org/pitest/kotlin/KotlinInterceptor.java b/src/main/java/org/pitest/kotlin/KotlinInterceptor.java
@@ -143,9 +143,7 @@ public InterceptorType type() {
   public void begin(ClassTree clazz) {
     currentClass = clazz;
     isKotlinClass = clazz.annotations().stream()
-        .filter(annotationNode -> annotationNode.desc.equals("Lkotlin/Metadata;"))
-        .findFirst()
-        .isPresent();
+        .anyMatch(annotationNode -> annotationNode.desc.equals("Lkotlin/Metadata;"));
   }
 
   @Override