Compile the unittests when available
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/baa39705 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/baa39705 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/baa39705 Branch: refs/heads/maven-waf Commit: baa39705d29b7b71f5a0e3317020cfe3bb20195c Parents: f21aee2 Author: Hugo Trippaers <[email protected]> Authored: Mon Sep 10 14:58:00 2012 +0200 Committer: Hugo Trippaers <[email protected]> Committed: Mon Sep 10 14:58:00 2012 +0200 ---------------------------------------------------------------------- awsapi/pom.xml | 2 +- core/pom.xml | 2 +- plugins/pom.xml | 1 + server/pom.xml | 26 +++++++++++++++++++++++++- utils/pom.xml | 15 +++++++++++++++ 5 files changed, 43 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/baa39705/awsapi/pom.xml ---------------------------------------------------------------------- diff --git a/awsapi/pom.xml b/awsapi/pom.xml index c6f440d..ba59ce3 100644 --- a/awsapi/pom.xml +++ b/awsapi/pom.xml @@ -207,8 +207,8 @@ </configuration> </plugin> </plugins> + <testSourceDirectory>test</testSourceDirectory> <!-- - <testSourceDirectory>test</testSourceDirectory> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/baa39705/core/pom.xml ---------------------------------------------------------------------- diff --git a/core/pom.xml b/core/pom.xml index 510cb04..8e4d342 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -58,6 +58,6 @@ <build> <defaultGoal>install</defaultGoal> <sourceDirectory>src</sourceDirectory> - <!-- <testSourceDirectory>test</testSourceDirectory> --> + <testSourceDirectory>test</testSourceDirectory> </build> </project> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/baa39705/plugins/pom.xml ---------------------------------------------------------------------- diff --git a/plugins/pom.xml b/plugins/pom.xml index 2a6ca31..b7ae65a 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -30,6 +30,7 @@ <build> <defaultGoal>install</defaultGoal> <sourceDirectory>src</sourceDirectory> + <testSourceDirectory>test</testSourceDirectory> </build> <modules> <module>deployment-planners/user-concentrated-pod</module> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/baa39705/server/pom.xml ---------------------------------------------------------------------- diff --git a/server/pom.xml b/server/pom.xml index f7178d8..1d7babb 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -64,10 +64,34 @@ <artifactId>jstl</artifactId> <version>${cs.jstl.version}</version> </dependency> + <dependency> + <groupId>org.apache.cloudstack</groupId> + <artifactId>cloud-utils</artifactId> + <version>${project.version}</version> + <classifier>tests</classifier> + <scope>test</scope> + </dependency> </dependencies> <build> <defaultGoal>install</defaultGoal> <sourceDirectory>src</sourceDirectory> - <!-- <testSourceDirectory>test</testSourceDirectory> --> + <testSourceDirectory>test</testSourceDirectory> + <testResources> + <testResource> + <directory>test/resources</directory> + </testResource> + </testResources> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <excludes> + <exclude>com/cloud/upgrade/*</exclude> + </excludes> + </configuration> + </plugin> + </plugins> </build> + </project> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/baa39705/utils/pom.xml ---------------------------------------------------------------------- diff --git a/utils/pom.xml b/utils/pom.xml index 0124fdb..6a9d523 100644 --- a/utils/pom.xml +++ b/utils/pom.xml @@ -124,11 +124,26 @@ <artifactId>commons-configuration</artifactId> <version>${cs.configuration.version}</version> </dependency> + <!-- Test dependency in mysql for db tests --> + <dependency> + <groupId>mysql</groupId> + <artifactId>mysql-connector-java</artifactId> + <version>5.1.21</version> + <scope>test</scope> + </dependency> </dependencies> <build> <defaultGoal>install</defaultGoal> <sourceDirectory>src</sourceDirectory> <testSourceDirectory>test</testSourceDirectory> + <testResources> + <testResource> + <directory>test/resources</directory> + </testResource> + <testResource> + <directory>conf</directory> + </testResource> + </testResources> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId>
