From c053bd213acf539d9e92ac172d6e2b0c1d1e36ce Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Thu, 7 Nov 2019 15:11:50 +0300 Subject: [PATCH] Don't assert order of todo items to fix platform update to 193 --- .../jetbrains/kotlin/search/TodoSearchTest.kt | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/idea/tests/org/jetbrains/kotlin/search/TodoSearchTest.kt b/idea/tests/org/jetbrains/kotlin/search/TodoSearchTest.kt index f6ba76eee54..92537015903 100644 --- a/idea/tests/org/jetbrains/kotlin/search/TodoSearchTest.kt +++ b/idea/tests/org/jetbrains/kotlin/search/TodoSearchTest.kt @@ -6,10 +6,10 @@ package org.jetbrains.kotlin.search import com.intellij.psi.search.PsiTodoSearchHelper -import com.intellij.psi.search.TodoItem import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase import org.jetbrains.kotlin.idea.test.KotlinLightProjectDescriptor import org.jetbrains.kotlin.idea.test.PluginTestCaseBase +import org.junit.Assert import java.io.File class TodoSearchTest : KotlinLightCodeInsightFixtureTestCase() { @@ -23,13 +23,16 @@ class TodoSearchTest : KotlinLightCodeInsightFixtureTestCase() { val file = myFixture.configureByFile("todoCall.kt") val todoItems = PsiTodoSearchHelper.SERVICE.getInstance(myFixture.project).findTodoItems(file) assertEquals(3, todoItems.size) - verifyTodoItemText(todoItems[0], "TODO(\"Fix me\")") - verifyTodoItemText(todoItems[1], "TODO()") - verifyTodoItemText(todoItems[2], "TODO(\"Fix me in lambda\")") - } - private fun verifyTodoItemText(todoItem: TodoItem, s: String) { - assertEquals(s, todoItem.textRange.substring(todoItem.file.text)) + val actualItems = todoItems.map { it.textRange.substring(it.file.text) } + Assert.assertEquals( + listOf( + "TODO(\"Fix me\")", + "TODO()", + "TODO(\"Fix me in lambda\")" + ).sorted(), + actualItems.sorted() + ) } fun testTodoDef() {