adding few lines that enable/disable running LiveConnect tests in Opera

4 files changed, 61 insertions, 0 deletions

diff --git a/tests/reproducers/simple/JSToJFuncParam/testcases/JSToJFuncParamTest.java b/tests/reproducers/simple/JSToJFuncParam/testcases/JSToJFuncParamTest.java
index 090940f..0c67708 100644
--- a/tests/reproducers/simple/JSToJFuncParam/testcases/JSToJFuncParamTest.java
+++ b/tests/reproducers/simple/JSToJFuncParam/testcases/JSToJFuncParamTest.java
@@ -48,6 +48,9 @@ import org.junit.Test;
 
 public class JSToJFuncParamTest extends BrowserTest {
 
+    //the JS<->J tests tend to make Opera unusable
+    public final boolean doNotRunInOpera = true;
+
     private final String initStr = "JSToJFuncParam applet initialized.";
     private final String afterStr = "afterTests";
 
@@ -70,6 +73,13 @@ public class JSToJFuncParamTest extends BrowserTest {
     }
 
     private void jsToJavaFuncParamTest(String funcStr, String paramStr, String expectedVal) throws Exception {
+
+        if( doNotRunInOpera){
+            if(server.getCurrentBrowser().getID() == Browsers.opera){
+                return;
+            }
+        }
+
         String strURL = "/JSToJFuncParam.html?" + funcStr + ";" + paramStr;
         ProcessResult pr = server.executeBrowser(strURL, new CountingClosingListenerImpl(), new CountingClosingListenerImpl());
         String expectedStdout = funcStr + " " + expectedVal;
@@ -209,4 +219,18 @@ public class JSToJFuncParamTest extends BrowserTest {
         jsToJavaFuncParamTest("JSObjectParam", "new JSCar(100,\"red\")", "100, red");
     }
 
+    @Test
+    @TestInBrowsers(testIn = { Browsers.all })
+    @NeedsDisplay
+    public void AppletJSToJFuncParam_booleanFalseStr_Test() throws Exception {
+        jsToJavaFuncParamTest("booleanParam", "false", "true");
+    }
+
+    @Test
+    @TestInBrowsers(testIn = { Browsers.all })
+    @NeedsDisplay
+    public void AppletJSToJFuncParam_BooleanFalseStr_Test() throws Exception {
+        jsToJavaFuncParamTest("BooleanParam", "false", "true");
+    }
+
 }
diff --git a/tests/reproducers/simple/JSToJGet/testcases/JSToJGetTest.java b/tests/reproducers/simple/JSToJGet/testcases/JSToJGetTest.java
index 982f0a9..d2627c6 100644
--- a/tests/reproducers/simple/JSToJGet/testcases/JSToJGetTest.java
+++ b/tests/reproducers/simple/JSToJGet/testcases/JSToJGetTest.java
@@ -49,6 +49,9 @@ import org.junit.Test;
 
 public class JSToJGetTest extends BrowserTest {
 
+    //the JS<->J tests tend to make Opera unusable
+    public final boolean doNotRunInOpera = true;
+
     public String passStr = " - passed.";
     public String failValStr = " - failed, value mismatch.";
     public String failTypeStr = " - failed, type mismatch.";
@@ -118,6 +121,12 @@ public class JSToJGetTest extends BrowserTest {
 
     private void jsToJavaGetTest(String urlEnd, String testStr) throws Exception {
 
+        if( doNotRunInOpera){
+            if(server.getCurrentBrowser().getID() == Browsers.opera){
+                return;
+            }
+        }
+
         String strURL = "/JSToJGet.html?" + urlEnd;
         ProcessResult pr = server.executeBrowser(strURL,
                 new CountingClosingListenerImpl(),
diff --git a/tests/reproducers/simple/JSToJSet/testcases/JSToJSetTest.java b/tests/reproducers/simple/JSToJSet/testcases/JSToJSetTest.java
index 0681e2b..5fd4011 100644
--- a/tests/reproducers/simple/JSToJSet/testcases/JSToJSetTest.java
+++ b/tests/reproducers/simple/JSToJSet/testcases/JSToJSetTest.java
@@ -51,6 +51,9 @@ import org.junit.Test;
 @Bug( id = { "PR1298" })
 public class JSToJSetTest extends BrowserTest {
 
+    //the JS<->J tests tend to make Opera unusable
+    public final boolean doNotRunInOpera = true;
+
     private final String exceptionStr = "xception";
     private final String errorStr = "rror";
     private final String initStr = "JSToJSet applet initialized.";
@@ -83,6 +86,13 @@ public class JSToJSetTest extends BrowserTest {
     }
 
     private void jsToJavaSetNormalTest(String fieldStr, String valueStr) throws Exception {
+
+        if( doNotRunInOpera){
+            if(server.getCurrentBrowser().getID() == Browsers.opera){
+                return;
+            }
+        }
+
         String strURL = "/JSToJSet.html?" + fieldStr + ";" + valueStr;
         ProcessResult pr = server.executeBrowser(strURL, new CountingClosingListenerImpl(), new CountingClosingListenerImpl());
         String expectedStdout = "New value is: " + valueStr;
@@ -90,6 +100,14 @@ public class JSToJSetTest extends BrowserTest {
     }
     
     private void jsToJavaSetSpecialTest(String fieldStr, String valueStr, TestType testType) throws Exception {
+
+        if( doNotRunInOpera){
+            Browsers b = server.getCurrentBrowser().getID();
+            if(b == Browsers.opera){
+                return;
+            }
+        }
+
         String strURL = "/JSToJSet.html?";
         String expectedStdout = "";
         switch( testType ){
diff --git a/tests/reproducers/simple/JSToJTypeConv/testcases/JSToJTypeConvTest.java b/tests/reproducers/simple/JSToJTypeConv/testcases/JSToJTypeConvTest.java
index fdc9821..7834879 100644
--- a/tests/reproducers/simple/JSToJTypeConv/testcases/JSToJTypeConvTest.java
+++ b/tests/reproducers/simple/JSToJTypeConv/testcases/JSToJTypeConvTest.java
@@ -48,6 +48,9 @@ import org.junit.Test;
 
 public class JSToJTypeConvTest extends BrowserTest {
 
+    //the JS<->J tests tend to make Opera unusable
+    public final boolean doNotRunInOpera = true;
+
     private final String initStr = "JSToJTypeConv applet initialized.";
     private final String afterStr = "afterTests";
 
@@ -81,6 +84,13 @@ public class JSToJTypeConvTest extends BrowserTest {
     }
 
     private void jsToJavaTypeConvTest(String fieldStr, String valueStr, String[] expectedValueAndOutputs) throws Exception {
+
+        if( doNotRunInOpera){
+            if(server.getCurrentBrowser().getID() == Browsers.opera){
+                return;
+            }
+        }
+
         String strURL = "/JSToJTypeConv.html?" + fieldStr + ";" + valueStr;
         ProcessResult pr = server.executeBrowser(strURL, new CountingClosingListenerImpl(), new CountingClosingListenerImpl());
         String[] expectedStdouts = expectedValueAndOutputs;