Skip to content

Refactor it-tests a bit #336

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 13, 2024
Merged

Refactor it-tests a bit #336

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 26 additions & 0 deletions src/it/integration_tests_Scala3_parent/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>

<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>it.scoverage-maven-plugin</groupId>
<artifactId>integration_tests_parent</artifactId>
<version>1.0-SNAPSHOT</version>
<relativePath>../integration_tests_parent/pom.xml</relativePath>
</parent>

<artifactId>integration_tests_Scala3_parent</artifactId>
<version>1.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Scoverage Plugin Integration Tests for Scala 3 Parent</name>
<description>Scoverage Plugin Integration Tests for Scala 3 Parent</description>

<properties>
<scala.compat.version>3</scala.compat.version>
<scala.version>3.5.2</scala.version>
<scala.library.artifact.id>scala3-library_3</scala.library.artifact.id>
</properties>

</project>
18 changes: 11 additions & 7 deletions src/it/integration_tests_parent/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,20 +11,24 @@
<name>Scoverage Plugin Integration Tests Parent</name>
<description>Scoverage Plugin Integration Tests Parent</description>

<prerequisites>
<maven>3.6.3</maven>
</prerequisites>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<junit.version>4.13.1</junit.version>
<junit.version>4.13.2</junit.version>
<scalatest.version>3.2.17</scalatest.version>

<compiler.plugin.version>3.11.0</compiler.plugin.version>
<surefire.plugin.version>3.1.2</surefire.plugin.version>
<scala.plugin.version>4.9.1</scala.plugin.version>
<scalatest.plugin.version>2.0.0</scalatest.plugin.version>
<project-info-reports.plugin.version>3.5.0</project-info-reports.plugin.version>
<compiler.plugin.version>3.13.0</compiler.plugin.version>
<surefire.plugin.version>3.5.2</surefire.plugin.version>
<scala.plugin.version>4.9.2</scala.plugin.version>
<scalatest.plugin.version>2.2.0</scalatest.plugin.version>
<project-info-reports.plugin.version>3.8.0</project-info-reports.plugin.version>
<site.plugin.version>3.21.0</site.plugin.version>

<scala.compat.version>2.13</scala.compat.version>
<scala.minor.version>14</scala.minor.version>
<scala.minor.version>15</scala.minor.version>
<scala.version>${scala.compat.version}.${scala.minor.version}</scala.version>
<scala.library.artifact.id>scala-library</scala.library.artifact.id>
</properties>
Expand Down
0 ...est_Scala3_multimodule/invoker.properties → ...Plugin_Scala2_12_JUnit/invoker.properties
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...t_ScalaMavenPlugin_Scala212_JUnit/pom.xml → ..._ScalaMavenPlugin_Scala2_12_JUnit/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<relativePath>../integration_tests_parent/pom.xml</relativePath>
</parent>

<artifactId>test_ScalaMavenPlugin_Scala212_JUnit</artifactId>
<artifactId>test_ScalaMavenPlugin_Scala2_12_JUnit</artifactId>
<version>1.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Test Scoverage Report using scala-maven-plugin, Scala 2.12 and JUnit</name>
Expand Down
0 ...it/src/main/scala/HelloServiceScala.scala → ...it/src/main/scala/HelloServiceScala.scala
View file
Open in desktop
File renamed without changes.
0 ...rc/test/scala/HelloServiceScalaTest.scala → ...rc/test/scala/HelloServiceScalaTest.scala
View file
Open in desktop
File renamed without changes.
0 ...avenPlugin_Scala212_JUnit/validate.groovy → ...venPlugin_Scala2_12_JUnit/validate.groovy
View file
Open in desktop
File renamed without changes.
0 ...nPlugin_Scala212_JUnit/invoker.properties → ...in_Scala2_12_ScalaTest/invoker.properties
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...alaMavenPlugin_Scala212_ScalaTest/pom.xml → ...laMavenPlugin_Scala2_12_ScalaTest/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<relativePath>../integration_tests_parent/pom.xml</relativePath>
</parent>

