From 8696b37cdb0b28146b504d6bf67294a03e965633 Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Tue, 14 Nov 2017 16:44:33 +0300 Subject: [PATCH] Minor, tests: make collection synchronized Attempt to fix flaky test test that use LightClassComputationControl --- .../idea/completion/test/LightClassComputationControl.kt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/LightClassComputationControl.kt b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/LightClassComputationControl.kt index 290210410a9..ed25d9f1866 100644 --- a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/LightClassComputationControl.kt +++ b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/LightClassComputationControl.kt @@ -26,6 +26,7 @@ import org.jetbrains.kotlin.test.InTextDirectivesUtils import org.junit.Assert import org.picocontainer.MutablePicoContainer import java.util.* +import java.util.Collections.synchronizedList object LightClassComputationControl { fun testWithControl(project: Project, testText: String, testBody: () -> Unit) { @@ -33,7 +34,7 @@ object LightClassComputationControl { testText, "// $LIGHT_CLASS_DIRECTIVE" ).map { it.trim() } - val actualFqNames = ArrayList() + val actualFqNames = synchronizedList(ArrayList()) val stubComputationTracker = object : StubComputationTracker { override fun onStubComputed(javaFileStub: PsiJavaFileStub, context: LightClassConstructionContext) { val qualifiedName = (javaFileStub.childrenStubs.single() as PsiClassStub<*>).qualifiedName!! @@ -45,7 +46,7 @@ object LightClassComputationControl { testBody() } - if (expectedLightClassFqNames.toSortedSet() != actualFqNames.toSortedSet()) { + if (expectedLightClassFqNames.toSortedSet() != synchronized(actualFqNames) { actualFqNames.toSortedSet() }) { Assert.fail( "Expected to compute: ${expectedLightClassFqNames.prettyToString()}\n" + "Actually computed: ${actualFqNames.prettyToString()}\n" +