diff options
| author | Anton Tarasov <anton.tarasov@jetbrains.com> | 2021-06-23 18:03:44 +0300 |
|---|---|---|
| committer | Vitaly Provodin <vitaly.provodin@jetbrains.com> | 2021-06-24 10:51:24 +0700 |
| commit | 1f7adfe26c2fcd1ddfa2ea01cc076d78b7d8ec6c (patch) | |
| tree | 99951ac441f23e306877fd515ab95510886c8288 | |
| parent | e31fc34ea54e9b4b115de9ffa0b00c0d7d5f0980 (diff) | |
| download | JetBrainsRuntime-jb11_0_11-b1504.5.tar.gz | |
JBR-3337 jb/java/jcef/HandleJSQueryTest3314.sh: fails on macOS-aarch64 with "JS Query was not handled in 2nd opened browser"jb11_0_11-b1504.6jb11_0_11-b1504.5
(cherry picked from commit 8678f419717de460144c14d04a338427d38fc31c)
| -rw-r--r-- | test/jdk/jb/java/jcef/HandleJSQueryTest.java | 16 | ||||
| -rw-r--r-- | test/jdk/jb/java/jcef/HandleJSQueryTest3314.sh | 2 |
2 files changed, 11 insertions, 7 deletions
diff --git a/test/jdk/jb/java/jcef/HandleJSQueryTest.java b/test/jdk/jb/java/jcef/HandleJSQueryTest.java index 2f289c37e2e..6e4c849dd4c 100644 --- a/test/jdk/jb/java/jcef/HandleJSQueryTest.java +++ b/test/jdk/jb/java/jcef/HandleJSQueryTest.java @@ -6,6 +6,7 @@ import org.cef.browser.CefMessageRouter; import org.cef.handler.CefLoadHandlerAdapter; import org.cef.callback.CefQueryCallback; import org.cef.handler.CefMessageRouterHandlerAdapter; +import org.cef.network.CefRequest.TransitionType; import javax.swing.*; import java.awt.event.WindowAdapter; @@ -17,7 +18,6 @@ import java.util.concurrent.TimeUnit; /** * @test * @key headful - * @requires (os.arch == "amd64" | os.arch == "x86_64" | (os.arch == "aarch64" & os.family == "mac")) * @summary Regression test for JBR-2430. The test checks that JS Query is handled in 2nd opened browser. * @run main/othervm HandleJSQueryTest */ @@ -32,10 +32,10 @@ public class HandleJSQueryTest { try { SwingUtilities.invokeLater(firstBrowser::initUI); - firstLatch.await(3, TimeUnit.SECONDS); + firstLatch.await(10, TimeUnit.SECONDS); SwingUtilities.invokeLater(secondBrowser::initUI); - secondLatch.await(3, TimeUnit.SECONDS); + secondLatch.await(10, TimeUnit.SECONDS); if (CefBrowserFrame.callbackCounter < 2) { throw new RuntimeException("Test FAILED. JS Query was not handled in 2nd opened browser"); @@ -54,8 +54,8 @@ public class HandleJSQueryTest { class CefBrowserFrame extends JFrame { - static int callbackCounter; - static int browserNumber; + static volatile int callbackCounter; + static volatile int browserNumber; private final JBCefBrowser browser = new JBCefBrowser(); @@ -87,8 +87,12 @@ class CefBrowserFrame extends JFrame { browser.getCefClient().addLoadHandler(new CefLoadHandlerAdapter() { @Override + public void onLoadStart(CefBrowser browser, CefFrame frame, TransitionType transitionType) { + System.out.println("onLoadStart: Browser " + browserNumber); + } + @Override public void onLoadEnd(CefBrowser browser, CefFrame frame, int httpStatusCode) { - System.out.println("Browser " + browserNumber + " is loaded."); + System.out.println("onLoadEnd: Browser " + browserNumber); String jsFunc = "cef_query_" + browserNumber; String jsQuery = "window." + jsFunc + "({request: '" + jsFunc + "'});"; browser.executeJavaScript(jsQuery, "", 0); diff --git a/test/jdk/jb/java/jcef/HandleJSQueryTest3314.sh b/test/jdk/jb/java/jcef/HandleJSQueryTest3314.sh index dc2cc624472..4abc0a5a3f0 100644 --- a/test/jdk/jb/java/jcef/HandleJSQueryTest3314.sh +++ b/test/jdk/jb/java/jcef/HandleJSQueryTest3314.sh @@ -43,7 +43,7 @@ fi curdir=$(pwd) cd ${TESTSRC} -${TESTJAVA}/bin/javac -d ${TESTCLASSES} HandleJSQueryTest.java +${TESTJAVA}/bin/javac -d ${TESTCLASSES} JBCefApp.java JBCefBrowser.java HandleJSQueryTest.java cd $curdir i=0 |