MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-357036 [java] proper property test fix by Konstantin Nisht

Browse Source 
GitOrigin-RevId: eacbfec5f35ebb37d7d6ada7c76f245117e472e5
This commit is contained in:
Bas Leijdekkers
2025-12-08 15:27:50 +00:00
committed by intellij-monorepo-bot
parent 74d90ad0d3
commit a71548da84
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-tests/testSrc/com/intellij/java/propertyBased/UnivocityTest.java
-2
View File
@@ -9,7 +9,6 @@ import com.intellij.openapi.project.ex.ProjectEx;
import com.intellij.openapi.roots.ModuleRootManager;
import com.intellij.openapi.util.Disposer;
import com.intellij.openapi.util.RecursionManager;
import com.intellij.openapi.util.registry.Registry;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.openapi.vfs.VfsUtil;
import com.intellij.psi.*;
@@ -38,7 +37,6 @@ public class UnivocityTest extends BaseUnivocityTest {
super.setUp();
((PsiDocumentManagerImpl)PsiDocumentManager.getInstance(myProject)).disableBackgroundCommit(getTestRootDisposable());
MadTestingUtil.enableAllInspections(myProject, JavaLanguage.INSTANCE, "GrazieInspection", "GrazieStyle");
Registry.get("ruby.vcs.use.project.sdk").setValue(false, getTestRootDisposable());
}
@Override
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListScheduler.kt
+7 -4
View File
@@ -1,7 +1,8 @@
// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package com.intellij.openapi.vcs.changes
import com.intellij.openapi.application.ApplicationManager
import com.intellij.openapi.application.impl.TestOnlyThreading
import com.intellij.util.lang.CompoundRuntimeException
import com.intellij.util.ui.EDT
import kotlinx.coroutines.*
@@ -77,12 +78,14 @@ internal class ChangeListScheduler(private val coroutineScope: CoroutineScope) {
EDT.dispatchAllInvocationEvents()
}
try {
future!!.asCompletableFuture().get(10, TimeUnit.MILLISECONDS)
TestOnlyThreading.releaseTheAcquiredWriteIntentLockThenExecuteActionAndTakeWriteIntentLockBack {
future.asCompletableFuture().get(10, TimeUnit.MILLISECONDS)
}
}
catch (ignore: TimeoutException) {
catch (_: TimeoutException) {
continue
}
catch (ignored: CancellationException) {
catch (_: CancellationException) {
}
catch (e: InterruptedException) {
throwables.add(e)