azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor, tests: make collection synchronized

Browse Source 
Attempt to fix flaky test test that use LightClassComputationControl
This commit is contained in:
Pavel V. Talanov
2017-11-14 16:44:33 +03:00
parent 1f9d56439a
commit 8696b37cdb
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/LightClassComputationControl.kt
+3 -2
View File
@@ -26,6 +26,7 @@ import org.jetbrains.kotlin.test.InTextDirectivesUtils
import org.junit.Assert import org.junit.Assert
import org.picocontainer.MutablePicoContainer import org.picocontainer.MutablePicoContainer
import java.util.* import java.util.*
import java.util.Collections.synchronizedList
object LightClassComputationControl { object LightClassComputationControl {
fun testWithControl(project: Project, testText: String, testBody: () -> Unit) { fun testWithControl(project: Project, testText: String, testBody: () -> Unit) {
@@ -33,7 +34,7 @@ object LightClassComputationControl {
testText, "// $LIGHT_CLASS_DIRECTIVE" testText, "// $LIGHT_CLASS_DIRECTIVE"
).map { it.trim() } ).map { it.trim() }
val actualFqNames = ArrayList<String>() val actualFqNames = synchronizedList(ArrayList<String>())
val stubComputationTracker = object : StubComputationTracker { val stubComputationTracker = object : StubComputationTracker {
override fun onStubComputed(javaFileStub: PsiJavaFileStub, context: LightClassConstructionContext) { override fun onStubComputed(javaFileStub: PsiJavaFileStub, context: LightClassConstructionContext) {
val qualifiedName = (javaFileStub.childrenStubs.single() as PsiClassStub<*>).qualifiedName!! val qualifiedName = (javaFileStub.childrenStubs.single() as PsiClassStub<*>).qualifiedName!!
@@ -45,7 +46,7 @@ object LightClassComputationControl {
testBody() testBody()
} }
if (expectedLightClassFqNames.toSortedSet() != actualFqNames.toSortedSet()) { if (expectedLightClassFqNames.toSortedSet() != synchronized(actualFqNames) { actualFqNames.toSortedSet() }) {
Assert.fail( Assert.fail(
"Expected to compute: ${expectedLightClassFqNames.prettyToString()}\n" + "Expected to compute: ${expectedLightClassFqNames.prettyToString()}\n" +
"Actually computed: ${actualFqNames.prettyToString()}\n" + "Actually computed: ${actualFqNames.prettyToString()}\n" +