[Jsf4portlets-devel] SF.net SVN: jsf4portlets:[95] trunk/jsf4portlets-tck
Status: Alpha
Brought to you by:
alonsoft
From: <alo...@us...> - 2012-06-24 20:10:27
|
Revision: 95 http://jsf4portlets.svn.sourceforge.net/jsf4portlets/?rev=95&view=rev Author: alonsoft Date: 2012-06-24 20:10:21 +0000 (Sun, 24 Jun 2012) Log Message: ----------- added selenium Modified Paths: -------------- trunk/jsf4portlets-tck/jsf4portlets-tck-core/pom.xml trunk/jsf4portlets-tck/jsf4portlets-tck-webapp/pom.xml trunk/jsf4portlets-tck/jsf4portlets-tck-webapp/src/test/java/net/sf/jsf4portlets/tck/test/Chapter3_1Test.java Added Paths: ----------- trunk/jsf4portlets-tck/jsf4portlets-tck-webapp/src/test/java/net/sf/jsf4portlets/tck/common/ trunk/jsf4portlets-tck/jsf4portlets-tck-webapp/src/test/java/net/sf/jsf4portlets/tck/common/TCKSeleniumTestCase.java Modified: trunk/jsf4portlets-tck/jsf4portlets-tck-core/pom.xml =================================================================== --- trunk/jsf4portlets-tck/jsf4portlets-tck-core/pom.xml 2012-06-24 19:30:17 UTC (rev 94) +++ trunk/jsf4portlets-tck/jsf4portlets-tck-core/pom.xml 2012-06-24 20:10:21 UTC (rev 95) @@ -64,10 +64,12 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> + <scope>compile</scope> </dependency> <dependency> <groupId>org.hamcrest</groupId> <artifactId>hamcrest-all</artifactId> + <scope>compile</scope> </dependency> </dependencies> </project> \ No newline at end of file Modified: trunk/jsf4portlets-tck/jsf4portlets-tck-webapp/pom.xml =================================================================== --- trunk/jsf4portlets-tck/jsf4portlets-tck-webapp/pom.xml 2012-06-24 19:30:17 UTC (rev 94) +++ trunk/jsf4portlets-tck/jsf4portlets-tck-webapp/pom.xml 2012-06-24 20:10:21 UTC (rev 95) @@ -20,6 +20,15 @@ <build> <finalName>${project.artifactId}</finalName> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>selenium-maven-plugin</artifactId> + <version>2.3</version> + </plugin> + </plugins> + </pluginManagement> <plugins> <plugin> <groupId>org.apache.pluto</groupId> @@ -49,7 +58,29 @@ <value>jsf4portlets:chapter3_2</value> </systemProperty> </systemProperties> + <stopPort>9966</stopPort> + <stopKey>maven</stopKey> </configuration> + <executions> + <execution> + <id>start-jetty</id> + <phase>pre-integration-test</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <scanIntervalSeconds>0</scanIntervalSeconds> + <daemon>true</daemon> + </configuration> + </execution> + <execution> + <id>stop-jetty</id> + <phase>post-integration-test</phase> + <goals> + <goal>stop</goal> + </goals> + </execution> + </executions> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -62,7 +93,6 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>selenium-maven-plugin</artifactId> - <version>2.3</version> <executions> <execution> <id>start-selenium</id> @@ -90,32 +120,26 @@ <dependency> <groupId>javax.el</groupId> <artifactId>el-api</artifactId> - <scope>compile</scope> </dependency> <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> - <scope>compile</scope> </dependency> <dependency> <groupId>javax.servlet.jsp</groupId> <artifactId>jsp-api</artifactId> - <scope>compile</scope> </dependency> <dependency> <groupId>javax.faces</groupId> <artifactId>jsf-api</artifactId> - <scope>compile</scope> </dependency> <dependency> <groupId>javax.annotation</groupId> <artifactId>jsr250-api</artifactId> - <scope>compile</scope> </dependency> <dependency> <groupId>javax.portlet</groupId> <artifactId>portlet-api</artifactId> - <scope>compile</scope> </dependency> <dependency> @@ -162,5 +186,40 @@ <groupId>org.hamcrest</groupId> <artifactId>hamcrest-all</artifactId> </dependency> + <dependency> + <groupId>org.seleniumhq.selenium</groupId> + <artifactId>selenium-java</artifactId> + <version>2.24.1</version> + <scope>test</scope> + </dependency> </dependencies> + + <profiles> + <profile> + <id>teamcity-build</id> + <activation> + <property> + <name>teamcity.running</name> + <value>true</value> + </property> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>selenium-maven-plugin</artifactId> + <executions> + <execution> + <id>start-xvfb</id> + <phase>pre-integration-test</phase> + <goals> + <goal>xvfb</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> </project> \ No newline at end of file Added: trunk/jsf4portlets-tck/jsf4portlets-tck-webapp/src/test/java/net/sf/jsf4portlets/tck/common/TCKSeleniumTestCase.java =================================================================== --- trunk/jsf4portlets-tck/jsf4portlets-tck-webapp/src/test/java/net/sf/jsf4portlets/tck/common/TCKSeleniumTestCase.java (rev 0) +++ trunk/jsf4portlets-tck/jsf4portlets-tck-webapp/src/test/java/net/sf/jsf4portlets/tck/common/TCKSeleniumTestCase.java 2012-06-24 20:10:21 UTC (rev 95) @@ -0,0 +1,42 @@ +package net.sf.jsf4portlets.tck.common; + +import com.thoughtworks.selenium.DefaultSelenium; +import com.thoughtworks.selenium.Selenium; +import net.sf.jsf4portlets.tck.TCKConstants; +import org.junit.AfterClass; +import org.junit.BeforeClass; + +public abstract class TCKSeleniumTestCase { + + private static final String PROPERTY_PREFIX = TCKConstants.TCK_PREFIX + "test.selenium."; + + public static final String BROWSER_START_COMMAND = PROPERTY_PREFIX + ".browser.cmd"; + public static final String BROWSER_URL = PROPERTY_PREFIX + ".browser.url"; + public static final String SERVER_HOST = PROPERTY_PREFIX + "server.host"; + public static final String SERVER_PORT = PROPERTY_PREFIX + "server.port"; + + public static final String DEFAULT_SERVER_HOST = "localhost"; + public static final String DEFAULT_SERVER_PORT = "8080"; + public static final String DEFAULT_BROWSER_START_COMMAND = "firefox"; + public static final String DEFAULT_BROWSER_URL = "http://localhost:8080/TCKPortal"; + + protected static Selenium selenium; + + @BeforeClass + public static void initSelenium() { + String serverHost = System.getProperty(SERVER_HOST, DEFAULT_SERVER_HOST); + int serverPort = Integer.valueOf(System.getProperty(SERVER_PORT, DEFAULT_SERVER_PORT)); + String browserStartCmd = System.getProperty(BROWSER_START_COMMAND, DEFAULT_BROWSER_START_COMMAND); + String browserUrl = System.getProperty(BROWSER_URL, DEFAULT_BROWSER_URL); + + selenium = new DefaultSelenium(serverHost, serverPort, browserStartCmd, browserUrl); + selenium.start(); + } + + @AfterClass + public static void stopSelenium() { + selenium.stop(); + selenium = null; + } + +} Modified: trunk/jsf4portlets-tck/jsf4portlets-tck-webapp/src/test/java/net/sf/jsf4portlets/tck/test/Chapter3_1Test.java =================================================================== --- trunk/jsf4portlets-tck/jsf4portlets-tck-webapp/src/test/java/net/sf/jsf4portlets/tck/test/Chapter3_1Test.java 2012-06-24 19:30:17 UTC (rev 94) +++ trunk/jsf4portlets-tck/jsf4portlets-tck-webapp/src/test/java/net/sf/jsf4portlets/tck/test/Chapter3_1Test.java 2012-06-24 20:10:21 UTC (rev 95) @@ -4,8 +4,8 @@ import javax.portlet.faces.GenericFacesPortlet; -import static org.junit.Assert.*; -import static org.hamcrest.Matchers.*; +import static org.hamcrest.Matchers.equalTo; +import static org.junit.Assert.assertThat; public class Chapter3_1Test { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |