diff options
6 files changed, 13 insertions, 11 deletions
@@ -47,8 +47,7 @@ <!-- Dependency unpack directory --> <dependency.unpack.directory>${project.build.directory}/dependency-unpack</dependency.unpack.directory> - <!-- Cannot use 9.3 or 9.4 because they sometimes reset the connection too early in case of errors --> - <jetty.version>9.4.14.v20181114</jetty.version> + <jetty.version>9.4.38.v20210224</jetty.version> <phantomjs.version>2.1.1</phantomjs.version> </properties> diff --git a/test/pom.xml b/test/pom.xml index bf36456e2a..c0f7c6f297 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -11,7 +11,7 @@ <maven.compiler.source>1.6</maven.compiler.source> <maven.compiler.target>1.6</maven.compiler.target> <failOnMissingWebXml>false</failOnMissingWebXml> - <jetty.version>9.3.7.v20160115</jetty.version> + <jetty.version>9.4.38.v20210224</jetty.version> <phantomjs.version>2.1.1</phantomjs.version> <testbench.version>4.2.2</testbench.version> <testbench.api.version>7.7.14</testbench.api.version> diff --git a/test/servlet-containers/jetty9/pom.xml b/test/servlet-containers/jetty9/pom.xml index d46b826786..4c420bd3c9 100644 --- a/test/servlet-containers/jetty9/pom.xml +++ b/test/servlet-containers/jetty9/pom.xml @@ -12,7 +12,7 @@ <packaging>war</packaging> <properties> <jetty.skip>false</jetty.skip> - <jetty.version>9.3.21.v20170918</jetty.version> + <jetty.version>9.4.38.v20210224</jetty.version> <server.name>jetty9</server.name> </properties> diff --git a/uitest/src/test/java/com/vaadin/tests/applicationservlet/NoApplicationClassTest.java b/uitest/src/test/java/com/vaadin/tests/applicationservlet/NoApplicationClassTest.java index 546be29885..82737e40ba 100644 --- a/uitest/src/test/java/com/vaadin/tests/applicationservlet/NoApplicationClassTest.java +++ b/uitest/src/test/java/com/vaadin/tests/applicationservlet/NoApplicationClassTest.java @@ -11,7 +11,7 @@ public class NoApplicationClassTest extends SingleBrowserTest { @Test public void testInvalidApplicationClass() { openTestURL(); - String exceptionMessage = getDriver().findElement(By.xpath("//pre[2]")) + String exceptionMessage = getDriver().findElement(By.xpath("//pre[1]")) .getText(); String expected = "ServletException: java.lang.ClassNotFoundException: ClassThatIsNotPresent"; Assert.assertTrue( diff --git a/uitest/src/test/java/com/vaadin/tests/components/ui/InvalidViewportTest.java b/uitest/src/test/java/com/vaadin/tests/components/ui/InvalidViewportTest.java index b33cfbf319..c28fbfa15d 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/ui/InvalidViewportTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/ui/InvalidViewportTest.java @@ -15,7 +15,8 @@ public class InvalidViewportTest extends SingleBrowserTest { WebElement heading = findElement(By.tagName("h2")); - Assert.assertEquals("HTTP ERROR 500", heading.getText()); + Assert.assertTrue("Unexpected heading: " + heading.getText(), + heading.getText().startsWith("HTTP ERROR 500")); } } diff --git a/uitest/src/test/java/com/vaadin/tests/requesthandlers/AppResource404Test.java b/uitest/src/test/java/com/vaadin/tests/requesthandlers/AppResource404Test.java index 99594290b4..8e40c75fed 100644 --- a/uitest/src/test/java/com/vaadin/tests/requesthandlers/AppResource404Test.java +++ b/uitest/src/test/java/com/vaadin/tests/requesthandlers/AppResource404Test.java @@ -32,12 +32,14 @@ public class AppResource404Test extends MultiBrowserTest { openTestURL(); $(LinkElement.class).get(2).click(5, 5); disableWaitingAndWait(); - Assert.assertTrue("Page does not contain the given text", + String errorText = "Page does not contain the given text"; + Assert.assertTrue(errorText, driver.getPageSource().contains("HTTP ERROR 404")); - if (!BrowserUtil.isIE(getDesiredCapabilities())) { - Assert.assertTrue("Page does not contain the given text", - driver.getPageSource().contains("Problem accessing /run/APP/")); - } + Assert.assertTrue(errorText, + driver.getPageSource().contains("/run/APP/")); + Assert.assertTrue(errorText, + driver.getPageSource().contains( + "Request was not handled by any registered handler")); } @Test |