From 09bd0d8bbee9e2bf07b4a4fd7ebc853e537bc678 Mon Sep 17 00:00:00 2001 From: Aleksey Pivovarov Date: Wed, 10 Oct 2018 19:46:17 +0300 Subject: [PATCH] lst: fix failing tests --- .../vcs/LineStatusTrackerManagerTest.kt | 32 +++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/platform/vcs-tests/testSrc/com/intellij/openapi/vcs/LineStatusTrackerManagerTest.kt b/platform/vcs-tests/testSrc/com/intellij/openapi/vcs/LineStatusTrackerManagerTest.kt index e5e4234141eb..3d0669be7ae0 100644 --- a/platform/vcs-tests/testSrc/com/intellij/openapi/vcs/LineStatusTrackerManagerTest.kt +++ b/platform/vcs-tests/testSrc/com/intellij/openapi/vcs/LineStatusTrackerManagerTest.kt @@ -939,7 +939,6 @@ class LineStatusTrackerManagerTest : BaseLineStatusTrackerManagerTest() { file.assertAffectedChangeLists("Test") } - @Bombed(year = 2018, month = Calendar.JUNE, day = 1, user = "Aleksey.Pivovarov") fun `test file rename - with partial changes`() { createChangelist("Test") @@ -950,12 +949,37 @@ class LineStatusTrackerManagerTest : BaseLineStatusTrackerManagerTest() { runCommand { file.document.replaceString(0, 1, "a2") } FILE_1.toFilePath.assertAffectedChangeLists("Test", DEFAULT) + lstm.waitUntilBaseContentsLoaded() + FILE_1.toFilePath.assertAffectedChangeLists("Test", DEFAULT) + + runWriteAction { + file.rename(this, FILE_2) + } + removeBaseVersion(FILE_1) + setBaseVersion(FILE_2, "a_b_c_d_e2", FILE_1) + refreshCLM() + FILE_2.toFilePath.assertAffectedChangeLists("Test", DEFAULT) + } + + fun `test file rename - with partial changes, while tracker not initialized`() { + createChangelist("Test") + + val file = addLocalFile(FILE_1, "a_b_c_d_e") + setBaseVersion(FILE_1, "a_b_c_d_e2") + refreshCLM() + file.moveAllChangesTo("Test") + runCommand { file.document.replaceString(0, 1, "a2") } + FILE_1.toFilePath.assertAffectedChangeLists("Test", DEFAULT) + runWriteAction { file.rename(this, FILE_2) } + removeBaseVersion(FILE_1) setBaseVersion(FILE_2, "a_b_c_d_e2", FILE_1) refreshCLM() - FILE_2.toFilePath.assertAffectedChangeLists("Test", DEFAULT) + + // It might be better to return ("Test", DEFAULT) here, but the case is tricky + FILE_2.toFilePath.assertAffectedChangeLists(DEFAULT) } @Bombed(year = 2018, month = Calendar.JUNE, day = 1, user = "Aleksey.Pivovarov") @@ -969,9 +993,13 @@ class LineStatusTrackerManagerTest : BaseLineStatusTrackerManagerTest() { runCommand { file.document.replaceString(0, 1, "a2") } FILE_1.toFilePath.assertAffectedChangeLists("Test", DEFAULT) + lstm.waitUntilBaseContentsLoaded() + FILE_1.toFilePath.assertAffectedChangeLists("Test", DEFAULT) + runWriteAction { file.rename(this, FILE_2) } + removeBaseVersion(FILE_1) setBaseVersion(FILE_2, "a_b_c_d_e2", FILE_1) changeProvider.awaitAndBlockRefresh().use {