You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by mf...@apache.org on 2010/04/28 00:24:13 UTC
svn commit: r938703 - in /myfaces/portlet-bridge/testsuite/trunk: ./
portlet-bridge-testsuite-main/
portlet-bridge-testsuite-section3-2-lifecycle-set/
portlet-bridge-testsuite-section3-2-render-policy-always-delegate/
portlet-bridge-testsuite-section3-...
Author: mfreedman
Date: Tue Apr 27 22:24:13 2010
New Revision: 938703
URL: http://svn.apache.org/viewvc?rev=938703&view=rev
Log:
Updated with Alistair's recent changes:
- 'client' subdirectory containing configuration for client only mode
The command 'tck' now generates a single html report file, $TCK_ROOT/target/portlet-bridge-testsuite-client-report.html. I can't rename the tck.cmd itself, you'll have to.
- tck-generate-wars.cmd - calls 'mvn client install' with any parameters the user cares to add, e.g. tck-generate-wars -Dtck.generate-war
- internal jetty testing (mvn clean install) generates reports in a single directory, $TCK_ROOT/target/, with an index, report-index.html.
Added:
myfaces/portlet-bridge/testsuite/trunk/tck-generate-wars.cmd
Modified:
myfaces/portlet-bridge/testsuite/trunk/portlet-bridge-testsuite-main/pom.xml
myfaces/portlet-bridge/testsuite/trunk/portlet-bridge-testsuite-section3-2-lifecycle-set/pom.xml
myfaces/portlet-bridge/testsuite/trunk/portlet-bridge-testsuite-section3-2-render-policy-always-delegate/pom.xml
myfaces/portlet-bridge/testsuite/trunk/portlet-bridge-testsuite-section3-2-render-policy-default/pom.xml
myfaces/portlet-bridge/testsuite/trunk/portlet-bridge-testsuite-section3-2-render-policy-never-delegate/pom.xml
myfaces/portlet-bridge/testsuite/trunk/src/test/resources/report-index.html
myfaces/portlet-bridge/testsuite/trunk/tck.cmd
Modified: myfaces/portlet-bridge/testsuite/trunk/portlet-bridge-testsuite-main/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/testsuite/trunk/portlet-bridge-testsuite-main/pom.xml?rev=938703&r1=938702&r2=938703&view=diff
==============================================================================
--- myfaces/portlet-bridge/testsuite/trunk/portlet-bridge-testsuite-main/pom.xml (original)
+++ myfaces/portlet-bridge/testsuite/trunk/portlet-bridge-testsuite-main/pom.xml Tue Apr 27 22:24:13 2010
@@ -91,6 +91,15 @@
</execution>
</executions>
</plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ <configuration>
+ <outputName>${artifactId}-report</outputName>
+ <outputDirectory>../target</outputDirectory>
+ </configuration>
+ </plugin>
</plugins>
</pluginManagement>
Modified: myfaces/portlet-bridge/testsuite/trunk/portlet-bridge-testsuite-section3-2-lifecycle-set/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/testsuite/trunk/portlet-bridge-testsuite-section3-2-lifecycle-set/pom.xml?rev=938703&r1=938702&r2=938703&view=diff
==============================================================================
--- myfaces/portlet-bridge/testsuite/trunk/portlet-bridge-testsuite-section3-2-lifecycle-set/pom.xml (original)
+++ myfaces/portlet-bridge/testsuite/trunk/portlet-bridge-testsuite-section3-2-lifecycle-set/pom.xml Tue Apr 27 22:24:13 2010
@@ -91,6 +91,16 @@
</execution>
</executions>
</plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ <configuration>
+ <outputName>${artifactId}-report</outputName>
+ <outputDirectory>../target</outputDirectory>
+ </configuration>
+ </plugin>
+
</plugins>
</pluginManagement>
Modified: myfaces/portlet-bridge/testsuite/trunk/portlet-bridge-testsuite-section3-2-render-policy-always-delegate/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/testsuite/trunk/portlet-bridge-testsuite-section3-2-render-policy-always-delegate/pom.xml?rev=938703&r1=938702&r2=938703&view=diff
==============================================================================
--- myfaces/portlet-bridge/testsuite/trunk/portlet-bridge-testsuite-section3-2-render-policy-always-delegate/pom.xml (original)
+++ myfaces/portlet-bridge/testsuite/trunk/portlet-bridge-testsuite-section3-2-render-policy-always-delegate/pom.xml Tue Apr 27 22:24:13 2010
@@ -91,6 +91,16 @@
</execution>
</executions>
</plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ <configuration>
+ <outputName>${artifactId}-report</outputName>
+ <outputDirectory>../target</outputDirectory>
+ </configuration>
+ </plugin>
+
</plugins>
</pluginManagement>
Modified: myfaces/portlet-bridge/testsuite/trunk/portlet-bridge-testsuite-section3-2-render-policy-default/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/testsuite/trunk/portlet-bridge-testsuite-section3-2-render-policy-default/pom.xml?rev=938703&r1=938702&r2=938703&view=diff
==============================================================================
--- myfaces/portlet-bridge/testsuite/trunk/portlet-bridge-testsuite-section3-2-render-policy-default/pom.xml (original)
+++ myfaces/portlet-bridge/testsuite/trunk/portlet-bridge-testsuite-section3-2-render-policy-default/pom.xml Tue Apr 27 22:24:13 2010
@@ -91,6 +91,16 @@
</execution>
</executions>
</plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ <configuration>
+ <outputName>${artifactId}-report</outputName>
+ <outputDirectory>../target</outputDirectory>
+ </configuration>
+ </plugin>
+
</plugins>
</pluginManagement>
@@ -155,6 +165,24 @@
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>test</phase>
+ <configuration>
+ <tasks>
+ <copy file="../src/test/resources/report-index.html" tofile="../target/report-index.html"/>
+ <delete dir="../target/site"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
</plugins>
</build>
Modified: myfaces/portlet-bridge/testsuite/trunk/portlet-bridge-testsuite-section3-2-render-policy-never-delegate/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/testsuite/trunk/portlet-bridge-testsuite-section3-2-render-policy-never-delegate/pom.xml?rev=938703&r1=938702&r2=938703&view=diff
==============================================================================
--- myfaces/portlet-bridge/testsuite/trunk/portlet-bridge-testsuite-section3-2-render-policy-never-delegate/pom.xml (original)
+++ myfaces/portlet-bridge/testsuite/trunk/portlet-bridge-testsuite-section3-2-render-policy-never-delegate/pom.xml Tue Apr 27 22:24:13 2010
@@ -91,6 +91,16 @@
</execution>
</executions>
</plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ <configuration>
+ <outputName>${artifactId}-report</outputName>
+ <outputDirectory>../target</outputDirectory>
+ </configuration>
+ </plugin>
+
</plugins>
</pluginManagement>
Modified: myfaces/portlet-bridge/testsuite/trunk/src/test/resources/report-index.html
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/testsuite/trunk/src/test/resources/report-index.html?rev=938703&r1=938702&r2=938703&view=diff
==============================================================================
--- myfaces/portlet-bridge/testsuite/trunk/src/test/resources/report-index.html (original)
+++ myfaces/portlet-bridge/testsuite/trunk/src/test/resources/report-index.html Tue Apr 27 22:24:13 2010
@@ -9,11 +9,11 @@
<div class="section"><h2>Report Index</h2></div>
<div class="section">
<ul>
- <li><a href="../../../portlet-bridge-testsuite-main/target/site/surefire-report.html">Main tests</a></li>
- <li><a href="../../../portlet-bridge-testsuite-section3-2-render-policy-always-delegate/target/site/surefire-report.html">Section 3.2: Render policy test with javax.portlet.faces.RENDER_POLICY set to ALWAYS_DELEGATE</a></li>
- <li><a href="../../../portlet-bridge-testsuite-section3-2-render-policy-never-delegate/target/site/surefire-report.html">Section 3.2: Render policy test with javax.portlet.faces.RENDER_POLICY set to NEVER_DELEGATE</a></li>
- <li><a href="../../../portlet-bridge-testsuite-section3-2-render-policy-default/target/site/surefire-report.html">Section 3.2: Render policy test with javax.portlet.faces.RENDER_POLICY set to DEFAULT</a></li>
- <li><a href="../../../portlet-bridge-testsuite-section3-2-lifecycle-set/target/site/surefire-report.html">Section 3.2: Lifecycle test with javax.portlet.faces.LIFECYCLE_ID set to TCK_Lifecycle</a></li>
+ <li><a href="./portlet-bridge-testsuite-main-report.html">Main tests</a></li>
+ <li><a href="./portlet-bridge-testsuite-section3-2-render-policy-always-delegate-report.html">Section 3.2: Render policy test with javax.portlet.faces.RENDER_POLICY set to ALWAYS_DELEGATE</a></li>
+ <li><a href="./portlet-bridge-testsuite-section3-2-render-policy-never-delegate-report.html">Section 3.2: Render policy test with javax.portlet.faces.RENDER_POLICY set to NEVER_DELEGATE</a></li>
+ <li><a href="./portlet-bridge-testsuite-section3-2-render-policy-default-report.html">Section 3.2: Render policy test with javax.portlet.faces.RENDER_POLICY set to DEFAULT</a></li>
+ <li><a href="./portlet-bridge-testsuite-section3-2-lifecycle-set-report.html">Section 3.2: Lifecycle test with javax.portlet.faces.LIFECYCLE_ID set to TCK_Lifecycle</a></li>
</ul>
</div>
Added: myfaces/portlet-bridge/testsuite/trunk/tck-generate-wars.cmd
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/testsuite/trunk/tck-generate-wars.cmd?rev=938703&view=auto
==============================================================================
--- myfaces/portlet-bridge/testsuite/trunk/tck-generate-wars.cmd (added)
+++ myfaces/portlet-bridge/testsuite/trunk/tck-generate-wars.cmd Tue Apr 27 22:24:13 2010
@@ -0,0 +1 @@
+mvn clean install %*
Modified: myfaces/portlet-bridge/testsuite/trunk/tck.cmd
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/testsuite/trunk/tck.cmd?rev=938703&r1=938702&r2=938703&view=diff
==============================================================================
--- myfaces/portlet-bridge/testsuite/trunk/tck.cmd (original)
+++ myfaces/portlet-bridge/testsuite/trunk/tck.cmd Tue Apr 27 22:24:13 2010
@@ -2,7 +2,7 @@
if "%TCK_TEST_FILE%"=="" (
if "%TCK_HOME%"=="" (
- echo Test definition file not found. Either set TCK_HOME to point to a test definition file or set TCK_HOME to point to a directory with a test definition file called test.xml in it.
+ echo Test definition file not found. Either set TCK_TEST_FILE to point to a test definition file or set TCK_HOME to point to a directory with a test definition file called test.xml in it.
goto:eof
)
if not exist "%TCK_HOME%"\test.xml (