You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sf...@apache.org on 2015/02/12 23:28:42 UTC
[23/27] incubator-usergrid git commit: Finished test refactor to
integration tests.
Finished test refactor to integration tests.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/bc6fec48
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/bc6fec48
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/bc6fec48
Branch: refs/heads/USERGRID-365
Commit: bc6fec485a38b4354143e08f058a3d29906860fd
Parents: e5b6cc1
Author: Todd Nine <tn...@apigee.com>
Authored: Mon Jan 26 21:10:22 2015 -0700
Committer: Todd Nine <tn...@apigee.com>
Committed: Mon Jan 26 21:10:22 2015 -0700
----------------------------------------------------------------------
stack/pom.xml | 2 +-
stack/rest/pom.xml | 76 ++++++++++++++++++++++++++++++++++++++-----------
2 files changed, 60 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/bc6fec48/stack/pom.xml
----------------------------------------------------------------------
diff --git a/stack/pom.xml b/stack/pom.xml
index 83d50a1..2a08f91 100644
--- a/stack/pom.xml
+++ b/stack/pom.xml
@@ -121,7 +121,7 @@
<usergrid.it.parallel>methods</usergrid.it.parallel>
<usergrid.it.reuseForks>true</usergrid.it.reuseForks>
<usergrid.it.forkCount>.5C</usergrid.it.forkCount>
- <usergrid.it.threads>4</usergrid.it.threads>
+ <usergrid.it.threads>2</usergrid.it.threads>
<metrics.version>3.0.0</metrics.version>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/bc6fec48/stack/rest/pom.xml
----------------------------------------------------------------------
diff --git a/stack/rest/pom.xml b/stack/rest/pom.xml
index 2b1610a..fa79ad8 100644
--- a/stack/rest/pom.xml
+++ b/stack/rest/pom.xml
@@ -66,23 +66,24 @@
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire.plugin.version}</version>
<configuration>
- <systemPropertyVariables>
- <storage-config>${basedir}/src/test/conf</storage-config>
- <target.directory>${project.build.directory}</target.directory>
- </systemPropertyVariables>
- <parallel>methods</parallel>
- <forkCount>${usergrid.it.forkCount}</forkCount>
- <threadCount>${usergrid.it.threads}</threadCount>
- <reuseForks>true</reuseForks>
- <argLine>-Dtest.barrier.timestamp=${maven.build.timestamp} -Dtest.clean.storage=true
- -Xmx${ug.heapmax} -Xms${ug.heapmin} -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8
- -javaagent:${settings.localRepository}/com/github/stephenc/jamm/0.2.5/jamm-0.2.5.jar
- ${ug.argline}
- </argLine>
- <includes>
- <include>**/*IT.java</include>
- <include>**/*Test.java</include>
- </includes>
+ <skipTests>true</skipTests>
+ <!--<systemPropertyVariables>-->
+ <!--<storage-config>${basedir}/src/test/conf</storage-config>-->
+ <!--<target.directory>${project.build.directory}</target.directory>-->
+ <!--</systemPropertyVariables>-->
+ <!--<parallel>methods</parallel>-->
+ <!--<forkCount>${usergrid.it.forkCount}</forkCount>-->
+ <!--<threadCount>${usergrid.it.threads}</threadCount>-->
+ <!--<reuseForks>true</reuseForks>-->
+ <!--<argLine>-Dtest.barrier.timestamp=${maven.build.timestamp} -Dtest.clean.storage=true-->
+ <!---Xmx${ug.heapmax} -Xms${ug.heapmin} -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8-->
+ <!---javaagent:${settings.localRepository}/com/github/stephenc/jamm/0.2.5/jamm-0.2.5.jar-->
+ <!--${ug.argline}-->
+ <!--</argLine>-->
+ <!--<includes>-->
+ <!--<include>**/*IT.java</include>-->
+ <!--<include>**/*Test.java</include>-->
+ <!--</includes>-->
</configuration>
@@ -97,6 +98,47 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <version>${surefire.plugin.version}</version>
+ <configuration>
+ <includes>
+ <include>**/*IT.java</include>
+ <include>**/*Test.java</include>
+ </includes>
+
+ <systemPropertyVariables>
+ <storage-config>${basedir}/src/test/conf</storage-config>
+ <target.directory>${project.build.directory}</target.directory>
+ </systemPropertyVariables>
+ <parallel>methods</parallel>
+ <forkCount>${usergrid.it.forkCount}</forkCount>
+ <threadCount>${usergrid.it.threads}</threadCount>
+ <reuseForks>true</reuseForks>
+ <argLine>-Dtest.barrier.timestamp=${maven.build.timestamp} -Dtest.clean.storage=true -Xmx${ug.heapmax} -Xms${ug.heapmin} -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8 -javaagent:${settings.localRepository}/com/github/stephenc/jamm/0.2.5/jamm-0.2.5.jar ${ug.argline}</argLine>
+ </configuration>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>surefire-junit47</artifactId>
+ <version>${surefire.plugin.version}</version>
+ </dependency>
+ </dependencies>
+
+ <!-- run the integration tests then verify the results -->
+ <executions>
+ <execution>
+ <id>failsafe-integration-tests</id>
+ <phase>integration-test</phase>
+ <goals>
+ <goal>integration-test</goal>
+ <goal>verify</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>2.6</version>
</plugin>