You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ws...@apache.org on 2009/04/04 05:13:15 UTC

svn commit: r761865 - in /archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test: pom.xml src/test/resources/ src/test/resources/it.properties

Author: wsmoak
Date: Sat Apr  4 03:13:14 2009
New Revision: 761865

URL: http://svn.apache.org/viewvc?rev=761865&view=rev
Log:
[MRM-1164] Add it.properties to externalize info needed for tests.  Adjust directory name for non-classpath resources in pom.

Added:
    archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/
    archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/it.properties
Modified:
    archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/pom.xml

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/pom.xml?rev=761865&r1=761864&r2=761865&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/pom.xml Sat Apr  4 03:13:14 2009
@@ -88,6 +88,16 @@
     <testSourceDirectory>src/test/it</testSourceDirectory>
     <plugins>
       <plugin>
+        <artifactId>maven-resources-plugin</artifactId>
+        <executions>
+          <execution>
+            <goals>
+              <goal>testResources</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>dependency-maven-plugin</artifactId>
         <executions>
@@ -136,22 +146,22 @@
             <configuration>
               <tasks>
                 <copy todir="${project.build.directory}/appserver-base">
-                  <fileset dir="src/test/resources/appserver-base" />
+                  <fileset dir="src/test/it-resources/appserver-base" />
                 </copy>
                 <copy todir="${project.build.directory}/repository">
-                  <fileset dir="src/test/resources/repository" />
+                  <fileset dir="src/test/it-resources/repository" />
                 </copy>
                 <copy todir="${project.build.directory}/index">
-                  <fileset dir="src/test/resources/index" />
+                  <fileset dir="src/test/it-resources/index" />
                 </copy>
                 <copy todir="${project.build.directory}/snapshots">
-                  <fileset dir="src/test/resources/snapshots" />
+                  <fileset dir="src/test/it-resources/snapshots" />
                 </copy>
                 <copy todir="${project.build.directory}/projects">
-                  <fileset dir="src/test/resources/projects" />
+                  <fileset dir="src/test/it-resources/projects" />
                 </copy>
                 <copy todir="${project.build.directory}/local-repo">
-                  <fileset dir="src/test/resources/local-repo" />
+                  <fileset dir="src/test/it-resources/local-repo" />
                 </copy>
               </tasks>
             </configuration>

Added: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/it.properties
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/it.properties?rev=761865&view=auto
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/it.properties (added)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/it.properties Sat Apr  4 03:13:14 2009
@@ -0,0 +1,13 @@
+#properties for integration tests
+
+BASE_URL=http://localhost:9696/archiva
+MAX_WAIT_TIME_IN_MS=60000
+
+ADMIN_USERNAME=admin
+ADMIN_FULLNAME=Administrator
+ADMIN_EMAIL=admin@localhost
+ADMIN_PASSWORD=admin123
+
+SELENIUM_HOST=localhost
+SELENIUM_PORT=4444
+SELENIUM_BROWSER=*firefox