You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by ju...@apache.org on 2013/05/09 23:46:36 UTC

svn commit: r1480798 - /incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-it-vanilla/pom.xml

Author: juanpablo
Date: Thu May  9 21:46:36 2013
New Revision: 1480798

URL: http://svn.apache.org/r1480798
Log:
JSPWIKI-770: parameterized use of jspwiki-selenium-tests

Modified:
    incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-it-vanilla/pom.xml

Modified: incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-it-vanilla/pom.xml
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-it-vanilla/pom.xml?rev=1480798&r1=1480797&r2=1480798&view=diff
==============================================================================
--- incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-it-vanilla/pom.xml (original)
+++ incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-it-vanilla/pom.xml Thu May  9 21:46:36 2013
@@ -33,18 +33,51 @@
   <name>jspwiki-it-vanilla</name>
   <description>selenium tests execution for jspwiki-vanilla (simple war)</description>
   <version>2.9.1-SNAPSHOT</version>
-  <packaging>war</packaging> <!-- this enables tests reuse [1/2] -->
- 
+  <packaging>war</packaging> <!-- this enables tests reuse [1/4] -->
+  
+  <properties> <!-- values injected at jspwiki.properties & selenium templates -->
+               <!-- this enables tests reuse [2/4] -->
+    <it-jspwiki.context>${project.artifactId}</it-jspwiki.context>
+    
+    <it-jspwiki.authorizer>org.apache.wiki.auth.authorize.WebContainerAuthorizer</it-jspwiki.authorizer>
+    <it-jspwiki.groupdatabase>org.apache.wiki.auth.authorize.XMLGroupDatabase</it-jspwiki.groupdatabase>
+    <it-jspwiki.login.throttling>false</it-jspwiki.login.throttling>
+    <it-jspwiki.referenceStyle>relative</it-jspwiki.referenceStyle>
+    <it-jspwiki.userdatabase>org.apache.wiki.auth.user.XMLUserDatabase</it-jspwiki.userdatabase>
+    <it-jspwiki.userdatabase.hashPrefix>false</it-jspwiki.userdatabase.hashPrefix>
+    <it-jspwiki-x.securityconfig.enable>true</it-jspwiki-x.securityconfig.enable>
+  </properties>
+  
   <build>
+    <finalName>${project.artifactId}</finalName>
+    <testResources><!-- this enables tests reuse [3/4] -->
+      <testResource>
+        <directory>${project.basedir}/../jspwiki-selenium-tests/src/test/resources</directory>
+        <filtering>true</filtering>
+      </testResource>
+    </testResources>
+    
     <plugins>
+      <plugin><!-- this enables tests reuse [4/4] -->
+        <artifactId>maven-war-plugin</artifactId>
+        <configuration>
+          <webResources>
+            <resource>
+              <directory>../jspwiki-selenium-tests/src/main/resources</directory>
+              <filtering>true</filtering>
+            </resource>
+          </webResources>
+        </configuration>
+      </plugin>
+      
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>selenium-maven-plugin</artifactId>
         <configuration>
           <browser>*firefox</browser>
           <!-- <browser>*iexplore</browser> -->
-          <startURL>http://localhost:8080/JSPWiki/</startURL>
-          <suite>${project.basedir}/../jspwiki-selenium-tests/src/test/resources/selenium/TestSuite.html</suite> <!-- this enables tests reuse [2/2] -->
+          <startURL>http://localhost:8080/${project.artifactId}/</startURL>
+          <suite>target/test-classes/selenium/TestSuite.html</suite> 
           <background>true</background>
         </configuration>
         <executions>