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/05/05 16:43:15 UTC
svn commit: r941318 - in /myfaces/portlet-bridge/testsuite/trunk: ./ client/
portlet-bridge-testsuite-main/
portlet-bridge-testsuite-section3-2-lifecycle-set/
portlet-bridge-testsuite-section3-2-render-policy-always-delegate/
portlet-bridge-testsuite-s...
Author: mfreedman
Date: Wed May 5 14:43:15 2010
New Revision: 941318
URL: http://svn.apache.org/viewvc?rev=941318&view=rev
Log:
Changed test.xsl to exclude the JSP EL Test when using jetty
Added exclusion file support
Added:
myfaces/portlet-bridge/testsuite/trunk/src/test/resources/test-exclusions.xml
myfaces/portlet-bridge/testsuite/trunk/src/test/resources/test-template.xsl
myfaces/portlet-bridge/testsuite/trunk/src/test/resources/test.xml
Modified:
myfaces/portlet-bridge/testsuite/trunk/client/pom.xml
myfaces/portlet-bridge/testsuite/trunk/pom.xml
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/java/org/apache/myfaces/portlet/faces/tckharness/TckTestCase.java
myfaces/portlet-bridge/testsuite/trunk/src/test/resources/test.xsl
Modified: myfaces/portlet-bridge/testsuite/trunk/client/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/testsuite/trunk/client/pom.xml?rev=941318&r1=941317&r2=941318&view=diff
==============================================================================
--- myfaces/portlet-bridge/testsuite/trunk/client/pom.xml (original)
+++ myfaces/portlet-bridge/testsuite/trunk/client/pom.xml Wed May 5 14:43:15 2010
@@ -16,157 +16,156 @@
<groupId>org.apache.myfaces.portlet-bridge</groupId>
<version>1.0.0-SNAPSHOT</version>
</parent>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>1.3</version>
- <executions>
- <execution>
- <id>add-tck-source</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>add-test-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>${basedir}/../src/test/java</source>
- </sources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <phase>test</phase>
- <configuration>
- <tasks>
- <delete dir="../target/site"/>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
+ <profiles>
+ <profile>
+ <id>run-test</id>
+ <activation>
+ <property>
+ <name>tck.external-server</name>
+ <value>run-test</value>
+ </property>
+ </activation>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.3</version>
+ <executions>
+ <execution>
+ <id>add-tck-source</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>add-test-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+ <source>${basedir}/../src/test/java</source>
+ </sources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>test</phase>
+ <configuration>
+ <tasks>
+ <delete dir="../target/site"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>selenium-maven-plugin</artifactId>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-report-plugin</artifactId>
- <configuration>
- <outputName>${artifactId}-report</outputName>
- <outputDirectory>../target</outputDirectory>
- </configuration>
- </plugin>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>selenium-maven-plugin</artifactId>
+ </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>selenium-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>start</id>
- <phase>process-test-classes</phase>
- <goals>
- <goal>start-server</goal>
- </goals>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-report-plugin</artifactId>
<configuration>
- <background>true</background>
- <logOutput>true</logOutput>
- <multiWindow>true</multiWindow>
+ <outputName>${artifactId}-report</outputName>
+ <outputDirectory>../target</outputDirectory>
</configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-</project>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.myfaces.portlet-bridge</groupId>
- <artifactId>portlet-bridge-testsuite-client</artifactId>
- <packaging>jar</packaging>
- <name>MyFaces Portlet Bridge Test Suite Client</name>
- <version>1.0.0-SNAPSHOT</version>
- <inceptionYear>2007</inceptionYear>
- <description>
-
- </description>
-
- <parent>
- <artifactId>portlet-bridge-testsuite-master</artifactId>
- <groupId>org.apache.myfaces.portlet-bridge</groupId>
- <version>1.0.0-SNAPSHOT</version>
- </parent>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>1.3</version>
- <executions>
- <execution>
- <id>add-tck-source</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>add-test-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>${basedir}/../src/test/java</source>
- </sources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
-
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>selenium-maven-plugin</artifactId>
- </plugin>
+ </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-report-plugin</artifactId>
- </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>selenium-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>start</id>
+ <phase>process-test-classes</phase>
+ <goals>
+ <goal>start-server</goal>
+ </goals>
+ <configuration>
+ <background>true</background>
+ <logOutput>true</logOutput>
+ <multiWindow>true</multiWindow>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+ </profile>
+
+ <profile>
+ <id>generate-test-file-only</id>
+ <activation>
+ <property>
+ <name>tck.external-server</name>
+ <value>generate-test-file-template</value>
+ </property>
+ </activation>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>selenium-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>start</id>
- <phase>process-test-classes</phase>
- <goals>
- <goal>start-server</goal>
- </goals>
- <configuration>
- <background>true</background>
- <logOutput>true</logOutput>
- <multiWindow>true</multiWindow>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
+ <properties>
+ <maven.skip.tests>true</maven.skip.tests>
+ <bridge.tck.test.file.stylesheet>../src/test/resources/test-template.xsl</bridge.tck.test.file.stylesheet>
+ <bridge.tck.test.file.servlet.path>page-servlet-path</bridge.tck.test.file.servlet.path>
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>xml-maven-plugin</artifactId>
+ <configuration>
+ <transformationSets>
+ <transformationSet>
+ <dir>../portlet-bridge-testsuite-main/src/main/webapp/WEB-INF</dir>
+ <includes>
+ <include>portlet.xml</include>
+ </includes>
+ <outputDir>${bridge.tck.test.file.dir}</outputDir>
+ <fileMappers>
+ <fileMapper implementation="org.codehaus.plexus.components.io.filemappers.MergeFileMapper">
+ <targetName>${bridge.tck.test.file.name}</targetName>
+ </fileMapper>
+ </fileMappers>
+ <parameters>
+ <parameter>
+ <name>page-path</name>
+ <value>${bridge.tck.test.file.servlet.path}</value>
+ </parameter>
+ <parameter>
+ <name>portlet-def-1-xml</name>
+ <value>${basedir}/../portlet-bridge-testsuite-section3-2-lifecycle-set/src/main/webapp/WEB-INF/portlet.xml</value>
+ </parameter>
+ <parameter>
+ <name>portlet-def-2-xml</name>
+ <value>${basedir}/../portlet-bridge-testsuite-section3-2-render-policy-always-delegate/src/main/webapp/WEB-INF/portlet.xml</value>
+ </parameter>
+ <parameter>
+ <name>portlet-def-3-xml</name>
+ <value>${basedir}/../portlet-bridge-testsuite-section3-2-render-policy-never-delegate/src/main/webapp/WEB-INF/portlet.xml</value>
+ </parameter>
+ <parameter>
+ <name>portlet-def-4-xml</name>
+ <value>${basedir}/../portlet-bridge-testsuite-section3-2-render-policy-default/src/main/webapp/WEB-INF/portlet.xml</value>
+ </parameter>
+ </parameters>
+ <stylesheet>${bridge.tck.test.file.stylesheet}</stylesheet>
+ </transformationSet>
+ </transformationSets>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
Modified: myfaces/portlet-bridge/testsuite/trunk/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/testsuite/trunk/pom.xml?rev=941318&r1=941317&r2=941318&view=diff
==============================================================================
--- myfaces/portlet-bridge/testsuite/trunk/pom.xml (original)
+++ myfaces/portlet-bridge/testsuite/trunk/pom.xml Wed May 5 14:43:15 2010
@@ -73,6 +73,11 @@
<bridge.tck.browser>*firefox</bridge.tck.browser>
<bridge.tck.login-file></bridge.tck.login-file>
+ <bridge.tck.test.file.dir>${project.build.directory}/generated-resources/xml/xslt</bridge.tck.test.file.dir>
+ <bridge.tck.test.file.name>test.xml</bridge.tck.test.file.name>
+ <bridge.tck.test.file>${bridge.tck.test.file.dir}/${bridge.tck.test.file.name}</bridge.tck.test.file>
+ <bridge.tck.test.exclusions.file>../src/test/resources/test-exclusions.xml</bridge.tck.test.exclusions.file>
+ <bridge.tck.test.file.stylesheet>${basedir}/../src/test/resources/test.xsl</bridge.tck.test.file.stylesheet>
</properties>
<!-- issueManagement is in parent -->
@@ -230,7 +235,9 @@
</plugins>
<pluginManagement>
+ <!-- This section will be inherited by all sub modules -->
<plugins>
+
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>selenium-maven-plugin</artifactId>
@@ -248,6 +255,10 @@
<value>${bridge.tck.test.file}</value>
</property>
<property>
+ <name>bridge.tck.test.exclusions.file</name>
+ <value>${bridge.tck.test.exclusions.file}</value>
+ </property>
+ <property>
<name>bridge.tck.test.base-url</name>
<value>http://${bridge.tck.test.host}:${bridge.tck.test.port}</value>
</property>
@@ -291,29 +302,47 @@
<stopKey>foo</stopKey>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>xml-maven-plugin</artifactId>
+ <configuration>
+ <transformationSets>
+ <transformationSet>
+ <dir>${basedir}/src/main/webapp/WEB-INF</dir>
+ <includes>
+ <include>portlet.xml</include>
+ </includes>
+ <outputDir>${bridge.tck.test.file.dir}</outputDir>
+ <fileMappers>
+ <fileMapper implementation="org.codehaus.plexus.components.io.filemappers.MergeFileMapper">
+ <targetName>${bridge.tck.test.file.name}</targetName>
+ </fileMapper>
+ </fileMappers>
+ <parameters>
+ <parameter>
+ <name>page-path</name>
+ <value>${bridge.tck.test.path}</value>
+ </parameter>
+ </parameters>
+ <stylesheet>${bridge.tck.test.file.stylesheet}</stylesheet>
+ </transformationSet>
+ </transformationSets>
+ </configuration>
+ </plugin>
</plugins>
</pluginManagement>
</build>
<profiles>
+
<profile>
- <id>generate-wars</id>
+ <id>include-war-modules</id>
<activation>
<property>
- <name>!tck.client-only</name>
+ <name>!tck.external-server</name>
</property>
</activation>
- <properties>
- <maven.test.failure.ignore>true</maven.test.failure.ignore>
- <bridge.tck.test.file.dir>${project.build.directory}/generated-resources/xml/xslt</bridge.tck.test.file.dir>
- <bridge.tck.test.file.name>test.xml</bridge.tck.test.file.name>
- <bridge.tck.test.file>${bridge.tck.test.file.dir}/${bridge.tck.test.file.name}</bridge.tck.test.file>
- <bridge.tck.test.file.stylesheet>${basedir}/../src/test/resources/test.xsl</bridge.tck.test.file.stylesheet>
- <bridge.tck.test.host>localhost</bridge.tck.test.host>
- <bridge.tck.test.port>8080</bridge.tck.test.port>
- </properties>
-
<modules>
<module>portlet-bridge-testsuite-main</module>
<module>portlet-bridge-testsuite-section3-2-lifecycle-set</module>
@@ -324,10 +353,10 @@
</profile>
<profile>
- <id>client-only</id>
+ <id>include-external-server-module</id>
<activation>
<property>
- <name>tck.client-only</name>
+ <name>tck.external-server</name>
</property>
</activation>
@@ -361,6 +390,12 @@
</property>
</activation>
+ <properties>
+ <maven.test.failure.ignore>true</maven.test.failure.ignore>
+ <bridge.tck.test.host>localhost</bridge.tck.test.host>
+ <bridge.tck.test.port>8080</bridge.tck.test.port>
+ </properties>
+
<dependencies>
<dependency>
<groupId>${jsf.api.groupId}</groupId>
@@ -408,6 +443,7 @@
<groupId>org.apache.pluto</groupId>
<artifactId>maven-pluto-plugin</artifactId>
</plugin>
+
</plugins>
</build>
</profile>
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=941318&r1=941317&r2=941318&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 Wed May 5 14:43:15 2010
@@ -139,29 +139,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>xml-maven-plugin</artifactId>
- <configuration>
- <transformationSets>
- <transformationSet>
- <dir>${basedir}/src/main/webapp/WEB-INF</dir>
- <includes>
- <include>portlet.xml</include>
- </includes>
- <outputDir>${bridge.tck.test.file.dir}</outputDir>
- <fileMappers>
- <fileMapper implementation="org.codehaus.plexus.components.io.filemappers.MergeFileMapper">
- <targetName>${bridge.tck.test.file.name}</targetName>
- </fileMapper>
- </fileMappers>
- <parameters>
- <parameter>
- <name>page-path</name>
- <value>${bridge.tck.test.path}</value>
- </parameter>
- </parameters>
- <stylesheet>${bridge.tck.test.file.stylesheet}</stylesheet>
- </transformationSet>
- </transformationSets>
- </configuration>
</plugin>
</plugins>
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=941318&r1=941317&r2=941318&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 Wed May 5 14:43:15 2010
@@ -140,29 +140,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>xml-maven-plugin</artifactId>
- <configuration>
- <transformationSets>
- <transformationSet>
- <dir>${basedir}/src/main/webapp/WEB-INF</dir>
- <includes>
- <include>portlet.xml</include>
- </includes>
- <outputDir>${bridge.tck.test.file.dir}</outputDir>
- <fileMappers>
- <fileMapper implementation="org.codehaus.plexus.components.io.filemappers.MergeFileMapper">
- <targetName>${bridge.tck.test.file.name}</targetName>
- </fileMapper>
- </fileMappers>
- <parameters>
- <parameter>
- <name>page-path</name>
- <value>${bridge.tck.test.path}</value>
- </parameter>
- </parameters>
- <stylesheet>${bridge.tck.test.file.stylesheet}</stylesheet>
- </transformationSet>
- </transformationSets>
- </configuration>
</plugin>
</plugins>
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=941318&r1=941317&r2=941318&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 Wed May 5 14:43:15 2010
@@ -140,31 +140,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>xml-maven-plugin</artifactId>
- <configuration>
- <transformationSets>
- <transformationSet>
- <dir>${basedir}/src/main/webapp/WEB-INF</dir>
- <includes>
- <include>portlet.xml</include>
- </includes>
- <outputDir>${bridge.tck.test.file.dir}</outputDir>
- <fileMappers>
- <fileMapper implementation="org.codehaus.plexus.components.io.filemappers.MergeFileMapper">
- <targetName>${bridge.tck.test.file.name}</targetName>
- </fileMapper>
- </fileMappers>
- <parameters>
- <parameter>
- <name>page-path</name>
- <value>${bridge.tck.test.path}</value>
- </parameter>
- </parameters>
- <stylesheet>${bridge.tck.test.file.stylesheet}</stylesheet>
- </transformationSet>
- </transformationSets>
- </configuration>
</plugin>
-
</plugins>
</build>
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=941318&r1=941317&r2=941318&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 Wed May 5 14:43:15 2010
@@ -138,34 +138,6 @@
</plugin>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>xml-maven-plugin</artifactId>
- <configuration>
- <transformationSets>
- <transformationSet>
- <dir>${basedir}/src/main/webapp/WEB-INF</dir>
- <includes>
- <include>portlet.xml</include>
- </includes>
- <outputDir>${bridge.tck.test.file.dir}</outputDir>
- <fileMappers>
- <fileMapper implementation="org.codehaus.plexus.components.io.filemappers.MergeFileMapper">
- <targetName>${bridge.tck.test.file.name}</targetName>
- </fileMapper>
- </fileMappers>
- <parameters>
- <parameter>
- <name>page-path</name>
- <value>${bridge.tck.test.path}</value>
- </parameter>
- </parameters>
- <stylesheet>${bridge.tck.test.file.stylesheet}</stylesheet>
- </transformationSet>
- </transformationSets>
- </configuration>
- </plugin>
-
- <plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
@@ -183,6 +155,11 @@
</executions>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>xml-maven-plugin</artifactId>
+ </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=941318&r1=941317&r2=941318&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 Wed May 5 14:43:15 2010
@@ -140,29 +140,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>xml-maven-plugin</artifactId>
- <configuration>
- <transformationSets>
- <transformationSet>
- <dir>${basedir}/src/main/webapp/WEB-INF</dir>
- <includes>
- <include>portlet.xml</include>
- </includes>
- <outputDir>${bridge.tck.test.file.dir}</outputDir>
- <fileMappers>
- <fileMapper implementation="org.codehaus.plexus.components.io.filemappers.MergeFileMapper">
- <targetName>${bridge.tck.test.file.name}</targetName>
- </fileMapper>
- </fileMappers>
- <parameters>
- <parameter>
- <name>page-path</name>
- <value>${bridge.tck.test.path}</value>
- </parameter>
- </parameters>
- <stylesheet>${bridge.tck.test.file.stylesheet}</stylesheet>
- </transformationSet>
- </transformationSets>
- </configuration>
</plugin>
</plugins>
Modified: myfaces/portlet-bridge/testsuite/trunk/src/test/java/org/apache/myfaces/portlet/faces/tckharness/TckTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/testsuite/trunk/src/test/java/org/apache/myfaces/portlet/faces/tckharness/TckTestCase.java?rev=941318&r1=941317&r2=941318&view=diff
==============================================================================
--- myfaces/portlet-bridge/testsuite/trunk/src/test/java/org/apache/myfaces/portlet/faces/tckharness/TckTestCase.java (original)
+++ myfaces/portlet-bridge/testsuite/trunk/src/test/java/org/apache/myfaces/portlet/faces/tckharness/TckTestCase.java Wed May 5 14:43:15 2010
@@ -84,6 +84,7 @@ public class TckTestCase
private static final String CLIENT_BASE_URL_KEY = "bridge.tck.test.base-url";
private static final String TEST_FILE_KEY = "bridge.tck.test.file";
private static final String TEST_FILTER_KEY = "bridge.tck.test.filter";
+ private static final String TEST_EXCLUSIONS_FILE_KEY = "bridge.tck.test.exclusions.file";
private static final String SELENIUM_BROWSER_KEY = "bridge.tck.browser";
private static final String SELENIUM_HOST_KEY = "bridge.tck.selenium.host";
private static final String SELENIUM_PORT_KEY = "bridge.tck.selenium.port";
@@ -94,6 +95,7 @@ public class TckTestCase
private static String sClientBaseUrl;
private static String sTestFile;
+ private static String sTestExclusionsFile;
private static String sTestFilter;
private static String sSeleniumBrowser; // = DEFAULT_SELENIUM_BROWSER;
private static String sSeleniumHost; // = DEFAULT_SELENIUM_HOST;
@@ -107,13 +109,11 @@ public class TckTestCase
public static void log(String msg)
{
- //System.out.println(msg);
Logger.getLogger("global").log(Level.INFO, msg);
}
public static void errLog(String msg)
{
- // System.out.println("ERR: " + msg);
Logger.getLogger("global").log(Level.SEVERE, msg);
}
@@ -180,6 +180,7 @@ public class TckTestCase
sClientBaseUrl = getProperty(fileProps, CLIENT_BASE_URL_KEY, null, true);
sTestFilter = getProperty(fileProps, TEST_FILTER_KEY, null, false);
sTestFile = getProperty(fileProps, TEST_FILE_KEY, null, true);
+ sTestExclusionsFile = getProperty(fileProps, TEST_EXCLUSIONS_FILE_KEY, null, true);
sSeleniumHost = getProperty(fileProps, SELENIUM_HOST_KEY, DEFAULT_SELENIUM_HOST, false);
sSeleniumPort = Integer.parseInt(getProperty(fileProps, SELENIUM_PORT_KEY, DEFAULT_SELENIUM_PORT, false));
@@ -238,7 +239,6 @@ public class TckTestCase
public TckTestCase(String pageName, String testName)
{
- log("----- Constructor -------");
mPageName = pageName;
mTestName = testName;
}
@@ -359,7 +359,6 @@ public class TckTestCase
}
for (String[] field: sLoginFields)
{
- log("---- " + field[0] + " ---- " + field[1] + " ----" + sLoginButton);
sSelenium.type(field[0], field[1]);
}
sSelenium.click(sLoginButton);
@@ -380,7 +379,6 @@ public class TckTestCase
try
{
- // Test properties
Pattern filterPattern = null;
{
if ((sTestFilter != null) && (sTestFilter.length() > 0))
@@ -388,25 +386,31 @@ public class TckTestCase
filterPattern = Pattern.compile(sTestFilter);
}
}
+ FileInputStream exIs = new FileInputStream(sTestExclusionsFile);
+ Properties exProps = new Properties();
+ exProps.loadFromXML(exIs);
- FileInputStream fis = new FileInputStream(sTestFile);
+ FileInputStream tis = new FileInputStream(sTestFile);
Properties testProps = new Properties();
- testProps.loadFromXML(fis);
- Enumeration names = testProps.propertyNames();
- while (names.hasMoreElements())
+ testProps.loadFromXML(tis);
+ Enumeration tests = testProps.propertyNames();
+ while (tests.hasMoreElements())
{
- String page = (String)names.nextElement();
+ String page = (String)tests.nextElement();
String testName = testProps.getProperty(page);
- boolean useTestCase = true;
+ boolean filterMatch = true;
if (filterPattern != null)
{
Matcher m = filterPattern.matcher(testName);
- useTestCase = m.matches();
+ filterMatch = m.matches();
}
- if (useTestCase)
+ if (filterMatch)
{
- testList.add(new String[]{page, testName});
+ if (exProps.getProperty(testName) == null)
+ {
+ testList.add(new String[]{page, testName});
+ }
}
}
}
Added: myfaces/portlet-bridge/testsuite/trunk/src/test/resources/test-exclusions.xml
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/testsuite/trunk/src/test/resources/test-exclusions.xml?rev=941318&view=auto
==============================================================================
--- myfaces/portlet-bridge/testsuite/trunk/src/test/resources/test-exclusions.xml (added)
+++ myfaces/portlet-bridge/testsuite/trunk/src/test/resources/test-exclusions.xml Wed May 5 14:43:15 2010
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
+<properties>
+<entry key="renderPolicyTest"/>
+<entry key="lifecycleTest"/>
+</properties>
Added: myfaces/portlet-bridge/testsuite/trunk/src/test/resources/test-template.xsl
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/testsuite/trunk/src/test/resources/test-template.xsl?rev=941318&view=auto
==============================================================================
--- myfaces/portlet-bridge/testsuite/trunk/src/test/resources/test-template.xsl (added)
+++ myfaces/portlet-bridge/testsuite/trunk/src/test/resources/test-template.xsl Wed May 5 14:43:15 2010
@@ -0,0 +1,48 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:pa="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd">
+ <xsl:output method="xml" indent="yes" doctype-system="http://java.sun.com/dtd/properties.dtd"/>
+ <xsl:strip-space elements="pa:portlet-app"/>
+ <xsl:param name="page-path"/>
+ <xsl:param name="portlet-def-1-xml"/>
+ <xsl:param name="portlet-def-2-xml"/>
+ <xsl:param name="portlet-def-3-xml"/>
+ <xsl:param name="portlet-def-4-xml"/>
+ <xsl:template match="/">
+ <xsl:element name="properties">
+ <xsl:comment>Main tests</xsl:comment>
+ <xsl:apply-templates/>
+ <xsl:comment>Section3.2 Lifecycle set</xsl:comment>
+ <xsl:apply-templates select="document($portlet-def-1-xml)/pa:portlet-app"/>
+ <xsl:comment>Section3.2 Render policy set to ALWAYS_DELEGATE</xsl:comment>
+ <xsl:apply-templates select="document($portlet-def-2-xml)/pa:portlet-app"/>
+ <xsl:comment>Section3.2 Render policy set to NEVER_DELEGATE</xsl:comment>
+ <xsl:apply-templates select="document($portlet-def-3-xml)/pa:portlet-app"/>
+ <xsl:comment>Section3.2 Render policy set to DEFAULT</xsl:comment>
+ <xsl:apply-templates select="document($portlet-def-4-xml)/pa:portlet-app"/>
+ </xsl:element>
+ </xsl:template>
+ <xsl:template match="pa:portlet-app/pa:portlet">
+ <xsl:element name="entry">
+ <xsl:attribute name="key"><xsl:value-of select='$page-path'/></xsl:attribute>
+ <xsl:value-of select="substring-before(substring-after(pa:portlet-name,'-'),'-')"/>
+ </xsl:element>
+ </xsl:template>
+</xsl:stylesheet>
Added: myfaces/portlet-bridge/testsuite/trunk/src/test/resources/test.xml
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/testsuite/trunk/src/test/resources/test.xml?rev=941318&view=auto
==============================================================================
--- myfaces/portlet-bridge/testsuite/trunk/src/test/resources/test.xml (added)
+++ myfaces/portlet-bridge/testsuite/trunk/src/test/resources/test.xml Wed May 5 14:43:15 2010
@@ -0,0 +1,155 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
+<properties>
+<!--Main tests-->
+<entry key="page-servlet-path">bridgeVersionTest</entry>
+<entry key="page-servlet-path">renderPolicyTest</entry>
+<entry key="page-servlet-path">lifecycleTest</entry>
+<entry key="page-servlet-path">modeViewIDTest</entry>
+<entry key="page-servlet-path">destroyActionTest</entry>
+<entry key="page-servlet-path">destroyRenderTest</entry>
+<entry key="page-servlet-path">destroyDoubleTest</entry>
+<entry key="page-servlet-path">portletSetsViewIdTest</entry>
+<entry key="page-servlet-path">portletSetsViewPathTest</entry>
+<entry key="page-servlet-path">nullRequestActionTest</entry>
+<entry key="page-servlet-path">nullRequestRenderTest</entry>
+<entry key="page-servlet-path">initMethodTest</entry>
+<entry key="page-servlet-path">requestProcessingNonFacesTest</entry>
+<entry key="page-servlet-path">getBridgeClassNameMethodTest</entry>
+<entry key="page-servlet-path">getDefaultViewIdMapMethodTest</entry>
+<entry key="page-servlet-path">getExcludedRequestAttributesMethodSetListTest</entry>
+<entry key="page-servlet-path">getExcludedRequestAttributesMethodSetSingleValueTest</entry>
+<entry key="page-servlet-path">getExcludedRequestAttributesMethodNotSetTest</entry>
+<entry key="page-servlet-path">isPreserveActionParametersMethodSetTrueTest</entry>
+<entry key="page-servlet-path">isPreserveActionParametersMethodSetFalseTest</entry>
+<entry key="page-servlet-path">isPreserveActionParametersMethodNotSetTest</entry>
+<entry key="page-servlet-path">getResponseContentTypeMethodSetTest</entry>
+<entry key="page-servlet-path">getResponseContentTypeMethodNotSetTest</entry>
+<entry key="page-servlet-path">getResponseCharacterSetEncodingMethodSetTest</entry>
+<entry key="page-servlet-path">getResponseCharacterSetEncodingMethodNotSetTest</entry>
+<entry key="page-servlet-path">getFacesBridgeMethodTest</entry>
+<entry key="page-servlet-path">requestScopeContentsTest</entry>
+<entry key="page-servlet-path">requestScopeRestartedOnActionTest</entry>
+<entry key="page-servlet-path">requestNoScopeOnRedirectTest</entry>
+<entry key="page-servlet-path">requestNoScopeOnModeChangeTest</entry>
+<entry key="page-servlet-path">requestPreserveActionParamsTest</entry>
+<entry key="page-servlet-path">requestRenderIgnoresScopeViaCreateViewTest</entry>
+<entry key="page-servlet-path">requestRenderRedisplayTest</entry>
+<entry key="page-servlet-path">requestRedisplayOutOfScopeTest</entry>
+<entry key="page-servlet-path">excludedAttributesTest</entry>
+<entry key="page-servlet-path">verifyPortletObjectsTest</entry>
+<entry key="page-servlet-path">verifyPortletPhaseTest</entry>
+<entry key="page-servlet-path">portletSetsInvalidViewPathTest</entry>
+<entry key="page-servlet-path">renderRedirectTest</entry>
+<entry key="page-servlet-path">ignoreCurrentViewIdModeChangeTest</entry>
+<entry key="page-servlet-path">exceptionThrownWhenNoDefaultViewIdTest</entry>
+<entry key="page-servlet-path">viewIdWithParam_1_Test</entry>
+<entry key="page-servlet-path">viewIdWithParam_2_Test</entry>
+<entry key="page-servlet-path">facesContextReleasedActionTest</entry>
+<entry key="page-servlet-path">portletPhaseRemovedActionTest</entry>
+<entry key="page-servlet-path">bridgeSetsContentTypeTest</entry>
+<entry key="page-servlet-path">isPostbackTest</entry>
+<entry key="page-servlet-path">renderPhaseListenerTest</entry>
+<entry key="page-servlet-path">facesContextReleasedRenderTest</entry>
+<entry key="page-servlet-path">portletPhaseRemovedRenderTest</entry>
+<entry key="page-servlet-path">noViewStateParamOnModeChangeTest</entry>
+<entry key="page-servlet-path">checkViewHistoryTest</entry>
+<entry key="page-servlet-path">navigateToLastViewTest</entry>
+<entry key="page-servlet-path">facesContextFactoryServiceProviderTest</entry>
+<entry key="page-servlet-path">wrappedFacesContextTest</entry>
+<entry key="page-servlet-path">dispatchUsesIncludeTest</entry>
+<entry key="page-servlet-path">encodeActionURLPoundCharTest</entry>
+<entry key="page-servlet-path">encodeActionURLAbsoluteURLTest</entry>
+<entry key="page-servlet-path">encodeActionURLDirectLinkTrueTest</entry>
+<entry key="page-servlet-path">encodeActionURLDirectLinkFalseTest</entry>
+<entry key="page-servlet-path">encodeActionURLPortletRenderTest</entry>
+<entry key="page-servlet-path">encodeActionURLPortletActionTest</entry>
+<entry key="page-servlet-path">encodeActionURLJSFViewActionTest</entry>
+<entry key="page-servlet-path">encodeActionURLWithParamActionTest</entry>
+<entry key="page-servlet-path">encodeActionURLWithModeActionTest</entry>
+<entry key="page-servlet-path">encodeActionURLWithInvalidModeActionTest</entry>
+<entry key="page-servlet-path">encodeActionURLWithWindowStateActionTest</entry>
+<entry key="page-servlet-path">encodeActionURLWithInvalidWindowStateActionTest</entry>
+<entry key="page-servlet-path">encodeActionURLJSFViewRenderTest</entry>
+<entry key="page-servlet-path">encodeActionURLWithParamRenderTest</entry>
+<entry key="page-servlet-path">encodeActionURLWithModeRenderTest</entry>
+<entry key="page-servlet-path">encodeActionURLWithInvalidModeRenderTest</entry>
+<entry key="page-servlet-path">encodeActionURLWithWindowStateRenderTest</entry>
+<entry key="page-servlet-path">encodeActionURLWithInvalidWindowStateRenderTest</entry>
+<entry key="page-servlet-path">encodeURLEscapingTest</entry>
+<entry key="page-servlet-path">encodeResourceURLOpaqueTest</entry>
+<entry key="page-servlet-path">encodeResourceURLForeignExternalURLTest</entry>
+<entry key="page-servlet-path">encodeResourceURLForeignExternalURLBackLinkTest</entry>
+<entry key="page-servlet-path">encodeResourceURLRelativeURLTest</entry>
+<entry key="page-servlet-path">encodeResourceURLRelativeURLBackLinkTest</entry>
+<entry key="page-servlet-path">encodeResourceURLTest</entry>
+<entry key="page-servlet-path">encodeResourceURLBackLinkTest</entry>
+<entry key="page-servlet-path">encodeResourceURLViewLinkTest</entry>
+<entry key="page-servlet-path">encodeResourceURLViewLinkWithBackLinkTest</entry>
+<entry key="page-servlet-path">getSetRequestObjectTest</entry>
+<entry key="page-servlet-path">setRequestCharacterEncodingRenderTest</entry>
+<entry key="page-servlet-path">setRequestCharacterEncodingActionTest</entry>
+<entry key="page-servlet-path">getRequestHeaderMapRenderTest</entry>
+<entry key="page-servlet-path">getRequestHeaderMapActionTest</entry>
+<entry key="page-servlet-path">getRequestHeaderValuesMapRenderTest</entry>
+<entry key="page-servlet-path">getRequestHeaderValuesMapActionTest</entry>
+<entry key="page-servlet-path">requestMapCoreTest</entry>
+<entry key="page-servlet-path">requestMapRequestScopeTest</entry>
+<entry key="page-servlet-path">getRequestParameterMapCoreTest</entry>
+<entry key="page-servlet-path">getRequestParameterPreserveParamsTest</entry>
+<entry key="page-servlet-path">getRequestParameterDefaultViewParamsTest</entry>
+<entry key="page-servlet-path">getRequestParameterNamesCoreTest</entry>
+<entry key="page-servlet-path">getRequestParameterNamesPreserveParamsTest</entry>
+<entry key="page-servlet-path">getRequestParameterNamesDefaultViewParamsTest</entry>
+<entry key="page-servlet-path">getRequestPathInfoTest</entry>
+<entry key="page-servlet-path">getRequestServletPathTest</entry>
+<entry key="page-servlet-path">getRequestCharacterEncodingRenderTest</entry>
+<entry key="page-servlet-path">getRequestCharacterEncodingActionTest</entry>
+<entry key="page-servlet-path">getRequestContentTypeRenderTest</entry>
+<entry key="page-servlet-path">getRequestContentTypeActionTest</entry>
+<entry key="page-servlet-path">getResponseCharacterEncodingRenderTest</entry>
+<entry key="page-servlet-path">getResponseCharacterEncodingActionTest</entry>
+<entry key="page-servlet-path">getResponseContentTypeRenderTest</entry>
+<entry key="page-servlet-path">getResponseContentTypeActionTest</entry>
+<entry key="page-servlet-path">redirectActionTest</entry>
+<entry key="page-servlet-path">redirectRenderTest</entry>
+<entry key="page-servlet-path">illegalRedirectRenderTest</entry>
+<entry key="page-servlet-path">encodeNamespaceTest</entry>
+<entry key="page-servlet-path">getApplicationMapTest</entry>
+<entry key="page-servlet-path">getAuthTypeTest</entry>
+<entry key="page-servlet-path">getContextTest</entry>
+<entry key="page-servlet-path">getInitParameterTest</entry>
+<entry key="page-servlet-path">getInitParameterMapTest</entry>
+<entry key="page-servlet-path">getRemoteUserTest</entry>
+<entry key="page-servlet-path">getRequestContextPathTest</entry>
+<entry key="page-servlet-path">getRequestCookieMapTest</entry>
+<entry key="page-servlet-path">getRequestLocaleTest</entry>
+<entry key="page-servlet-path">getRequestLocalesTest</entry>
+<entry key="page-servlet-path">getResourceTest</entry>
+<entry key="page-servlet-path">getResourceAsStreamTest</entry>
+<entry key="page-servlet-path">getResourcePathsTest</entry>
+<entry key="page-servlet-path">setResponseCharacterEncodingTest</entry>
+<entry key="page-servlet-path">getSessionTest</entry>
+<entry key="page-servlet-path">getSessionMapTest</entry>
+<entry key="page-servlet-path">isPortletNamingContainerTest</entry>
+<entry key="page-servlet-path">hasRenderContentAfterViewAttributeTest</entry>
+<entry key="page-servlet-path">renderContentAfterViewTest</entry>
+<entry key="page-servlet-path">JSF_ELTest</entry>
+<entry key="page-servlet-path">JSP_ELTest</entry>
+<entry key="page-servlet-path">portletNamingContainerClientIdTest</entry>
+<entry key="page-servlet-path">portletNamingContainerClientIdConsistentTest</entry>
+<entry key="page-servlet-path">portletNamingContainerUIViewRootTest</entry>
+<entry key="page-servlet-path">portletNamingContainerUIViewRootClientIdTest</entry>
+<entry key="page-servlet-path">restoredViewStateParameterTest</entry>
+<entry key="page-servlet-path">setsIsPostbackAttributeTest</entry>
+<entry key="page-servlet-path">singleRequestTest</entry>
+<entry key="page-servlet-path">multiRequestTest</entry>
+<!--Section3.2 Lifecycle set-->
+<entry key="page-servlet-path">lifecycleTest</entry>
+<!--Section3.2 Render policy set to ALWAYS_DELEGATE-->
+<entry key="page-servlet-path">renderPolicyTest</entry>
+<!--Section3.2 Render policy set to NEVER_DELEGATE-->
+<entry key="page-servlet-path">renderPolicyTest</entry>
+<!--Section3.2 Render policy set to DEFAULT-->
+<entry key="page-servlet-path">renderPolicyTest</entry>
+</properties>
Modified: myfaces/portlet-bridge/testsuite/trunk/src/test/resources/test.xsl
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/testsuite/trunk/src/test/resources/test.xsl?rev=941318&r1=941317&r2=941318&view=diff
==============================================================================
--- myfaces/portlet-bridge/testsuite/trunk/src/test/resources/test.xsl (original)
+++ myfaces/portlet-bridge/testsuite/trunk/src/test/resources/test.xsl Wed May 5 14:43:15 2010
@@ -26,10 +26,13 @@
<xsl:apply-templates/>
</xsl:element>
</xsl:template>
- <xsl:template match="pa:portlet-app/pa:portlet">
+ <!-- Create entry element for every portlet except the JSP EL Test portlet. -->
+ <xsl:template match="pa:portlet-app/pa:portlet[pa:portlet-name!='chapter6_5_1Tests-JSP_ELTest-portlet']">
<xsl:element name="entry">
<xsl:attribute name="key"><xsl:value-of select='$page-path'/><xsl:value-of select="pa:portlet-name"/></xsl:attribute>
<xsl:value-of select="substring-before(substring-after(pa:portlet-name,'-'),'-')"/>
</xsl:element>
</xsl:template>
+ <!-- Create nothing for JSP EL Test portlet. -->
+ <xsl:template match="pa:portlet-app/pa:portlet[pa:portlet-name='chapter6_5_1Tests-JSP_ELTest-portlet']"/>
</xsl:stylesheet>