Skip to content
This repository has been archived by the owner on Aug 11, 2020. It is now read-only.

Commit

Permalink
Merge pull request #2 from demobox/master
Browse files Browse the repository at this point in the history
Added an integration test for the multiple reports feature from ndeloof/master
  • Loading branch information
velo committed Jul 12, 2011
2 parents 946ebe2 + c48add5 commit 01a906a
Show file tree
Hide file tree
Showing 14 changed files with 355 additions and 128 deletions.
12 changes: 8 additions & 4 deletions pom.xml
Expand Up @@ -6,7 +6,7 @@
<version>5</version>
</parent>

<groupId>org.sonatype.maven.plugin</groupId>
<groupId>org.sonatype.maven.plugin</groupId>
<artifactId>emma-maven-plugin</artifactId>
<version>1.3-SNAPSHOT</version>
<inceptionYear>2007</inceptionYear>
Expand Down Expand Up @@ -129,6 +129,9 @@
<projectsDirectory>
src/it
</projectsDirectory>
<cloneProjectsTo>
${project.build.directory}/it
</cloneProjectsTo>
<goals>
<goal>site</goal>
<goal>verify</goal>
Expand All @@ -150,9 +153,9 @@
**/it03/b/pom.xml
</pomExclude>
<!-- it05 is supposed to fail -->
<pomExclude>
**/it05/pom.xml
</pomExclude>
<pomExclude>
**/it05/pom.xml
</pomExclude>
</pomExcludes>
<postBuildHookScript>
verify.bsh
Expand All @@ -163,6 +166,7 @@
<id>integration-test</id>
<phase>integration-test</phase>
<goals>
<goal>install</goal>
<goal>run</goal>
</goals>
</execution>
Expand Down
56 changes: 48 additions & 8 deletions src/it/it01/pom.xml
Expand Up @@ -15,12 +15,52 @@
<scope>test</scope>
</dependency>
</dependencies>
<reporting>
<plugins>
<plugin>
<groupId>org.sonatype.maven.plugin</groupId>
<artifactId>emma-maven-plugin</artifactId>
</plugin>
</plugins>
</reporting>
<profiles>
<profile>
<id>maven-2</id>
<activation>
<file>
<!-- only recognized by Maven 3.x (see MNG-2363) -->
<missing>${basedir}</missing>
</file>
</activation>
<reporting>
<plugins>
<plugin>
<groupId>org.sonatype.maven.plugin</groupId>
<artifactId>emma-maven-plugin</artifactId>
<version>@project.version@</version>
</plugin>
</plugins>
</reporting>
</profile>
<profile>
<id>maven-3</id>
<activation>
<file>
<!-- only recognized by Maven 3.x (see MNG-2363) -->
<exists>${basedir}</exists>
</file>
</activation>
<build>
<pluginManagement>
<plugins>
<plugin>
<artifactId>maven-site-plugin</artifactId>
<version>3.0-beta-3</version>
<configuration>
<reportPlugins>
<plugin>
<groupId>org.sonatype.maven.plugin</groupId>
<artifactId>emma-maven-plugin</artifactId>
<version>@project.version@</version>
</plugin>
</reportPlugins>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>
</profile>
</profiles>
</project>
98 changes: 76 additions & 22 deletions src/it/it02/pom.xml
Expand Up @@ -55,26 +55,80 @@
</plugin>
</plugins>
</build>
<reporting>
<plugins>
<plugin>
<groupId>org.sonatype.maven.plugin</groupId>
<artifactId>emma-maven-plugin</artifactId>
<configuration>
<instrumentationPaths>
<intrumentationPath>${project.build.outputDirectory}</intrumentationPath>
<intrumentationPath>${project.build.directory}/dependency</intrumentationPath>
</instrumentationPaths>
<filters>
<filter>+org.apache.commons.lang.StringUtils</filter>
<filter>+hello.*</filter>
</filters>
<sourcePaths>
<sourcePath>src/main/java</sourcePath>
<sourcePath>${project.build.directory}/dependency-sources</sourcePath>
</sourcePaths>
</configuration>
</plugin>
</plugins>
</reporting>
<profiles>
<profile>
<id>maven-2</id>
<activation>
<file>
<!-- only recognized by Maven 3.x (see MNG-2363) -->
<missing>${basedir}</missing>
</file>
</activation>
<reporting>
<plugins>
<plugin>
<groupId>org.sonatype.maven.plugin</groupId>
<artifactId>emma-maven-plugin</artifactId>
<version>@project.version@</version>
<configuration>
<instrumentationPaths>
<intrumentationPath>${project.build.outputDirectory}</intrumentationPath>
<intrumentationPath>${project.build.directory}/dependency</intrumentationPath>
</instrumentationPaths>
<filters>
<filter>+org.apache.commons.lang.StringUtils</filter>
<filter>+hello.*</filter>
</filters>
<sourcePaths>
<sourcePath>src/main/java</sourcePath>
<sourcePath>${project.build.directory}/dependency-sources</sourcePath>
</sourcePaths>
</configuration>
</plugin>
</plugins>
</reporting>
</profile>
<profile>
<id>maven-3</id>
<activation>
<file>
<!-- only recognized by Maven 3.x (see MNG-2363) -->
<exists>${basedir}</exists>
</file>
</activation>
<build>
<pluginManagement>
<plugins>
<plugin>
<artifactId>maven-site-plugin</artifactId>
<version>3.0-beta-3</version>
<configuration>
<reportPlugins>
<plugin>
<groupId>org.sonatype.maven.plugin</groupId>
<artifactId>emma-maven-plugin</artifactId>
<version>@project.version@</version>
<configuration>
<instrumentationPaths>
<intrumentationPath>${project.build.outputDirectory}</intrumentationPath>
<intrumentationPath>${project.build.directory}/dependency</intrumentationPath>
</instrumentationPaths>
<filters>
<filter>+org.apache.commons.lang.StringUtils</filter>
<filter>+hello.*</filter>
</filters>
<sourcePaths>
<sourcePath>src/main/java</sourcePath>
<sourcePath>${project.build.directory}/dependency-sources</sourcePath>
</sourcePaths>
</configuration>
</plugin>
</reportPlugins>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>
</profile>
</profiles>
</project>
17 changes: 0 additions & 17 deletions src/it/it03/a/.project

