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

lst: fix failing tests

Browse Source
This commit is contained in:
Aleksey Pivovarov
2018-10-10 19:55:39 +03:00
parent b0392413b5
commit 09bd0d8bbe
1 changed files with 30 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-tests/testSrc/com/intellij/openapi/vcs/LineStatusTrackerManagerTest.kt
+30 -2
View File
@@ -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 {