This is an automated email from the ASF dual-hosted git repository. benw pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tapestry-5.git
commit 938543511515c4d7c048dd03cb7df4c6d59b87e7 Author: Ben Weidig <[email protected]> AuthorDate: Sat Feb 7 13:32:40 2026 +0100 TAP5-2817: SeleniumTestCase rename container constants --- .../src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java | 8 ++++---- .../java/org/apache/tapestry5/test/TapestryTestConfiguration.java | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java b/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java index 159c6bf69..8183d0df6 100644 --- a/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java +++ b/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java @@ -71,9 +71,9 @@ public abstract class SeleniumTestCase extends Assert implements Selenium */ public static final String PAGE_LOAD_TIMEOUT = "15000"; - public static final String TOMCAT_6 = "tomcat6"; + public static final String TOMCAT = "tomcat"; - public static final String JETTY_7 = "jetty7"; + public static final String JETTY = "jetty"; /** * An XPath expression for locating a submit element (very commonly used @@ -419,12 +419,12 @@ public abstract class SeleniumTestCase extends Assert implements Selenium private ServletContainerRunner createWebServer(String container, String webAppFolder, String contextPath, int port, int sslPort) throws Exception { - if (TOMCAT_6.equals(container)) + if (TOMCAT.equals(container)) { return new TomcatRunner(webAppFolder, contextPath, port, sslPort); } - if (JETTY_7.equals(container)) + if (JETTY.equals(container)) { return new JettyRunner(webAppFolder, contextPath, port, sslPort); } diff --git a/tapestry-test/src/main/java/org/apache/tapestry5/test/TapestryTestConfiguration.java b/tapestry-test/src/main/java/org/apache/tapestry5/test/TapestryTestConfiguration.java index 080710f41..ef9f9d94a 100644 --- a/tapestry-test/src/main/java/org/apache/tapestry5/test/TapestryTestConfiguration.java +++ b/tapestry-test/src/main/java/org/apache/tapestry5/test/TapestryTestConfiguration.java @@ -38,10 +38,10 @@ public @interface TapestryTestConfiguration String webAppFolder() default "src/main/webapp"; /** - * Which container to use. Can be one of {@link SeleniumTestCase#JETTY_7} or {@link SeleniumTestCase#TOMCAT_6}. - * Defaults to {@link SeleniumTestCase#JETTY_7}. + * Which container to use. Can be one of {@link SeleniumTestCase#JETTY} or {@link SeleniumTestCase#TOMCAT}. + * Defaults to {@link SeleniumTestCase#JETTY}. */ - String container() default SeleniumTestCase.JETTY_7; + String container() default SeleniumTestCase.JETTY; /** * The context path to make the application available under. Defaults to "", i.e. the context root.