<artifactId>test_ScalaMavenPlugin_Scala212_ScalaTest</artifactId>
<artifactId>test_ScalaMavenPlugin_Scala2_12_ScalaTest</artifactId>
<version>1.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Test Scoverage Report using scala-maven-plugin, Scala 2.12 and ScalaTest</name>
Expand Down
0 ...st/src/main/scala/HelloServiceScala.scala → ...st/src/main/scala/HelloServiceScala.scala
View file
Open in desktop
File renamed without changes.
0 ...rc/test/scala/HelloServiceScalaTest.scala → ...rc/test/scala/HelloServiceScalaTest.scala
View file
Open in desktop
File renamed without changes.
0 ...Plugin_Scala212_ScalaTest/validate.groovy → ...lugin_Scala2_12_ScalaTest/validate.groovy
View file
Open in desktop
File renamed without changes.
0 ...gin_Scala212_ScalaTest/invoker.properties → ...Plugin_Scala2_13_JUnit/invoker.properties
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...t_ScalaMavenPlugin_Scala213_JUnit/pom.xml → ..._ScalaMavenPlugin_Scala2_13_JUnit/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<relativePath>../integration_tests_parent/pom.xml</relativePath>
</parent>

<artifactId>test_ScalaMavenPlugin_Scala213_JUnit</artifactId>
<artifactId>test_ScalaMavenPlugin_Scala2_13_JUnit</artifactId>
<version>1.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Test Scoverage Report using scala-maven-plugin, Scala 2.13 and JUnit</name>
Expand Down
0 ...it/src/main/scala/HelloServiceScala.scala → ...it/src/main/scala/HelloServiceScala.scala
View file
Open in desktop
File renamed without changes.
0 ...rc/test/scala/HelloServiceScalaTest.scala → ...rc/test/scala/HelloServiceScalaTest.scala
View file
Open in desktop
File renamed without changes.
0 ...avenPlugin_Scala213_JUnit/validate.groovy → ...venPlugin_Scala2_13_JUnit/validate.groovy
View file
Open in desktop
File renamed without changes.
0 ...nPlugin_Scala213_JUnit/invoker.properties → ...in_Scala2_13_ScalaTest/invoker.properties
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...alaMavenPlugin_Scala213_ScalaTest/pom.xml → ...laMavenPlugin_Scala2_13_ScalaTest/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<relativePath>../integration_tests_parent/pom.xml</relativePath>
</parent>

<artifactId>test_ScalaMavenPlugin_Scala213_ScalaTest</artifactId>
<artifactId>test_ScalaMavenPlugin_Scala2_13_ScalaTest</artifactId>
<version>1.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Test Scoverage Report using scala-maven-plugin, Scala 2.13 and ScalaTest</name>
Expand Down
0 ...st/src/main/scala/HelloServiceScala.scala → ...st/src/main/scala/HelloServiceScala.scala
View file
Open in desktop
File renamed without changes.
0 ...rc/test/scala/HelloServiceScalaTest.scala → ...rc/test/scala/HelloServiceScalaTest.scala
View file
Open in desktop
File renamed without changes.
0 ...Plugin_Scala213_ScalaTest/validate.groovy → ...lugin_Scala2_13_ScalaTest/validate.groovy
View file
Open in desktop
File renamed without changes.
0 ...gin_Scala213_ScalaTest/invoker.properties → ...cala3_2_Plus_ScalaTest/invoker.properties
View file
Open in desktop
File renamed without changes.
12 changes: 3 additions & 9 deletions ...MavenPlugin_Scala32Plus_ScalaTest/pom.xml → ...venPlugin_Scala3_2_Plus_ScalaTest/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,23 +6,17 @@

<parent>
<groupId>it.scoverage-maven-plugin</groupId>
<artifactId>integration_tests_parent</artifactId>
<artifactId>integration_tests_Scala3_parent</artifactId>
<version>1.0-SNAPSHOT</version>
<relativePath>../integration_tests_parent/pom.xml</relativePath>
<relativePath>../integration_tests_Scala3_parent/pom.xml</relativePath>
</parent>

<artifactId>test_ScalaMavenPlugin_Scala32Plus_ScalaTest</artifactId>
<artifactId>test_ScalaMavenPlugin_Scala3_2_Plus_ScalaTest</artifactId>
<version>1.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Test Scoverage Report using scala-maven-plugin, Scala 3.2+ and ScalaTest</name>
<description>Test Scoverage Report using scala-maven-plugin, Scala 3.2+ and ScalaTest</description>

<properties>
<scala.compat.version>3</scala.compat.version>
<scala.version>3.3.1</scala.version>
<scala.library.artifact.id>scala3-library_3</scala.library.artifact.id>
</properties>

<build>
<plugins>
<plugin>
Expand Down
0 ...st/src/main/scala/HelloServiceScala.scala → ...st/src/main/scala/HelloServiceScala.scala
View file
Open in desktop
File renamed without changes.
0 ...rc/test/scala/HelloServiceScalaTest.scala → ...rc/test/scala/HelloServiceScalaTest.scala
View file
Open in desktop
File renamed without changes.
0 ...gin_Scala32Plus_ScalaTest/validate.groovy → ...n_Scala3_2_Plus_ScalaTest/validate.groovy
View file
Open in desktop
File renamed without changes.
0 ..._Scala32Plus_ScalaTest/invoker.properties → ...t_ScalaVersion_Not_Set/invoker.properties
View file
Open in desktop
File renamed without changes.
10 changes: 4 additions & 6 deletions ...us_ScalaTest_ScalaVersion_Not_Set/pom.xml → ...us_ScalaTest_ScalaVersion_Not_Set/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,28 +6,26 @@

<parent>
<groupId>it.scoverage-maven-plugin</groupId>
<artifactId>integration_tests_parent</artifactId>
<artifactId>integration_tests_Scala3_parent</artifactId>
<version>1.0-SNAPSHOT</version>
<relativePath>../integration_tests_parent/pom.xml</relativePath>
<relativePath>../integration_tests_Scala3_parent/pom.xml</relativePath>
</parent>

<artifactId>test_ScalaMavenPlugin_Scala32Plus_ScalaTest_ScalaVersion_Not_Set</artifactId>
<artifactId>test_ScalaMavenPlugin_Scala3_2_Plus_ScalaTest_ScalaVersion_Not_Set</artifactId>
<version>1.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Test Scoverage Report using scala-maven-plugin, Scala 3.2+ and ScalaTest when scala.version is not set</name>
<description>Test Scoverage Report using scala-maven-plugin, Scala 3.2+ and ScalaTest when scala.version is not set</description>

<properties>
<scala.compat.version>3</scala.compat.version>
<scala.version/>
<scala.library.artifact.id>scala3-library_3</scala.library.artifact.id>
</properties>

<dependencies>
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>${scala.library.artifact.id}</artifactId>
<version>3.3.1</version>
<version>3.5.2</version>
</dependency>
</dependencies>

Expand Down
0 ...et/src/main/scala/HelloServiceScala.scala → ...et/src/main/scala/HelloServiceScala.scala
View file
Open in desktop
File renamed without changes.
0 ...rc/test/scala/HelloServiceScalaTest.scala → ...rc/test/scala/HelloServiceScalaTest.scala
View file
Open in desktop
File renamed without changes.
0 ...Test_ScalaVersion_Not_Set/validate.groovy → ...Test_ScalaVersion_Not_Set/validate.groovy
View file
Open in desktop
File renamed without changes.
0 ...t_ScalaVersion_Not_Set/invoker.properties → .../test_aggregate_Scala3/invoker.properties
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion .../test_Scala3_multimodule/module01/pom.xml → ...it/test_aggregate_Scala3/module01/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<parent>
<groupId>it.scoverage-maven-plugin</groupId>
<artifactId>test_Scala3_multimodule</artifactId>
<artifactId>test_aggregate_Scala3</artifactId>
<version>1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Expand Down
0 .../src/main/scala/pkg01/HelloService1.scala → .../src/main/scala/pkg01/HelloService1.scala
View file
Open in desktop
File renamed without changes.
0 ...c/test/scala/pkg01/HelloServiceTest.scala → ...c/test/scala/pkg01/HelloServiceTest.scala
View file
Open in desktop
File renamed without changes.
13 changes: 3 additions & 10 deletions src/it/test_Scala3_multimodule/pom.xml → src/it/test_aggregate_Scala3/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,24 +6,17 @@

<parent>
<groupId>it.scoverage-maven-plugin</groupId>
<artifactId>integration_tests_parent</artifactId>
<artifactId>integration_tests_Scala3_parent</artifactId>
<version>1.0-SNAPSHOT</version>
<relativePath>../integration_tests_parent/pom.xml</relativePath>
<relativePath>../integration_tests_Scala3_parent/pom.xml</relativePath>
</parent>

