Mercurial > hg > release > icedtea-web-1.4
changeset 644:b4362a2987f8
adding few lines that enable/disable running LiveConnect tests in Opera
| author | Jana Fabrikova <jfabriko@redhat.com> |
|---|---|
| date | Wed, 20 Mar 2013 18:06:04 +0100 |
| parents | 76930f38dddf |
| children | 6510748f3514 |
| files | ChangeLog tests/reproducers/simple/JSToJFuncParam/testcases/JSToJFuncParamTest.java tests/reproducers/simple/JSToJGet/testcases/JSToJGetTest.java tests/reproducers/simple/JSToJSet/testcases/JSToJSetTest.java tests/reproducers/simple/JSToJTypeConv/testcases/JSToJTypeConvTest.java |
| diffstat | 5 files changed, 75 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed Mar 20 15:35:22 2013 +0100 +++ b/ChangeLog Wed Mar 20 18:06:04 2013 +0100 @@ -1,3 +1,17 @@ +2013-03-20 Jana Fabrikova <jfabriko@redhat.com> + + * tests/reproducers/simple/JSToJGet/testcases/JSToJGetTest.java: + adding few lines for not running test in Opera + + * tests/reproducers/simple/JSToJSet/testcases/JSToJSetTest.java: + adding few lines for not running test in Opera + + * tests/reproducers/simple/JSToJFuncParam/testcases/JSToJFuncParamTest.java: + adding few lines for not running test in Opera + + * tests/reproducers/simple/JSToJTypeConv/testcases/JSToJTypeConvTest.java: + adding few lines for not running test in Opera + 2012-20-03 Jiri Vanek <jvanek@redhat.com> All occurences of hardcoded paths to java repalced by call of functions
--- a/tests/reproducers/simple/JSToJFuncParam/testcases/JSToJFuncParamTest.java Wed Mar 20 15:35:22 2013 +0100 +++ b/tests/reproducers/simple/JSToJFuncParam/testcases/JSToJFuncParamTest.java Wed Mar 20 18:06:04 2013 +0100 @@ -48,6 +48,9 @@ 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 @@ } 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 @@ 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"); + } + }
--- a/tests/reproducers/simple/JSToJGet/testcases/JSToJGetTest.java Wed Mar 20 15:35:22 2013 +0100 +++ b/tests/reproducers/simple/JSToJGet/testcases/JSToJGetTest.java Wed Mar 20 18:06:04 2013 +0100 @@ -49,6 +49,9 @@ 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 @@ 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(),
--- a/tests/reproducers/simple/JSToJSet/testcases/JSToJSetTest.java Wed Mar 20 15:35:22 2013 +0100 +++ b/tests/reproducers/simple/JSToJSet/testcases/JSToJSetTest.java Wed Mar 20 18:06:04 2013 +0100 @@ -51,6 +51,9 @@ @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 @@ } 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 @@ } 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 ){
--- a/tests/reproducers/simple/JSToJTypeConv/testcases/JSToJTypeConvTest.java Wed Mar 20 15:35:22 2013 +0100 +++ b/tests/reproducers/simple/JSToJTypeConv/testcases/JSToJTypeConvTest.java Wed Mar 20 18:06:04 2013 +0100 @@ -48,6 +48,9 @@ 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 @@ } 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;