mirrors/JetBrainsRuntime
1
0
Fork 0
mirror of https://github.com/JetBrains/JetBrainsRuntime.git synced 2025-12-06 09:29:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

JBR-3337 jb/java/jcef/HandleJSQueryTest3314.sh: fails on macOS-aarch64 with "JS Query was not handled in 2nd opened browser"

Browse Source 
(cherry picked from commit 8678f41971)
This commit is contained in:
Anton Tarasov
2021-06-23 18:03:44 +03:00
committed by Vitaly Provodin
parent 5b6c64c6f7
commit 286c96e606
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
test/jdk/jb/java/jcef/HandleJSQueryTest.java
View File

@@ -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();
@@ -86,9 +86,13 @@ class CefBrowserFrame extends JFrame {
browser.getCefClient().addMessageRouter(msgRouter);
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);

2
test/jdk/jb/java/jcef/HandleJSQueryTest3314.sh
View File

@@ -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