<artifactId>test_Scala3_multimodule</artifactId>
<artifactId>test_aggregate_Scala3</artifactId>
<version>1.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Test Scala 3 Multi-Module</name>
<description>Test Scala 3 Multi-Module</description>

<properties>
<scala.compat.version>3</scala.compat.version>
<scala.version>3.3.1</scala.version>
<scala.library.artifact.id>scala3-library_3</scala.library.artifact.id>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

<modules>
<module>module01</module>
</modules>
Expand Down
0 ...t/test_Scala3_multimodule/validate.groovy → src/it/test_aggregate_Scala3/validate.groovy
View file
Open in desktop
File renamed without changes.
7 changes: 2 additions & 5 deletions src/it/test_exclusion_Scala3_3_3/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@

<parent>
<groupId>it.scoverage-maven-plugin</groupId>
<artifactId>integration_tests_parent</artifactId>
<artifactId>integration_tests_Scala3_parent</artifactId>
<version>1.0-SNAPSHOT</version>
<relativePath>../integration_tests_parent/pom.xml</relativePath>
<relativePath>../integration_tests_Scala3_parent/pom.xml</relativePath>
</parent>

<artifactId>test_exclusion</artifactId>
Expand All @@ -18,10 +18,7 @@
<description>Test Scoverage exclusion</description>

<properties>
<scala.compat.version>3</scala.compat.version>
<scala.version>3.3.3</scala.version>
<scala.library.artifact.id>scala3-library_3</scala.library.artifact.id>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

<build>
Expand Down
7 changes: 2 additions & 5 deletions src/it/test_exclusion_Scala3_3_4/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@

<parent>
<groupId>it.scoverage-maven-plugin</groupId>
<artifactId>integration_tests_parent</artifactId>
<artifactId>integration_tests_Scala3_parent</artifactId>
<version>1.0-SNAPSHOT</version>
<relativePath>../integration_tests_parent/pom.xml</relativePath>
<relativePath>../integration_tests_Scala3_parent/pom.xml</relativePath>
</parent>

<artifactId>test_exclusion</artifactId>
Expand All @@ -18,10 +18,7 @@
<description>Test Scoverage exclusion</description>

<properties>
<scala.compat.version>3</scala.compat.version>
<scala.version>3.3.4</scala.version>
<scala.library.artifact.id>scala3-library_3</scala.library.artifact.id>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

<build>
Expand Down
7 changes: 2 additions & 5 deletions src/it/test_exclusion_Scala3_4_1/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@

<parent>
<groupId>it.scoverage-maven-plugin</groupId>
<artifactId>integration_tests_parent</artifactId>
<artifactId>integration_tests_Scala3_parent</artifactId>
<version>1.0-SNAPSHOT</version>
<relativePath>../integration_tests_parent/pom.xml</relativePath>
<relativePath>../integration_tests_Scala3_parent/pom.xml</relativePath>
</parent>

<artifactId>test_exclusion</artifactId>
Expand All @@ -18,10 +18,7 @@
<description>Test Scoverage exclusion</description>

<properties>
<scala.compat.version>3</scala.compat.version>
<scala.version>3.4.1</scala.version>
<scala.library.artifact.id>scala3-library_3</scala.library.artifact.id>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

<build>
Expand Down
7 changes: 2 additions & 5 deletions src/it/test_exclusion_Scala3_4_2/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@

<parent>
<groupId>it.scoverage-maven-plugin</groupId>
<artifactId>integration_tests_parent</artifactId>
<artifactId>integration_tests_Scala3_parent</artifactId>
<version>1.0-SNAPSHOT</version>
<relativePath>../integration_tests_parent/pom.xml</relativePath>
<relativePath>../integration_tests_Scala3_parent/pom.xml</relativePath>
</parent>

<artifactId>test_exclusion</artifactId>
Expand All @@ -18,10 +18,7 @@
<description>Test Scoverage exclusion</description>

<properties>
<scala.compat.version>3</scala.compat.version>
<scala.version>3.4.2</scala.version>
<scala.library.artifact.id>scala3-library_3</scala.library.artifact.id>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

<build>
Expand Down