Skip to content

Commit

Permalink
fixed up formatting and using emma that is deployed to central
Browse files Browse the repository at this point in the history
  • Loading branch information
@mosabua
mosabua committed May 23, 2012
1 parent e2c3489 commit 8bd6adf
Show file tree
Hide file tree
Showing 2 changed files with 107 additions and 106 deletions.
55 changes: 28 additions & 27 deletions apidemos-android-10/application/pom.xml
View file
Expand Up @@ -32,34 +32,35 @@
<scope>provided</scope>
</dependency>
</dependencies>

<profiles>
<profile>
<id>emma</id>
<build>
<plugins>
<plugin>
<groupId>com.jayway.maven.plugins.android.generation2</groupId>
<artifactId>android-maven-plugin</artifactId>
<configuration>
<!-- emma start -->
<emma>
<enable>true</enable>
<classFolders>${project.basedir}/target/classes/</classFolders>
<outputMetaFile>${project.basedir}/target/emma/coverage.em</outputMetaFile>
</emma>
<!-- emma stop -->
<dex>
<noLocals>true</noLocals> <!-- must be set for emma -->
</dex>
</configuration>
<extensions>true</extensions>
</plugin>
</plugins>
</build>
</profile>
</profiles>

<profile>
<id>emma</id>
<build>
<plugins>
<plugin>
<groupId>com.jayway.maven.plugins.android.generation2</groupId>
<artifactId>android-maven-plugin</artifactId>
<configuration>
<!-- emma start -->
<emma>
<enable>true</enable>
<classFolders>${project.basedir}/target/classes/</classFolders>
<outputMetaFile>${project.basedir}/target/emma/coverage.em</outputMetaFile>
</emma>
<!-- emma stop -->
<dex>
<noLocals>true</noLocals>
<!-- must be set for emma -->
</dex>
</configuration>
<extensions>true</extensions>
</plugin>
</plugins>
</build>
</profile>
</profiles>

<build>
<finalName>${project.artifactId}</finalName>
<plugins>
Expand Down
158 changes: 79 additions & 79 deletions apidemos-android-10/instrumentationtests/pom.xml
View file
Expand Up @@ -55,88 +55,88 @@
<type>jar</type>
</dependency>
</dependencies>

<profiles>
<profile>
<id>emma</id>
<dependencies>
<profile>
<id>emma</id>
<dependencies>
<dependency>
<groupId>emma</groupId>
<artifactId>emma</artifactId>
<type>jar</type>
<scope>compile</scope>
<version>2.1.5320</version>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>properties-maven-plugin</artifactId>
<version>1.0-alpha-1</version>
<executions>
<execution>
<phase>initialize</phase>
<goals>
<goal>read-project-properties</goal>
</goals>
<configuration>
<files>
<file>project.properties</file>
</files>
</configuration>
</execution>
</executions>
</plugin>

<plugin>
<groupId>com.jayway.maven.plugins.android.generation2</groupId>
<artifactId>android-maven-plugin</artifactId>
<configuration>
<test>
<coverage>true</coverage>
<createReport>true</createReport>
</test>
</configuration>
<extensions>true</extensions>
<!-- -->
<executions>
<execution>
<id>pull-coverage</id>
<phase>post-integration-test</phase>
<goals>
<goal>pull</goal>
</goals>
<configuration>
<pullSource>/data/data/com.example.android.apis/files/coverage.ec</pullSource>
<pullDestination>${tested.project.dir}/target/emma/coverage.ec</pullDestination>
</configuration>
</execution>
</executions>

<dependency>
<groupId>com.vladium.emma</groupId>
<artifactId>emma</artifactId>
<type>jar</type>
<scope>compile</scope>
<version>1.0</version>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>properties-maven-plugin</artifactId>
<version>1.0-alpha-1</version>
<executions>
<execution>
<phase>initialize</phase>
<goals>
<goal>read-project-properties</goal>
</goals>
<configuration>
<files>
<file>project.properties</file>
</files>
</configuration>
</execution>
</executions>
</plugin>
</plugin>
</plugins>
</build>
<reporting>
<plugins>
<plugin>
<groupId>org.sonatype.maven.plugin</groupId>
<artifactId>emma4it-maven-plugin</artifactId>
<version>1.3</version>
<configuration>
<metadatas>${tested.project.dir}/target/emma/coverage.em,${tested.project.dir}/src/
</metadatas>
<instrumentations>${tested.project.dir}/target/emma/coverage.ec</instrumentations>
<reportDirectory>${tested.project.dir}/target/emma/</reportDirectory>
<baseDirectory>{tested.project.dir}/target/</baseDirectory>
<formats>xml,html</formats>
</configuration>
</plugin>
</plugins>
</reporting>
</profile>
</profiles>

<plugin>
<groupId>com.jayway.maven.plugins.android.generation2</groupId>
<artifactId>android-maven-plugin</artifactId>
<configuration>
<test>
<coverage>true</coverage>
<createReport>true</createReport>
</test>
</configuration>
<extensions>true</extensions>
<!-- -->
<executions>
<execution>
<id>pull-coverage</id>
<phase>post-integration-test</phase>
<goals>
<goal>pull</goal>
</goals>
<configuration>
<pullSource>/data/data/com.example.android.apis/files/coverage.ec</pullSource>
<pullDestination>${tested.project.dir}/target/emma/coverage.ec</pullDestination>
</configuration>
</execution>
</executions>

</plugin>
</plugins>
</build>
<reporting>
<plugins>
<plugin>
<groupId>org.sonatype.maven.plugin</groupId>
<artifactId>emma4it-maven-plugin</artifactId>
<version>1.3</version>
<configuration>
<metadatas>${tested.project.dir}/target/emma/coverage.em,${tested.project.dir}/src/</metadatas>
<instrumentations>${tested.project.dir}/target/emma/coverage.ec</instrumentations>
<reportDirectory>${tested.project.dir}/target/emma/</reportDirectory>
<baseDirectory>{tested.project.dir}/target/</baseDirectory>
<formats>xml,html</formats>
</configuration>
</plugin>
</plugins>
</reporting>
</profile>
</profiles>

<build>
<!--<finalName>${project.artifactId}</finalName>-->
<plugins>
Expand Down

0 comments on commit 8bd6adf

Please sign in to comment.