From 1e3079313b8f304869fc12936d642970d1fedbd3 Mon Sep 17 00:00:00 2001 From: Anton Tarasov Date: Mon, 22 Mar 2021 13:55:48 +0300 Subject: [PATCH] Put assumeStandalone() to @Before in jcef tests GitOrigin-RevId: 8d74845348f0f791b836cc214e411e6524c65915 --- .../testSrc/com/intellij/ui/jcef/IDEA232594Test.java | 8 ++++++-- .../testSrc/com/intellij/ui/jcef/IDEA246306Test.java | 8 ++++++-- .../testSrc/com/intellij/ui/jcef/IDEA259472Test.java | 8 ++++++-- .../testSrc/com/intellij/ui/jcef/IDEA261496Test.java | 8 ++++++-- .../com/intellij/ui/jcef/JBCefJSQueryOSRTest.java | 1 + .../intellij/ui/jcef/JBCefJSQueryPoolSizeKeyTest.java | 3 +-- .../intellij/ui/jcef/JBCefJSQueryPoolSizePropTest.java | 10 ++++++---- .../com/intellij/ui/jcef/JBCefLoadHtmlTest.java | 8 ++++++-- .../testSrc/com/intellij/ui/jcef/JBCefProxyTest.java | 8 ++++++-- .../com/intellij/ui/jcef/JBCefTestModeTest.java | 8 ++++++-- 10 files changed, 50 insertions(+), 20 deletions(-) diff --git a/platform/platform-tests/testSrc/com/intellij/ui/jcef/IDEA232594Test.java b/platform/platform-tests/testSrc/com/intellij/ui/jcef/IDEA232594Test.java index fb7ad6508204..605550e0c025 100644 --- a/platform/platform-tests/testSrc/com/intellij/ui/jcef/IDEA232594Test.java +++ b/platform/platform-tests/testSrc/com/intellij/ui/jcef/IDEA232594Test.java @@ -5,6 +5,7 @@ import com.intellij.testFramework.ApplicationRule; import com.intellij.ui.scale.TestScaleHelper; import junit.framework.TestCase; import org.junit.After; +import org.junit.Before; import org.junit.ClassRule; import org.junit.Test; @@ -29,6 +30,11 @@ public class IDEA232594Test { static final AtomicInteger CALLBACL_COUNT = new AtomicInteger(0); + @Before + public void before() { + TestScaleHelper.assumeStandalone(); + } + @After public void after() { TestScaleHelper.restoreProperties(); @@ -36,8 +42,6 @@ public class IDEA232594Test { @Test public void test() { - TestScaleHelper.assumeStandalone(); - JBCefBrowser browser = new JBCefBrowser("chrome:version"); JBCefJSQuery jsQuery = JBCefJSQuery.create(browser); diff --git a/platform/platform-tests/testSrc/com/intellij/ui/jcef/IDEA246306Test.java b/platform/platform-tests/testSrc/com/intellij/ui/jcef/IDEA246306Test.java index bede1e4ba7fb..16ed0ad3c643 100644 --- a/platform/platform-tests/testSrc/com/intellij/ui/jcef/IDEA246306Test.java +++ b/platform/platform-tests/testSrc/com/intellij/ui/jcef/IDEA246306Test.java @@ -4,6 +4,7 @@ package com.intellij.ui.jcef; import com.intellij.testFramework.ApplicationRule; import com.intellij.ui.scale.TestScaleHelper; import org.junit.After; +import org.junit.Before; import org.junit.ClassRule; import org.junit.Test; @@ -27,6 +28,11 @@ public class IDEA246306Test { @ClassRule public static final ApplicationRule appRule = new ApplicationRule(); + @Before + public void before() { + TestScaleHelper.assumeStandalone(); + } + @After public void after() { TestScaleHelper.restoreProperties(); @@ -34,8 +40,6 @@ public class IDEA246306Test { @Test public void test() { - TestScaleHelper.assumeStandalone(); - new MyBrowser(); new MyBrowser(); } diff --git a/platform/platform-tests/testSrc/com/intellij/ui/jcef/IDEA259472Test.java b/platform/platform-tests/testSrc/com/intellij/ui/jcef/IDEA259472Test.java index df0a8b5900fb..0fee9a7fec8e 100644 --- a/platform/platform-tests/testSrc/com/intellij/ui/jcef/IDEA259472Test.java +++ b/platform/platform-tests/testSrc/com/intellij/ui/jcef/IDEA259472Test.java @@ -9,6 +9,7 @@ import org.cef.browser.CefFrame; import org.cef.handler.CefLoadHandler; import org.cef.network.CefRequest; import org.junit.After; +import org.junit.Before; import org.junit.ClassRule; import org.junit.Test; @@ -32,6 +33,11 @@ public class IDEA259472Test { @ClassRule public static final ApplicationRule appRule = new ApplicationRule(); + @Before + public void before() { + TestScaleHelper.assumeStandalone(); + } + @After public void after() { TestScaleHelper.restoreSystemProperties(); @@ -39,8 +45,6 @@ public class IDEA259472Test { @Test public void test() { - TestScaleHelper.assumeStandalone(); - CountDownLatch latch1 = new CountDownLatch(1); CountDownLatch latch2 = new CountDownLatch(1); diff --git a/platform/platform-tests/testSrc/com/intellij/ui/jcef/IDEA261496Test.java b/platform/platform-tests/testSrc/com/intellij/ui/jcef/IDEA261496Test.java index a81680257175..29aede5d2472 100644 --- a/platform/platform-tests/testSrc/com/intellij/ui/jcef/IDEA261496Test.java +++ b/platform/platform-tests/testSrc/com/intellij/ui/jcef/IDEA261496Test.java @@ -9,6 +9,7 @@ import org.cef.browser.CefFrame; import org.cef.handler.CefLoadHandlerAdapter; import org.cef.network.CefRequest; import org.junit.After; +import org.junit.Before; import org.junit.ClassRule; import org.junit.Test; @@ -31,6 +32,11 @@ public class IDEA261496Test { @ClassRule public static final ApplicationRule appRule = new ApplicationRule(); + @Before + public void before() { + TestScaleHelper.assumeStandalone(); + } + @After public void after() { TestScaleHelper.restoreSystemProperties(); @@ -38,8 +44,6 @@ public class IDEA261496Test { @Test public void test() { - TestScaleHelper.assumeStandalone(); - CountDownLatch latch = new CountDownLatch(1); JBCefBrowser jbCefBrowser = new JBCefBrowser("http://maps.google.com"); // heavy page diff --git a/platform/platform-tests/testSrc/com/intellij/ui/jcef/JBCefJSQueryOSRTest.java b/platform/platform-tests/testSrc/com/intellij/ui/jcef/JBCefJSQueryOSRTest.java index 8d91b87a5d2b..d21201d4fcfa 100644 --- a/platform/platform-tests/testSrc/com/intellij/ui/jcef/JBCefJSQueryOSRTest.java +++ b/platform/platform-tests/testSrc/com/intellij/ui/jcef/JBCefJSQueryOSRTest.java @@ -35,6 +35,7 @@ public class JBCefJSQueryOSRTest { @Before public void before() { + TestScaleHelper.assumeStandalone(); TestScaleHelper.setSystemProperty("ide.browser.jcef.osr.enabled", "true"); } diff --git a/platform/platform-tests/testSrc/com/intellij/ui/jcef/JBCefJSQueryPoolSizeKeyTest.java b/platform/platform-tests/testSrc/com/intellij/ui/jcef/JBCefJSQueryPoolSizeKeyTest.java index 13be4df896f0..ed1d56d25908 100644 --- a/platform/platform-tests/testSrc/com/intellij/ui/jcef/JBCefJSQueryPoolSizeKeyTest.java +++ b/platform/platform-tests/testSrc/com/intellij/ui/jcef/JBCefJSQueryPoolSizeKeyTest.java @@ -22,6 +22,7 @@ public class JBCefJSQueryPoolSizeKeyTest { @Before public void before() { + TestScaleHelper.assumeStandalone(); TestScaleHelper.setSystemProperty("ide.browser.jcef.jsQueryPoolSize", "1"); } @@ -32,8 +33,6 @@ public class JBCefJSQueryPoolSizeKeyTest { @Test public void test1() { - TestScaleHelper.assumeStandalone(); - JBCefJSQueryPoolSizePropTest.test(b -> null); } } diff --git a/platform/platform-tests/testSrc/com/intellij/ui/jcef/JBCefJSQueryPoolSizePropTest.java b/platform/platform-tests/testSrc/com/intellij/ui/jcef/JBCefJSQueryPoolSizePropTest.java index 2e7be8c13c23..6861aac7702b 100644 --- a/platform/platform-tests/testSrc/com/intellij/ui/jcef/JBCefJSQueryPoolSizePropTest.java +++ b/platform/platform-tests/testSrc/com/intellij/ui/jcef/JBCefJSQueryPoolSizePropTest.java @@ -5,6 +5,7 @@ import com.intellij.testFramework.ApplicationRule; import com.intellij.ui.jcef.JBCefClient.Properties; import com.intellij.ui.scale.TestScaleHelper; import org.jetbrains.annotations.NotNull; +import org.junit.Before; import org.junit.ClassRule; import org.junit.Test; @@ -28,10 +29,13 @@ public class JBCefJSQueryPoolSizePropTest { @ClassRule public static final ApplicationRule appRule = new ApplicationRule(); + @Before + public void before() { + TestScaleHelper.assumeStandalone(); + } + @Test public void test1() { - TestScaleHelper.assumeStandalone(); - test(client -> { client.setProperty(Properties.JS_QUERY_POOL_SIZE, 1); return null; @@ -40,8 +44,6 @@ public class JBCefJSQueryPoolSizePropTest { @Test public void test2() { - TestScaleHelper.assumeStandalone(); - JBCefJSQueryPoolSizePropTest.test(client -> { client.setProperty(Properties.JS_QUERY_POOL_SIZE, Integer.MAX_VALUE); // stress test return null; diff --git a/platform/platform-tests/testSrc/com/intellij/ui/jcef/JBCefLoadHtmlTest.java b/platform/platform-tests/testSrc/com/intellij/ui/jcef/JBCefLoadHtmlTest.java index e9eae698c54b..a3d9b3854831 100644 --- a/platform/platform-tests/testSrc/com/intellij/ui/jcef/JBCefLoadHtmlTest.java +++ b/platform/platform-tests/testSrc/com/intellij/ui/jcef/JBCefLoadHtmlTest.java @@ -11,6 +11,7 @@ import org.cef.handler.CefLoadHandler; import org.cef.network.CefRequest; import org.jetbrains.annotations.NotNull; import org.junit.After; +import org.junit.Before; import org.junit.ClassRule; import org.junit.Test; @@ -51,6 +52,11 @@ public class JBCefLoadHtmlTest { static final CountDownLatch LATCH = new CountDownLatch(1); static volatile boolean testPassed; + @Before + public void before() { + TestScaleHelper.assumeStandalone(); + } + @After public void after() { TestScaleHelper.restoreProperties(); @@ -58,8 +64,6 @@ public class JBCefLoadHtmlTest { @Test public void test() { - TestScaleHelper.assumeStandalone(); - JBCefBrowser browser = new JBCefBrowser(); browser.getJBCefClient().addLoadHandler(new CefLoadHandler() { diff --git a/platform/platform-tests/testSrc/com/intellij/ui/jcef/JBCefProxyTest.java b/platform/platform-tests/testSrc/com/intellij/ui/jcef/JBCefProxyTest.java index 04157055fa49..72806570580a 100644 --- a/platform/platform-tests/testSrc/com/intellij/ui/jcef/JBCefProxyTest.java +++ b/platform/platform-tests/testSrc/com/intellij/ui/jcef/JBCefProxyTest.java @@ -9,6 +9,7 @@ import org.cef.browser.CefFrame; import org.cef.handler.CefLoadHandlerAdapter; import org.jetbrains.annotations.NotNull; import org.junit.After; +import org.junit.Before; import org.junit.ClassRule; import org.junit.Test; @@ -38,6 +39,11 @@ public class JBCefProxyTest { @ClassRule public static final ApplicationRule appRule = new ApplicationRule(); + @Before + public void before() { + TestScaleHelper.assumeStandalone(); + } + @After public void after() { TestScaleHelper.restoreSystemProperties(); @@ -45,8 +51,6 @@ public class JBCefProxyTest { @Test public void test() { - TestScaleHelper.assumeStandalone(); - JBCefProxySettings.setTestInstance(true, false, false, diff --git a/platform/platform-tests/testSrc/com/intellij/ui/jcef/JBCefTestModeTest.java b/platform/platform-tests/testSrc/com/intellij/ui/jcef/JBCefTestModeTest.java index 6c86b346c378..2d805bdaeeca 100644 --- a/platform/platform-tests/testSrc/com/intellij/ui/jcef/JBCefTestModeTest.java +++ b/platform/platform-tests/testSrc/com/intellij/ui/jcef/JBCefTestModeTest.java @@ -3,6 +3,7 @@ package com.intellij.ui.jcef; import com.intellij.testFramework.ApplicationRule; import org.junit.After; +import org.junit.Before; import org.junit.ClassRule; import org.junit.Test; @@ -22,6 +23,11 @@ public class JBCefTestModeTest { @ClassRule public static final ApplicationRule appRule = new ApplicationRule(); + @Before + public void before() { + assumeStandalone(); + } + @After public void after() { restoreProperties(); @@ -29,8 +35,6 @@ public class JBCefTestModeTest { @Test public void test() { - assumeStandalone(); - setRegistryProperty("ide.browser.jcef.headless.enabled", "false"); setRegistryProperty("ide.browser.jcef.testMode.enabled", "false");