Skip to content
Browse files

adding jacoco profiles

  • Loading branch information...
1 parent 82c7f43 commit 7b4c5c0a7553ba8d0e301c6f0cc7b1dd5d3c70fc @maschmid maschmid committed with alesj
View
3 examples/jsf/login/src/ftest/resources/arquillian.xml
@@ -6,6 +6,9 @@
</container>
<container qualifier="jbossas-managed-7">
+ <configuration>
+ <property name="javaVmArguments">-Xms128m -Xmx768m -XX:MaxPermSize=256m ${jacoco.agent}</property>
+ </configuration>
</container>
<container qualifier="jbossas-remote-6">
View
2 examples/jsf/numberguess/src/ftest/resources/arquillian.xml
@@ -10,7 +10,7 @@
<container qualifier="jbossas-managed-7">
<configuration>
- <property name="javaVmArguments">-Xmx1024m -XX:MaxPermSize=512m</property>
+ <property name="javaVmArguments">-Xmx1024m -XX:MaxPermSize=512m ${jacoco.agent}</property>
</configuration>
</container>
View
3 examples/jsf/pastecode/src/ftest/resources/arquillian.xml
@@ -6,6 +6,9 @@
</container>
<container qualifier="jbossas-managed-7">
+ <configuration>
+ <property name="javaVmArguments">-Xms128m -Xmx768m -XX:MaxPermSize=256m ${jacoco.agent}</property>
+ </configuration>
</container>
<container qualifier="jbossas-remote-6">
View
3 examples/jsf/permalink/src/ftest/resources/arquillian.xml
@@ -9,6 +9,9 @@
</container>
<container qualifier="jbossas-managed-7">
+ <configuration>
+ <property name="javaVmArguments">-Xms128m -Xmx768m -XX:MaxPermSize=256m ${jacoco.agent}</property>
+ </configuration>
</container>
<container qualifier="jbossas-remote-7">
View
2 examples/jsf/translator/ftest/pom.xml
@@ -68,7 +68,7 @@
<id>arquillian-jbossas-managed-6</id>
</profile>
- <profile>
+ <profile>
<id>arquillian-jbossas-remote-6</id>
</profile>
</profiles>
View
3 examples/jsf/translator/ftest/src/ftest/resources/arquillian.xml
@@ -6,6 +6,9 @@
</container>
<container qualifier="jbossas-managed-7">
+ <configuration>
+ <property name="javaVmArguments">-Xms128m -Xmx768m -XX:MaxPermSize=256m ${jacoco.agent}</property>
+ </configuration>
</container>
<container qualifier="jbossas-remote-6">
View
32 examples/pom.xml
@@ -285,6 +285,7 @@
<configuration>
<systemProperties>
<arquillian.launch>${arquillian}</arquillian.launch>
+ <jacoco.agent>${jacoco.agent}</jacoco.agent>
</systemProperties>
</configuration>
<executions>
@@ -625,6 +626,37 @@
</profile>
<profile>
+ <id>jacoco</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ <property>
+ <name>jacoco</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.jacoco</groupId>
+ <artifactId>jacoco-maven-plugin</artifactId>
+ <configuration>
+ <propertyName>jacoco.agent</propertyName>
+ <excludes>
+ <exclude>org.jboss.weld.examples.*</exclude>
+ </excludes>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>prepare-agent</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <profile>
<id>jboss-public-repository</id>
<!-- Repository is active unless explicitly disabled e.g. -P!jboss-public-repository -->
<activation>
View
42 jboss-tck-runner/pom.xml
@@ -359,6 +359,7 @@
<name>jboss.options</name>
<value>-Xmx1024m -XX:MaxPermSize=512m -enableassertions
-Dorg.jboss.testharness.api.ConfigurationBuilder=org.jboss.jsr299.tck.impl.JSR299PropertiesBasedConfigurationBuilder
+ ${jacoco.agent}
</value>
</property>
<property>
@@ -414,6 +415,47 @@
</build>
</profile>
<profile>
+ <id>jacoco</id>
+ <activation>
+ <property>
+ <name>jacoco</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.jacoco</groupId>
+ <artifactId>jacoco-maven-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>org.jboss.jsr299.tck.*</exclude>
+ </excludes>
+ <propertyName>jacoco.agent</propertyName>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>prepare-agent</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <!-- Need to set empty jacoco.agent property, as surefire would put "${jacoco.agent}" verbatim otherwise. -->
+ <id>notjacoco</id>
+ <activation>
+ <property>
+ <name>!jacoco</name>
+ </property>
+ </activation>
+ <properties>
+ <jacoco.agent></jacoco.agent>
+ </properties>
+ </profile>
+ <profile>
<id>jboss-public-repository</id>
<!-- Repository is active unless explicitly disabled e.g. -P!jboss-public-repository -->
<activation>
View
7 pom.xml
@@ -45,6 +45,7 @@
<glassfish.el.version>2.1.2-b04</glassfish.el.version>
<google.guava.version>11.0.2</google.guava.version>
<htmlunit.version>2.4</htmlunit.version>
+ <jacoco.version>0.5.8.201207111220</jacoco.version>
<javax.activation.version>1.1</javax.activation.version>
<javax.jms.version>1.1</javax.jms.version>
<javassist.version>3.14.0-GA</javassist.version>
@@ -512,6 +513,12 @@
</plugin>
<plugin>
+ <groupId>org.jacoco</groupId>
+ <artifactId>jacoco-maven-plugin</artifactId>
+ <version>${jacoco.version}</version>
+ </plugin>
+
+ <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>selenium-maven-plugin</artifactId>
<version>${selenium.maven.plugin.version}</version>
View
32 tests-arquillian/pom.xml
@@ -374,6 +374,7 @@
</systemPropertyVariables>
<systemProperties>
<arquillian.launch>jboss-as-7</arquillian.launch>
+ <jacoco.agent>${jacoco.agent}</jacoco.agent>
</systemProperties>
<test>${test}</test>
<parallel>none</parallel>
@@ -584,6 +585,37 @@
</build>
</profile>
+ <profile>
+ <id>jacoco</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ <property>
+ <name>jacoco</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.jacoco</groupId>
+ <artifactId>jacoco-maven-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>org.jboss.weld.tests.*</exclude>
+ </excludes>
+ <propertyName>jacoco.agent</propertyName>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>prepare-agent</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
</profiles>
</project>
View
1 tests-arquillian/src/test/resources/arquillian.xml
@@ -19,6 +19,7 @@
<!-- ARQ-649 workaround -->
<property name="outputToConsole">false</property>
<property name="allowConnectingToRunningServer">true</property>
+ <property name="javaVmArguments">-Xms128m -Xmx768m -XX:MaxPermSize=256m ${jacoco.agent}</property>
</configuration>
</container>
View
95 tests/pom.xml
@@ -125,34 +125,71 @@
</dependencies>
- <build>
- <defaultGoal>test</defaultGoal>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>-Xmx128m</argLine>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-report-plugin</artifactId>
- <executions>
- <execution>
- <id>generate-test-report</id>
- <phase>test</phase>
- <goals>
- <goal>report-only</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <outputDirectory>${project.build.directory}/surefire-reports</outputDirectory>
- <outputName>test-report</outputName>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <profiles>
+ <profile>
+ <id>default</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <build>
+ <defaultGoal>test</defaultGoal>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <argLine>-Xmx128m</argLine>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>generate-test-report</id>
+ <phase>test</phase>
+ <goals>
+ <goal>report-only</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <outputDirectory>${project.build.directory}/surefire-reports</outputDirectory>
+ <outputName>test-report</outputName>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>jacoco</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ <property>
+ <name>jacoco</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.jacoco</groupId>
+ <artifactId>jacoco-maven-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>org.jboss.weld.tests.*</exclude>
+ </excludes>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>prepare-agent</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>

0 comments on commit 7b4c5c0

Please sign in to comment.
Something went wrong with that request. Please try again.