From c2c281cddeaded30bb978031f2f1a1fc8a741a9e Mon Sep 17 00:00:00 2001 From: Wendy Smoak Date: Fri, 1 May 2009 23:38:10 +0000 Subject: [PATCH] [MRM-1164] Introduce Cargo plugin config for the TestNG tests to start Tomcat and deploy the app, taken from the original pom.xml git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@770861 13f79535-47bb-0310-9956-ffa450edef68 --- .../src/test/resources/testng.properties | 2 +- .../archiva-webapp-test/testng-pom.xml | 297 +++++++++++++----- 2 files changed, 219 insertions(+), 80 deletions(-) diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/testng.properties b/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/testng.properties index 6a2bf3bfb..9c384fa03 100644 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/testng.properties +++ b/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/testng.properties @@ -1,6 +1,6 @@ # properties for integration tests -BASE_URL=http://localhost:9091/ +BASE_URL=http://localhost:9696/archiva MAX_WAIT_TIME_IN_MS=60000 ADMIN_USERNAME=admin diff --git a/archiva-modules/archiva-web/archiva-webapp-test/testng-pom.xml b/archiva-modules/archiva-web/archiva-webapp-test/testng-pom.xml index b1797c51e..9ad35e62f 100644 --- a/archiva-modules/archiva-web/archiva-webapp-test/testng-pom.xml +++ b/archiva-modules/archiva-web/archiva-webapp-test/testng-pom.xml @@ -38,79 +38,70 @@ - - org.testng - testng - 5.8 - jar - jdk15 - test - false - - - org.apache.archiva - archiva-webapp - ${project.version} - war - false - - - org.apache.derby - derby - 10.1.3.1 - jar - false - - - javax.mail - mail - 1.4 - jar - false - - - javax.activation - activation - 1.1 - jar - false - - - org.codehaus.plexus - plexus-utils - 1.4 - jar - false - - - org.openqa.selenium.server - selenium-server - 0.9.2 - jar - false - - - commons-logging - commons-logging - - - - - org.openqa.selenium.client-drivers - selenium-java-client-driver - 0.9.2 - jar - test - false - - - commons-logging - commons-logging - - - - + + org.testng + testng + 5.8 + jar + jdk15 + test + false + + + org.codehaus.plexus + plexus-command-line + 1.0-alpha-2 + + + plexus-container-default + org.codehaus.plexus + + + + + org.apache.archiva + archiva-webapp + war + + + org.codehaus.plexus + plexus-utils + + + org.codehaus.plexus + plexus-slf4j-logging + + + org.openqa.selenium.client-drivers + selenium-java-client-driver + 0.8.1 + test + + + + jdom + jdom + + + jaxen + jaxen + + + + + org.apache.derby + derby + + + javax.mail + mail + + + javax.activation + activation + + src/test/testng @@ -133,7 +124,110 @@ - + + org.codehaus.mojo + dependency-maven-plugin + + + unzip-archiva-webapp + generate-resources + + unpack + + + + + ${project.groupId} + archiva-webapp + ${project.version} + war + + + ${project.build.directory}/${container.name}conf/webapps/archiva + + + + prepare-provided-dependencies + generate-resources + + copy-dependencies + + + org.apache.derby,javax.mail,javax.activation + false + true + false + ${project.build.directory}/providedDependencies + + + + + + maven-antrun-plugin + + + generate-resources + + run + + + + + + + + + + + + + + + + + + + + + + + + + + copy-container-conf + package + + + + + + + + + + + + + + run + + + + check-archiva-loaded + integration-test + + + + + + + + run + + + + org.apache.maven.plugins maven-compiler-plugin @@ -153,19 +247,65 @@ org.codehaus.mojo selenium-maven-plugin + 1.0-beta-1 + start-selenium pre-integration-test start-server - - true - + + true + + + + org.codehaus.cargo + cargo-maven2-plugin + 1.0 + + + start-container + pre-integration-test + + start + + + + stop-container + post-integration-test + + stop + + + + + false + + ${container.name} + + ${container.url} + ${project.build.directory}/installs/${container.name} + + ${project.build.directory}/logs/${container.name}.log + ${project.build.directory}/logs/${container.name}.out + 600000 + + ${project.build.directory}/appserver-base + ${project.build.directory}/appserver-base + + + + ${project.build.directory}/${container.name}conf + existing + + 9696 + + + - org.apache.maven.plugins maven-surefire-plugin @@ -194,8 +334,7 @@ tomcat5x - http://apache.mirrors.redwire.net/tomcat/tomcat-5/v5.5.27/bin/apache-tomcat-5.5.27.zip - + http://archive.apache.org/dist/tomcat/tomcat-5/v5.5.26/bin/apache-tomcat-5.5.26.zip -- 2.39.5