Fix failing arquillian test after EL expressions were fixed in OWB SN…

…APSHOT and test was re-enabled.
apache · Jan 19, 2024 · 52710e8 · 52710e8
1 parent 035d386
commit 52710e8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/arquillian/arquillian-tomee-moviefun-example/pom.xml b/arquillian/arquillian-tomee-moviefun-example/pom.xml
@@ -24,8 +24,8 @@
   <name>TomEE :: Arquillian Adaptors Parent :: Sample :: Moviefun</name>
 
   <properties>
-    <version.selenium>2.40.0</version.selenium>
-    <version.drone>1.3.0.Final</version.drone>
+    <version.selenium>2.53.1</version.selenium>
+    <version.drone>1.3.1.Final</version.drone>
   </properties>
 
   <build>
@@ -81,12 +81,12 @@
                 <artifactItem>
                   <groupId>org.apache.myfaces.core</groupId>
                   <artifactId>myfaces-api</artifactId>
-                  <version>4.0.1</version>
+                  <version>${version.myfaces}</version>
                 </artifactItem>
                 <artifactItem>
                   <groupId>org.apache.tomee</groupId>
                   <artifactId>taglibs-shade</artifactId>
-                  <version>10.0.0-M1-SNAPSHOT</version>
+                  <version>${project.version}</version>
                 </artifactItem>
               </artifactItems>
               <outputDirectory>
@@ -121,7 +121,6 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>taglibs-shade</artifactId>
-      <version>10.0.0-M1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
@@ -258,7 +257,7 @@
     <dependency>
       <groupId>net.sourceforge.htmlunit</groupId>
       <artifactId>htmlunit</artifactId>
-      <version>2.12</version>
+      <version>2.70.0</version>
       <type>jar</type>
       <scope>test</scope>
     </dependency>

diff --git a/...illian-tomee-moviefun-example/src/test/java/org/superbiz/moviefun/MoviesHtmlUnitTest.java b/...illian-tomee-moviefun-example/src/test/java/org/superbiz/moviefun/MoviesHtmlUnitTest.java
@@ -78,6 +78,7 @@ private static File createWebApp() throws IOException {
     @Test
     public void testShouldMakeSureWebappIsWorking() throws Exception {
         WebClient webClient = new WebClient();
+        webClient.getOptions().setThrowExceptionOnScriptError(false);
         HtmlPage page = webClient.getPage("http://localhost:9999/moviefun/setup");
 
         assertMoviesPresent(page);
@@ -90,11 +91,11 @@ public void testShouldMakeSureWebappIsWorking() throws Exception {
         }
 
         assertMoviesPresent(page);
-        webClient.closeAllWindows();
+        webClient.close();
     }
 
     private void assertMoviesPresent(HtmlPage page) {
-        String pageAsText = page.asText();
+        String pageAsText = page.asNormalizedText();
         assertTrue(pageAsText.contains("Wedding Crashers"));
         assertTrue(pageAsText.contains("Starsky & Hutch"));
         assertTrue(pageAsText.contains("Shanghai Knights"));