Repository: atlas Updated Branches: refs/heads/branch-0.8 e6df1102d -> 18f1af104
ATLAS-2218: Webapp UT and IT separation (cherry picked from commit 2c69cc298be8950beb8dff454b7ac2e86beaec5a) Project: http://git-wip-us.apache.org/repos/asf/atlas/repo Commit: http://git-wip-us.apache.org/repos/asf/atlas/commit/18f1af10 Tree: http://git-wip-us.apache.org/repos/asf/atlas/tree/18f1af10 Diff: http://git-wip-us.apache.org/repos/asf/atlas/diff/18f1af10 Branch: refs/heads/branch-0.8 Commit: 18f1af1046516b0ed44b6133f0fe5b93702bdeac Parents: e6df110 Author: apoorvnaik <[email protected]> Authored: Wed Oct 18 20:34:21 2017 -0700 Committer: apoorvnaik <[email protected]> Committed: Mon Oct 23 19:19:46 2017 -0700 ---------------------------------------------------------------------- webapp/pom.xml | 59 ++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 45 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/atlas/blob/18f1af10/webapp/pom.xml ---------------------------------------------------------------------- diff --git a/webapp/pom.xml b/webapp/pom.xml index 73361bf..9e23885 100755 --- a/webapp/pom.xml +++ b/webapp/pom.xml @@ -552,7 +552,6 @@ </configuration> </plugin> - <!-- Running unit tests in pre-integration-test phase after war is built --> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> @@ -561,41 +560,73 @@ <user.dir>${project.basedir}</user.dir> <projectBaseDir>${project.basedir}/..</projectBaseDir> </systemProperties> - <!--<skipTests>true</skipTests> --> <forkMode>always</forkMode> <redirectTestOutputToFile>true</redirectTestOutputToFile> <argLine>-Djava.awt.headless=true -Dproject.version=${project.version} -Dhadoop.tmp.dir=${project.build.directory}/tmp-hadoop-${user.name} -Xmx1024m -XX:MaxPermSize=512m </argLine> - <excludes> - <exclude>**/*Base*</exclude> - </excludes> </configuration> - <dependencies> - <dependency> - <groupId>org.apache.maven.surefire</groupId> - <artifactId>surefire-testng</artifactId> - <version>2.18.1</version> - </dependency> - </dependencies> <executions> + <!-- Needed for explicit separation of UTs, SSL/Kerberos/Secure server tests and ITs--> <execution> <id>default-test</id> + <configuration> + <skip>true</skip> + </configuration> + </execution> + + <!-- Unit tests don't rely of WAR being built and don't interact with real server --> + <execution> + <id>unit-tests</id> + <phase>test</phase> + <goals> + <goal>test</goal> + </goals> + <configuration> + <includes> + <include>**/*Test.java</include> + </includes> + <excludes> + <exclude>**/*SSL*.java</exclude> + <exclude>**/*Kerberos*.java</exclude> + <exclude>**/*Base*.java</exclude> + <exclude>**/*Secure*.java</exclude> + <exclude>**/*Server*.java</exclude> + <exclude>**/*$*.java</exclude> + </excludes> + </configuration> + </execution> + + <!-- Secure tests rely on the generated WAR and (may) start atlas server for tests --> + <!-- Eventually all these server interaction tests need to move to IT phase --> + <execution> + <id>secure-tests</id> <phase>pre-integration-test</phase> <goals> <goal>test</goal> </goals> + <configuration> + <includes> + <include>**/*SSL*Test.java</include> + <include>**/*Kerberos*Test.java</include> + <include>**/*Secure*Test.java</include> + <include>**/*Server*Test.java</include> + <include>**/*$*.java</include> + </includes> + <excludes> + <exclude>**/*Base*.java</exclude> + </excludes> + </configuration> </execution> </executions> </plugin> - <plugin> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-maven-plugin</artifactId> <configuration> - <skip>${skipTests}</skip> + <skip>${skipITs}</skip> <!--only skip int tests --> <httpConnector> <port>31000</port>