This file was deleted.

17 changes: 0 additions & 17 deletions src/it/it03/b/.project

This file was deleted.

74 changes: 60 additions & 14 deletions src/it/it03/pom.xml
Expand Up @@ -26,20 +26,66 @@
<scope>test</scope>
</dependency>
</dependencies>
<reporting>
<plugins>
<plugin>
<groupId>org.sonatype.maven.plugin</groupId>
<artifactId>emma-maven-plugin</artifactId>
<configuration>
<filters>
<filter>+hello.*</filter>
<filter>+byebye.*</filter>
</filters>
</configuration>
</plugin>
</plugins>
</reporting>
<profiles>
<profile>
<id>maven-2</id>
<activation>
<file>
<!-- only recognized by Maven 3.x (see MNG-2363) -->
<missing>${basedir}</missing>
</file>
</activation>
<reporting>
<plugins>
<plugin>
<groupId>org.sonatype.maven.plugin</groupId>
<artifactId>emma-maven-plugin</artifactId>
<version>@project.version@</version>
<configuration>
<filters>
<filter>+hello.*</filter>
<filter>+byebye.*</filter>
</filters>
</configuration>
</plugin>
</plugins>
</reporting>
</profile>
<profile>
<id>maven-3</id>
<activation>
<file>
<!-- only recognized by Maven 3.x (see MNG-2363) -->
<exists>${basedir}</exists>
</file>
</activation>
<build>
<pluginManagement>
<plugins>
<plugin>
<artifactId>maven-site-plugin</artifactId>
<version>3.0-beta-3</version>
<configuration>
<reportPlugins>
<plugin>
<groupId>org.sonatype.maven.plugin</groupId>
<artifactId>emma-maven-plugin</artifactId>
<version>@project.version@</version>
<configuration>
<filters>
<filter>+hello.*</filter>
<filter>+byebye.*</filter>
</filters>
</configuration>
</plugin>
</reportPlugins>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>
</profile>
</profiles>
<modules>
<module>a</module>
<module>b</module>
Expand Down
39 changes: 20 additions & 19 deletions src/it/it04/pom.xml
Expand Up @@ -16,24 +16,25 @@
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.sonatype.maven.plugin</groupId>
<artifactId>emma-maven-plugin</artifactId>
<configuration>
<check>
<lineRate>90</lineRate>
</check>
</configuration>
<executions>
<execution>
<goals>
<goal>clean</goal>
<goal>check</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
<plugins>
<plugin>
<groupId>org.sonatype.maven.plugin</groupId>
<artifactId>emma-maven-plugin</artifactId>
<version>@project.version@</version>
<configuration>
<check>
<lineRate>90</lineRate>
</check>
</configuration>
<executions>
<execution>
<goals>
<goal>clean</goal>
<goal>check</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>

0 comments on commit 01a906a

Please sign in to comment.