From ec58cce405462de5401c0c9e858fa0c810c77cd5 Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Fri, 24 Nov 2017 13:35:43 +0300 Subject: [PATCH] setup thread factory even when running a single test --- .../src/com/intellij/testFramework/UsefulTestCase.java | 3 +++ .../intellij/testFramework/fixtures/impl/BaseFixture.java | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/platform/testFramework/src/com/intellij/testFramework/UsefulTestCase.java b/platform/testFramework/src/com/intellij/testFramework/UsefulTestCase.java index beea85a9d211..262fb8b0fd7b 100644 --- a/platform/testFramework/src/com/intellij/testFramework/UsefulTestCase.java +++ b/platform/testFramework/src/com/intellij/testFramework/UsefulTestCase.java @@ -16,6 +16,7 @@ package com.intellij.testFramework; import com.intellij.codeInsight.CodeInsightSettings; +import com.intellij.concurrency.IdeaForkJoinWorkerThreadFactory; import com.intellij.diagnostic.PerformanceWatcher; import com.intellij.mock.MockApplication; import com.intellij.openapi.Disposable; @@ -86,6 +87,8 @@ public abstract class UsefulTestCase extends TestCase { private static final Map TOTAL_TEARDOWN_COST_MILLIS = new HashMap<>(); static { + // to setup thread factory even when running a single test + IdeaForkJoinWorkerThreadFactory.setupForkJoinCommonPool(); Logger.setFactory(TestLoggerFactory.class); } protected static final Logger LOG = Logger.getInstance(UsefulTestCase.class); diff --git a/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/BaseFixture.java b/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/BaseFixture.java index 1fd45ec4e831..0f9527ff22ad 100644 --- a/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/BaseFixture.java +++ b/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/BaseFixture.java @@ -15,6 +15,7 @@ */ package com.intellij.testFramework.fixtures.impl; +import com.intellij.concurrency.IdeaForkJoinWorkerThreadFactory; import com.intellij.openapi.Disposable; import com.intellij.openapi.util.Disposer; import com.intellij.testFramework.EdtTestUtil; @@ -31,6 +32,11 @@ public class BaseFixture implements IdeaTestFixture { private boolean myDisposed; private final Disposable myTestRootDisposable = Disposer.newDisposable(); + static { + // to setup thread factory even when running a single test + IdeaForkJoinWorkerThreadFactory.setupForkJoinCommonPool(); + } + @Override public void setUp() throws Exception { Assert.assertFalse("setUp() already has been called", myInitialized);