JBR-2430 [jcef] Added Regression test

Checks that JS Query is handled in 2nd opened browser

(cherry picked from commit 404ff84565)

Refactoring + changed EDT awaiting method

(cherry picked from commit dc24658b31)

test/jdk/jb/java/jcef/HandleJSQueryTest.java

@@ -0,0 +1,112 @@
+// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+
+import org.cef.browser.CefBrowser;
+import org.cef.browser.CefFrame;
+import org.cef.browser.CefMessageRouter;
+import org.cef.handler.CefLoadHandlerAdapter;
+import org.cef.callback.CefQueryCallback;
+import org.cef.handler.CefMessageRouterHandlerAdapter;
+
+import javax.swing.*;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+import java.lang.reflect.InvocationTargetException;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * @test
+ * @key headful
+ * @summary Regression test for JBR-2430. The test checks that JS Query is handled in 2nd opened browser.
+ * @run main/othervm HandleJSQueryTest
+ */
+
+public class HandleJSQueryTest {
+
+    public static void main(String[] args) throws InvocationTargetException, InterruptedException {
+        final CountDownLatch firstLatch = new CountDownLatch(1);
+        final CountDownLatch secondLatch = new CountDownLatch(1);
+        CefBrowserFrame firstBrowser = new CefBrowserFrame(firstLatch);
+        CefBrowserFrame secondBrowser = new CefBrowserFrame(secondLatch);
+
+        try {
+            SwingUtilities.invokeLater(firstBrowser::initUI);
+            firstLatch.await(3, TimeUnit.SECONDS);
+
+            SwingUtilities.invokeLater(secondBrowser::initUI);
+            secondLatch.await(3, TimeUnit.SECONDS);
+
+            if (CefBrowserFrame.callbackCounter < 2) {
+                throw new RuntimeException("Test FAILED. JS Query was not handled in 2nd opened browser");
+            }
+            System.out.println("Test PASSED");
+        } finally {
+            firstBrowser.getBrowser().dispose();
+            secondBrowser.getBrowser().dispose();
+            JBCefApp.getInstance().getCefApp().dispose();
+            SwingUtilities.invokeAndWait(firstBrowser::dispose);
+            SwingUtilities.invokeAndWait(secondBrowser::dispose);
+        }
+    }
+}
+
+
+class CefBrowserFrame extends JFrame {
+
+    static int callbackCounter;
+    static int browserNumber;
+
+    private final JBCefBrowser browser = new JBCefBrowser();
+
+    private final CountDownLatch latch;
+
+    public CefBrowserFrame(final CountDownLatch latch) {
+        this.latch=latch;
+    }
+
+    public void initUI() {
+        browserNumber++;
+        CefMessageRouter.CefMessageRouterConfig config = new org.cef.browser.CefMessageRouter.CefMessageRouterConfig();
+        config.jsQueryFunction = "cef_query_" + browserNumber;
+        config.jsCancelFunction = "cef_query_cancel_" + browserNumber;
+        CefMessageRouter msgRouter = CefMessageRouter.create(config);
+
+        msgRouter.addHandler(new CefMessageRouterHandlerAdapter() {
+            @Override
+            public boolean onQuery(CefBrowser browser, CefFrame frame, long query_id, String request,
+                                   boolean persistent, CefQueryCallback callback) {
+                System.out.println("The query with request " + request + " is handled.");
+                callbackCounter++;
+                latch.countDown();
+                return true;
+            }
+        }, true);
+
+        browser.getCefClient().addMessageRouter(msgRouter);
+
+        browser.getCefClient().addLoadHandler(new CefLoadHandlerAdapter() {
+            @Override
+            public void onLoadEnd(CefBrowser browser, CefFrame frame, int httpStatusCode) {
+                System.out.println("Browser " + browserNumber + " is loaded.");
+                String jsFunc = "cef_query_" + browserNumber;
+                String jsQuery = "window." + jsFunc + "({request: '" + jsFunc + "'});";
+                browser.executeJavaScript(jsQuery, "", 0);
+            }
+        });
+
+        getContentPane().add(browser.getCefBrowser().getUIComponent());
+        setSize(640, 480);
+        setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE);
+        addWindowListener(new WindowAdapter() {
+            @Override
+            public void windowClosed(WindowEvent e) {
+                browser.dispose();
+            }
+        });
+        setVisible(true);
+    }
+
+    public JBCefBrowser getBrowser() {
+        return browser;
+    }
+}