[HtmlUnit] SVN: [15351] trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/ html/HtmlAppletTest.java

rbri--- via HtmlUnit-develop <[email protected]> Sun, 17 Jun 2018 14:16:46 +0000
Newsgroups	gmane.comp.java.htmlunit.devel
Message-ID	<[email protected]>
Revision: 15351
          http://sourceforge.net/p/htmlunit/code/15351
Author:   rbri
Date:     2018-06-17 14:16:42 +0000 (Sun, 17 Jun 2018)
Log Message:
-----------
ff60 support (wip)

Modified Paths:
--------------
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlAppletTest.java

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlAppletTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlAppletTest.java	2018-06-17 14:08:37 UTC (rev 15350)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlAppletTest.java	2018-06-17 14:16:42 UTC (rev 15351)
@@ -58,7 +58,8 @@
      */
     @Test
     @Alerts(DEFAULT = "",
-            CHROME = "Your browser doesn't support applets")
+            CHROME = "Your browser doesn't support applets",
+            FF60 = "Your browser doesn't support applets")
     public void asText_appletEnabled() throws Exception {
         final String html = "<html><head>\n"
             + "</head><body>\n"
@@ -78,7 +79,7 @@
      */
     @Test
     public void simpleInstantiation() throws Exception {
-        if (getBrowserVersion().isChrome()) {
+        if (areAppletsNotSupported()) {
             return;
         }
 
@@ -113,7 +114,7 @@
      */
     @Test
     public void checkAppletBaseWithoutCodebase() throws Exception {
-        if (getBrowserVersion().isChrome()) {
+        if (areAppletsNotSupported()) {
             return;
         }
 
@@ -152,7 +153,7 @@
      */
     @Test
     public void checkAppletBase() throws Exception {
-        if (getBrowserVersion().isChrome()) {
+        if (areAppletsNotSupported()) {
             return;
         }
 
@@ -191,7 +192,7 @@
      */
     @Test
     public void checkSubdirAppletBase() throws Exception {
-        if (getBrowserVersion().isChrome()) {
+        if (areAppletsNotSupported()) {
             return;
         }
 
@@ -230,7 +231,7 @@
      */
     @Test
     public void checkSubdirRelativeAppletBase() throws Exception {
-        if (getBrowserVersion().isChrome()) {
+        if (areAppletsNotSupported()) {
             return;
         }
 
@@ -269,7 +270,7 @@
      */
     @Test
     public void checkAppletParams() throws Exception {
-        if (getBrowserVersion().isChrome()) {
+        if (areAppletsNotSupported()) {
             return;
         }
 
@@ -309,7 +310,7 @@
      */
     @Test
     public void checkAppletCall() throws Exception {
-        if (getBrowserVersion().isChrome()) {
+        if (areAppletsNotSupported()) {
             return;
         }
 
@@ -351,7 +352,7 @@
      */
     @Test
     public void checkAppletExecJs() throws Exception {
-        if (getBrowserVersion().isChrome()) {
+        if (areAppletsNotSupported()) {
             return;
         }
 
@@ -390,7 +391,7 @@
      */
     @Test
     public void setMember() throws Exception {
-        if (getBrowserVersion().isChrome()) {
+        if (areAppletsNotSupported()) {
             return;
         }
 
@@ -425,7 +426,7 @@
      */
     @Test
     public void checkAppletOverwriteArchive() throws Exception {
-        if (getBrowserVersion().isChrome()) {
+        if (areAppletsNotSupported()) {
             return;
         }
 
@@ -466,7 +467,7 @@
      */
     @Test
     public void checkAppletUnknownArchive() throws Exception {
-        if (getBrowserVersion().isChrome()) {
+        if (areAppletsNotSupported()) {
             return;
         }
 
@@ -503,7 +504,7 @@
      */
     @Test
     public void checkAppletIgnoreUnknownArchive() throws Exception {
-        if (getBrowserVersion().isChrome()) {
+        if (areAppletsNotSupported()) {
             return;
         }
 
@@ -533,7 +534,7 @@
      */
     @Test
     public void appletConfirmHandler() throws Exception {
-        if (getBrowserVersion().isChrome()) {
+        if (areAppletsNotSupported()) {
             return;
         }
 
@@ -576,7 +577,7 @@
      */
     @Test
     public void appletConfirmHandlerPermit() throws Exception {
-        if (getBrowserVersion().isChrome()) {
+        if (areAppletsNotSupported()) {
             return;
         }
 
@@ -613,4 +614,8 @@
         final HtmlApplet htmlApplet = (HtmlApplet) applets.get(0);
         assertTrue(htmlApplet.getApplet() == null);
     }
+
+    private boolean areAppletsNotSupported() {
+        return getBrowserVersion().isChrome() || getBrowserVersion().isFirefox() && !getBrowserVersion().isFirefox52();
+    }
 }


------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot