From 672d06094580b2a5bfcb0711eed1fd6260ad78f2 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Wed, 30 May 2018 14:32:53 +0200 Subject: [PATCH] Update tests according to default CL rename (IDEA-CR-33115) --- .../openapi/vcs/ChangeListManagerTest.kt | 28 ++--- .../vcs/LineStatusTrackerManagerTest.kt | 72 ++++++------ .../vcs/PartialLineStatusTrackerTest.kt | 108 +++++++++--------- 3 files changed, 103 insertions(+), 105 deletions(-) diff --git a/platform/vcs-tests/testSrc/com/intellij/openapi/vcs/ChangeListManagerTest.kt b/platform/vcs-tests/testSrc/com/intellij/openapi/vcs/ChangeListManagerTest.kt index 9790fbf8af59..f3ea11d91806 100644 --- a/platform/vcs-tests/testSrc/com/intellij/openapi/vcs/ChangeListManagerTest.kt +++ b/platform/vcs-tests/testSrc/com/intellij/openapi/vcs/ChangeListManagerTest.kt @@ -55,12 +55,12 @@ class ChangeListManagerTest : BaseChangeListsTest() { val file = addLocalFile(FILE_1, "a_b_c_d_e") setBaseVersion(FILE_1, "a_b1_c_d1_e") refreshCLM() - file.assertAffectedChangeLists("Default") + file.assertAffectedChangeLists("Default Changelist") setDefaultChangeList("Test") setBaseVersion(FILE_2, "a_b1_c_d1_e") refreshCLM() - FILE_1.toFilePath.assertAffectedChangeLists("Default") + FILE_1.toFilePath.assertAffectedChangeLists("Default Changelist") FILE_2.toFilePath.assertAffectedChangeLists("Test") } @@ -72,8 +72,8 @@ class ChangeListManagerTest : BaseChangeListsTest() { setBaseVersion(FILE_1, "a_b1_c_d1_e") setBaseVersion(FILE_2, null) refreshCLM() - file1.assertAffectedChangeLists("Default") - file2.assertAffectedChangeLists("Default") + file1.assertAffectedChangeLists("Default Changelist") + file2.assertAffectedChangeLists("Default Changelist") setDefaultChangeList("Test") @@ -82,13 +82,13 @@ class ChangeListManagerTest : BaseChangeListsTest() { file2.document.setText("New Text") } refreshCLM() - file1.assertAffectedChangeLists("Default") - file2.assertAffectedChangeLists("Default") + file1.assertAffectedChangeLists("Default Changelist") + file2.assertAffectedChangeLists("Default Changelist") setBaseVersion(FILE_1, "a_b1_c_d1_e_f_g") refreshCLM() - file1.assertAffectedChangeLists("Default") - file2.assertAffectedChangeLists("Default") + file1.assertAffectedChangeLists("Default Changelist") + file2.assertAffectedChangeLists("Default Changelist") } fun `test renames do not move files to default`() { @@ -96,30 +96,30 @@ class ChangeListManagerTest : BaseChangeListsTest() { setBaseVersion(FILE_1, "a_b1_c_d1_e") refreshCLM() - FILE_1.toFilePath.assertAffectedChangeLists("Default") + FILE_1.toFilePath.assertAffectedChangeLists("Default Changelist") setDefaultChangeList("Test") val file1 = addLocalFile(FILE_1, "a_b_c_d_e") refreshCLM() - FILE_1.toFilePath.assertAffectedChangeLists("Default") + FILE_1.toFilePath.assertAffectedChangeLists("Default Changelist") runWriteAction { file1.document.setText("New Text") } refreshCLM() - FILE_1.toFilePath.assertAffectedChangeLists("Default") + FILE_1.toFilePath.assertAffectedChangeLists("Default Changelist") setBaseVersion(FILE_1, null) refreshCLM() - FILE_1.toFilePath.assertAffectedChangeLists("Default") + FILE_1.toFilePath.assertAffectedChangeLists("Default Changelist") setBaseVersion(FILE_1, "a_b1_c_d1_e_f_g", FILE_2) refreshCLM() - FILE_1.toFilePath.assertAffectedChangeLists("Default") + FILE_1.toFilePath.assertAffectedChangeLists("Default Changelist") removeLocalFile(FILE_1) refreshCLM() - FILE_2.toFilePath.assertAffectedChangeLists("Default") + FILE_2.toFilePath.assertAffectedChangeLists("Default Changelist") } } \ No newline at end of file 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 a7266dfeec21..715de039a69f 100644 --- a/platform/vcs-tests/testSrc/com/intellij/openapi/vcs/LineStatusTrackerManagerTest.kt +++ b/platform/vcs-tests/testSrc/com/intellij/openapi/vcs/LineStatusTrackerManagerTest.kt @@ -90,7 +90,7 @@ class LineStatusTrackerManagerTest : BaseLineStatusTrackerManagerTest() { val ranges = tracker.getRanges()!! assertEquals(2, ranges.size) tracker.moveToChangelist(ranges[0], "Test".asListNameToList()) - tracker.assertAffectedChangeLists("Default", "Test") + tracker.assertAffectedChangeLists("Default Changelist", "Test") } assertNotNull(file.tracker) @@ -138,7 +138,7 @@ class LineStatusTrackerManagerTest : BaseLineStatusTrackerManagerTest() { lstm.waitUntilBaseContentsLoaded() - tracker.assertAffectedChangeLists("Test", "Default") + tracker.assertAffectedChangeLists("Test", "Default Changelist") } } @@ -165,8 +165,8 @@ class LineStatusTrackerManagerTest : BaseLineStatusTrackerManagerTest() { tracker.moveToChangelist(tracker.getRanges()!![0], "Test #2".asListNameToList()) tracker.assertAffectedChangeLists("Test #1", "Test #2") - file.moveChanges("Test #2", "Default") - tracker.assertAffectedChangeLists("Test #1", "Default") + file.moveChanges("Test #2", "Default Changelist") + tracker.assertAffectedChangeLists("Test #1", "Default Changelist") file.moveAllChangesTo("Test #2") tracker.assertAffectedChangeLists("Test #2") @@ -196,7 +196,7 @@ class LineStatusTrackerManagerTest : BaseLineStatusTrackerManagerTest() { tracker.assertAffectedChangeLists("Test #2") runCommand { tracker.document.replaceString(0, 1, "a2") } - tracker.assertAffectedChangeLists("Default") + tracker.assertAffectedChangeLists("Default Changelist") } } @@ -214,7 +214,7 @@ class LineStatusTrackerManagerTest : BaseLineStatusTrackerManagerTest() { tracker.assertAffectedChangeLists("Test") runCommand { tracker.document.replaceString(0, 1, "a2") } - tracker.assertAffectedChangeLists("Default", "Test") + tracker.assertAffectedChangeLists("Default Changelist", "Test") runCommand { tracker.document.replaceString(0, 2, "a") } tracker.assertAffectedChangeLists("Test") @@ -242,14 +242,14 @@ class LineStatusTrackerManagerTest : BaseLineStatusTrackerManagerTest() { tracker.assertAffectedChangeLists("Test") runCommand { tracker.document.replaceString(0, 1, "a2") } - tracker.assertAffectedChangeLists("Default", "Test") + tracker.assertAffectedChangeLists("Default Changelist", "Test") assertFalse(tracker.isOperational()) assertNull(tracker.getRanges()) lstm.waitUntilBaseContentsLoaded() assertEquals(2, tracker.getRanges()!!.size) - tracker.assertAffectedChangeLists("Default", "Test") + tracker.assertAffectedChangeLists("Default Changelist", "Test") } } @@ -267,14 +267,14 @@ class LineStatusTrackerManagerTest : BaseLineStatusTrackerManagerTest() { tracker.assertAffectedChangeLists("Test") runCommand { tracker.document.replaceString(0, 1, "a2") } - tracker.assertAffectedChangeLists("Default", "Test") + tracker.assertAffectedChangeLists("Default Changelist", "Test") assertFalse(tracker.isOperational()) assertNull(tracker.getRanges()) lstm.waitUntilBaseContentsLoaded() assertEquals(1, tracker.getRanges()!!.size) - tracker.assertAffectedChangeLists("Default") + tracker.assertAffectedChangeLists("Default Changelist") } } @@ -292,14 +292,14 @@ class LineStatusTrackerManagerTest : BaseLineStatusTrackerManagerTest() { tracker.assertAffectedChangeLists("Test") runCommand { tracker.document.replaceString(0, 2, "a") } - tracker.assertAffectedChangeLists("Default", "Test") + tracker.assertAffectedChangeLists("Default Changelist", "Test") assertFalse(tracker.isOperational()) assertNull(tracker.getRanges()) lstm.waitUntilBaseContentsLoaded() assertEquals(0, tracker.getRanges()!!.size) - tracker.assertAffectedChangeLists("Default") + tracker.assertAffectedChangeLists("Default Changelist") } } @@ -386,7 +386,7 @@ class LineStatusTrackerManagerTest : BaseLineStatusTrackerManagerTest() { runCommand { file.document.replaceString(0, 1, "a2") } val tracker = file.tracker as PartialLocalLineStatusTracker - tracker.assertAffectedChangeLists("Default", "Test") + tracker.assertAffectedChangeLists("Default Changelist", "Test") setBaseVersion(FILE_1, "a2_b_c_d_e") refreshCLM() @@ -411,7 +411,7 @@ class LineStatusTrackerManagerTest : BaseLineStatusTrackerManagerTest() { lstm.waitUntilBaseContentsLoaded() val tracker = file.tracker as PartialLocalLineStatusTracker - tracker.assertAffectedChangeLists("Default", "Test") + tracker.assertAffectedChangeLists("Default Changelist", "Test") setBaseVersion(FILE_1, "a2_b_c_d_e") refreshCLM() @@ -511,7 +511,7 @@ class LineStatusTrackerManagerTest : BaseLineStatusTrackerManagerTest() { assertNotNull(file.tracker) assertTrue(file.tracker is PartialLocalLineStatusTracker) - file.assertAffectedChangeLists("Test", "Default") + file.assertAffectedChangeLists("Test", "Default Changelist") setBaseVersion(FILE_1, "a_b_c_d_e3") changeProvider.awaitAndBlockRefresh().use { @@ -547,12 +547,12 @@ class LineStatusTrackerManagerTest : BaseLineStatusTrackerManagerTest() { assertNotNull(file.tracker) assertTrue(file.tracker is PartialLocalLineStatusTracker) - file.assertAffectedChangeLists("Test", "Default") + file.assertAffectedChangeLists("Test", "Default Changelist") } clm.waitUntilRefreshed() - file.assertAffectedChangeLists("Test", "Default") + file.assertAffectedChangeLists("Test", "Default Changelist") } fun `test vcs refresh - tracker created during update (changes moved via LST)`() { @@ -570,11 +570,11 @@ class LineStatusTrackerManagerTest : BaseLineStatusTrackerManagerTest() { lstm.waitUntilBaseContentsLoaded() val tracker = file.tracker as PartialLocalLineStatusTracker - file.assertAffectedChangeLists("Test", "Default") + file.assertAffectedChangeLists("Test", "Default Changelist") val range = tracker.getRanges()!![1] - tracker.moveToChangelist(range, "Default".asListNameToList()) - file.assertAffectedChangeLists("Default") + tracker.moveToChangelist(range, "Default Changelist".asListNameToList()) + file.assertAffectedChangeLists("Default Changelist") assertNotNull(file.tracker) } assertNotNull(file.tracker) @@ -584,7 +584,7 @@ class LineStatusTrackerManagerTest : BaseLineStatusTrackerManagerTest() { releaseUnneededTrackers() assertNull(file.tracker) - file.assertAffectedChangeLists("Default") + file.assertAffectedChangeLists("Default Changelist") } fun `test vcs refresh - tracker created during update (changes moved via CLM)`() { @@ -603,7 +603,7 @@ class LineStatusTrackerManagerTest : BaseLineStatusTrackerManagerTest() { lstm.waitUntilBaseContentsLoaded() val tracker = file.tracker as PartialLocalLineStatusTracker - file.assertAffectedChangeLists("Test", "Default") + file.assertAffectedChangeLists("Test", "Default Changelist") val range = tracker.getRanges()!![1] file.moveAllChangesTo("Test 2") @@ -636,11 +636,11 @@ class LineStatusTrackerManagerTest : BaseLineStatusTrackerManagerTest() { lstm.waitUntilBaseContentsLoaded() val tracker = file.tracker as PartialLocalLineStatusTracker - file.assertAffectedChangeLists("Test", "Default") + file.assertAffectedChangeLists("Test", "Default Changelist") val range = tracker.getRanges()!![1] - tracker.moveToChangelist(range, "Default".asListNameToList()) - file.assertAffectedChangeLists("Default") + tracker.moveToChangelist(range, "Default Changelist".asListNameToList()) + file.assertAffectedChangeLists("Default Changelist") releaseUnneededTrackers() assertNull(file.tracker) @@ -652,7 +652,7 @@ class LineStatusTrackerManagerTest : BaseLineStatusTrackerManagerTest() { releaseUnneededTrackers() assertNull(file.tracker) - file.assertAffectedChangeLists("Default") + file.assertAffectedChangeLists("Default Changelist") } fun `test vcs refresh - tracker created and released during update (changes moved via CLM)`() { @@ -671,7 +671,7 @@ class LineStatusTrackerManagerTest : BaseLineStatusTrackerManagerTest() { lstm.waitUntilBaseContentsLoaded() val tracker = file.tracker as PartialLocalLineStatusTracker - file.assertAffectedChangeLists("Test", "Default") + file.assertAffectedChangeLists("Test", "Default Changelist") val range = tracker.getRanges()!![1] file.moveAllChangesTo("Test 2") @@ -705,7 +705,7 @@ class LineStatusTrackerManagerTest : BaseLineStatusTrackerManagerTest() { lstm.waitUntilBaseContentsLoaded() val tracker = file.tracker as PartialLocalLineStatusTracker - file.assertAffectedChangeLists("Test", "Default") + file.assertAffectedChangeLists("Test", "Default Changelist") val range = tracker.getRanges()!![0] tracker.moveToChangelist(range, "Test".asListNameToList()) @@ -740,8 +740,8 @@ class LineStatusTrackerManagerTest : BaseLineStatusTrackerManagerTest() { file.assertAffectedChangeLists("Test") val range = tracker.getRanges()!![0] - tracker.moveToChangelist(range, "Default".asListNameToList()) - file.assertAffectedChangeLists("Default") + tracker.moveToChangelist(range, "Default Changelist".asListNameToList()) + file.assertAffectedChangeLists("Default Changelist") } } assertNull(file.tracker) @@ -751,7 +751,7 @@ class LineStatusTrackerManagerTest : BaseLineStatusTrackerManagerTest() { releaseUnneededTrackers() assertNull(file.tracker) - file.assertAffectedChangeLists("Default") + file.assertAffectedChangeLists("Default Changelist") } fun `test file rename - no partial changes`() { @@ -780,14 +780,14 @@ class LineStatusTrackerManagerTest : BaseLineStatusTrackerManagerTest() { refreshCLM() file.moveAllChangesTo("Test") runCommand { file.document.replaceString(0, 1, "a2") } - FILE_1.toFilePath.assertAffectedChangeLists("Test", "Default") + FILE_1.toFilePath.assertAffectedChangeLists("Test", "Default Changelist") runWriteAction { file.rename(this, FILE_2) } setBaseVersion(FILE_2, "a_b_c_d_e2", FILE_1) refreshCLM() - FILE_2.toFilePath.assertAffectedChangeLists("Test", "Default") + FILE_2.toFilePath.assertAffectedChangeLists("Test", "Default Changelist") } @Bombed(year = 2018, month = Calendar.JUNE, day = 1, user = "Aleksey.Pivovarov") @@ -799,7 +799,7 @@ class LineStatusTrackerManagerTest : BaseLineStatusTrackerManagerTest() { refreshCLM() file.moveAllChangesTo("Test") runCommand { file.document.replaceString(0, 1, "a2") } - FILE_1.toFilePath.assertAffectedChangeLists("Test", "Default") + FILE_1.toFilePath.assertAffectedChangeLists("Test", "Default Changelist") runWriteAction { file.rename(this, FILE_2) @@ -811,7 +811,7 @@ class LineStatusTrackerManagerTest : BaseLineStatusTrackerManagerTest() { lstm.waitUntilBaseContentsLoaded() releaseUnneededTrackers() - FILE_1.toFilePath.assertAffectedChangeLists("Test", "Default") + FILE_1.toFilePath.assertAffectedChangeLists("Test", "Default Changelist") } } @@ -819,6 +819,6 @@ class LineStatusTrackerManagerTest : BaseLineStatusTrackerManagerTest() { lstm.waitUntilBaseContentsLoaded() releaseUnneededTrackers() - FILE_2.toFilePath.assertAffectedChangeLists("Test", "Default") + FILE_2.toFilePath.assertAffectedChangeLists("Test", "Default Changelist") } } \ No newline at end of file diff --git a/platform/vcs-tests/testSrc/com/intellij/openapi/vcs/PartialLineStatusTrackerTest.kt b/platform/vcs-tests/testSrc/com/intellij/openapi/vcs/PartialLineStatusTrackerTest.kt index dee71677d868..cd90933a599e 100644 --- a/platform/vcs-tests/testSrc/com/intellij/openapi/vcs/PartialLineStatusTrackerTest.kt +++ b/platform/vcs-tests/testSrc/com/intellij/openapi/vcs/PartialLineStatusTrackerTest.kt @@ -1,6 +1,4 @@ -/* - * Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. - */ +// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package com.intellij.openapi.vcs import com.intellij.diff.util.Side @@ -14,8 +12,8 @@ class PartialLineStatusTrackerTest : BaseLineStatusTrackerTestCase() { testPartial("1234_2345_3456") { "12".insertAfter("a") - range().assertChangeList("Default") - assertAffectedChangeLists("Default") + range().assertChangeList("Default Changelist") + assertAffectedChangeLists("Default Changelist") } } @@ -23,19 +21,19 @@ class PartialLineStatusTrackerTest : BaseLineStatusTrackerTestCase() { testPartial("1234_2345_3456") { "12".insertAfter("a") - range().assertChangeList("Default") + range().assertChangeList("Default Changelist") createChangeList_SetDefault("Test") "12".insertBefore("X_Y_Z") - range().assertChangeList("Default") - assertAffectedChangeLists("Default") + range().assertChangeList("Default Changelist") + assertAffectedChangeLists("Default Changelist") "3456".replace("X_Y_Z") - range(0).assertChangeList("Default") + range(0).assertChangeList("Default Changelist") range(1).assertChangeList("Test") - assertAffectedChangeLists("Default", "Test") + assertAffectedChangeLists("Default Changelist", "Test") } } @@ -43,19 +41,19 @@ class PartialLineStatusTrackerTest : BaseLineStatusTrackerTestCase() { testPartial("1234_2345_3456") { "12".insertAfter("a") - range().assertChangeList("Default") - assertAffectedChangeLists("Default") + range().assertChangeList("Default Changelist") + assertAffectedChangeLists("Default Changelist") createChangeList_SetDefault("Test") - range().assertChangeList("Default") - assertAffectedChangeLists("Default") + range().assertChangeList("Default Changelist") + assertAffectedChangeLists("Default Changelist") "56".insertAfter("b") - range(0).assertChangeList("Default") + range(0).assertChangeList("Default Changelist") range(1).assertChangeList("Test") - assertAffectedChangeLists("Default", "Test") + assertAffectedChangeLists("Default Changelist", "Test") "2345".insertAfter("c") @@ -68,19 +66,19 @@ class PartialLineStatusTrackerTest : BaseLineStatusTrackerTestCase() { testPartial("1234_2345_3456") { "12".insertAfter("a") - range().assertChangeList("Default") - assertAffectedChangeLists("Default") + range().assertChangeList("Default Changelist") + assertAffectedChangeLists("Default Changelist") createChangeList_SetDefault("Test") - range().assertChangeList("Default") - assertAffectedChangeLists("Default") + range().assertChangeList("Default Changelist") + assertAffectedChangeLists("Default Changelist") "56".insertAfter("b") - range(0).assertChangeList("Default") + range(0).assertChangeList("Default Changelist") range(1).assertChangeList("Test") - assertAffectedChangeLists("Default", "Test") + assertAffectedChangeLists("Default Changelist", "Test") "2345_".delete() @@ -93,8 +91,8 @@ class PartialLineStatusTrackerTest : BaseLineStatusTrackerTestCase() { testPartial("1234_2345_3456") { "12".insertAfter("a") - range().assertChangeList("Default") - assertAffectedChangeLists("Default") + range().assertChangeList("Default Changelist") + assertAffectedChangeLists("Default Changelist") createChangelist("Test") range().moveTo("Test") @@ -108,19 +106,19 @@ class PartialLineStatusTrackerTest : BaseLineStatusTrackerTestCase() { testPartial("1234_2345_3456") { "12".insertAfter("a") - range().assertChangeList("Default") - assertAffectedChangeLists("Default") + range().assertChangeList("Default Changelist") + assertAffectedChangeLists("Default Changelist") createChangeList_SetDefault("Test") - range().assertChangeList("Default") - assertAffectedChangeLists("Default") + range().assertChangeList("Default Changelist") + assertAffectedChangeLists("Default Changelist") "56".insertAfter("b") - range(0).assertChangeList("Default") + range(0).assertChangeList("Default Changelist") range(1).assertChangeList("Test") - assertAffectedChangeLists("Default", "Test") + assertAffectedChangeLists("Default Changelist", "Test") range(0).moveTo("Test") @@ -128,11 +126,11 @@ class PartialLineStatusTrackerTest : BaseLineStatusTrackerTestCase() { range(1).assertChangeList("Test") assertAffectedChangeLists("Test") - range(1).moveTo("Default") + range(1).moveTo("Default Changelist") range(0).assertChangeList("Test") - range(1).assertChangeList("Default") - assertAffectedChangeLists("Default", "Test") + range(1).assertChangeList("Default Changelist") + assertAffectedChangeLists("Default Changelist", "Test") } } @@ -140,21 +138,21 @@ class PartialLineStatusTrackerTest : BaseLineStatusTrackerTestCase() { testPartial("1234_2345_3456") { "12".insertAfter("a") - range().assertChangeList("Default") - assertAffectedChangeLists("Default") + range().assertChangeList("Default Changelist") + assertAffectedChangeLists("Default Changelist") createChangeList_SetDefault("Test") - range().assertChangeList("Default") - assertAffectedChangeLists("Default") + range().assertChangeList("Default Changelist") + assertAffectedChangeLists("Default Changelist") "56".insertAfter("b") - range(0).assertChangeList("Default") + range(0).assertChangeList("Default Changelist") range(1).assertChangeList("Test") - assertAffectedChangeLists("Default", "Test") + assertAffectedChangeLists("Default Changelist", "Test") - removeChangeList("Default") + removeChangeList("Default Changelist") range(0).assertChangeList("Test") range(1).assertChangeList("Test") @@ -206,7 +204,7 @@ class PartialLineStatusTrackerTest : BaseLineStatusTrackerTestCase() { assertTextContentIs("A_B1_C_E_F_M_G_N_H_") assertBaseTextContentIs("A_B_C_D_E_F_G_H_") - assertAffectedChangeLists("Default", "Test") + assertAffectedChangeLists("Default Changelist", "Test") val helper = handlePartialCommit(Side.LEFT, "Test") helper.applyChanges() @@ -214,7 +212,7 @@ class PartialLineStatusTrackerTest : BaseLineStatusTrackerTestCase() { assertHelperContentIs("A_B_C_E_F_G_N_H_", helper) assertTextContentIs("A_B1_C_E_F_M_G_N_H_") assertBaseTextContentIs("A_B_C_E_F_G_N_H_") - assertAffectedChangeLists("Default") + assertAffectedChangeLists("Default Changelist") } } @@ -229,9 +227,9 @@ class PartialLineStatusTrackerTest : BaseLineStatusTrackerTestCase() { assertTextContentIs("A_B1_C_E_F_M_G_N_H_") assertBaseTextContentIs("A_B_C_D_E_F_G_H_") - assertAffectedChangeLists("Default", "Test") + assertAffectedChangeLists("Default Changelist", "Test") - val helper = handlePartialCommit(Side.LEFT, "Default") + val helper = handlePartialCommit(Side.LEFT, "Default Changelist") helper.applyChanges() assertHelperContentIs("A_B1_C_D_E_F_M_G_H_", helper) @@ -252,7 +250,7 @@ class PartialLineStatusTrackerTest : BaseLineStatusTrackerTestCase() { assertTextContentIs("A_B1_C_E_F_M_G_N_H_") assertBaseTextContentIs("A_B_C_D_E_F_G_H_") - assertAffectedChangeLists("Default", "Test") + assertAffectedChangeLists("Default Changelist", "Test") val helper = handlePartialCommit(Side.RIGHT, "Test") helper.applyChanges() @@ -260,7 +258,7 @@ class PartialLineStatusTrackerTest : BaseLineStatusTrackerTestCase() { assertHelperContentIs("A_B1_C_D_E_F_M_G_H_", helper) assertTextContentIs("A_B1_C_D_E_F_M_G_H_") assertBaseTextContentIs("A_B_C_D_E_F_G_H_") - assertAffectedChangeLists("Default") + assertAffectedChangeLists("Default Changelist") } } @@ -275,13 +273,13 @@ class PartialLineStatusTrackerTest : BaseLineStatusTrackerTestCase() { assertTextContentIs("A_B1_C_E_F_M_G_N_H_") assertBaseTextContentIs("A_B_C_D_E_F_G_H_") - assertAffectedChangeLists("Default", "Test") + assertAffectedChangeLists("Default Changelist", "Test") tracker.doFrozen(Runnable { runCommandVerify { "B1_".replace("X_Y_Z_") - val helper = handlePartialCommit(Side.LEFT, "Default") + val helper = handlePartialCommit(Side.LEFT, "Default Changelist") helper.applyChanges() assertHelperContentIs("A_X_Y_Z_C_D_E_F_M_G_H_", helper) @@ -304,13 +302,13 @@ class PartialLineStatusTrackerTest : BaseLineStatusTrackerTestCase() { assertTextContentIs("A_B1_C_E_F_M_G_N_H_") assertBaseTextContentIs("A_B_C_D_E_F_G_H_") - assertAffectedChangeLists("Default", "Test") + assertAffectedChangeLists("Default Changelist", "Test") tracker.doFrozen(Runnable { runCommandVerify { "B1_".replace("X_Y_Z_") - val helper = handlePartialCommit(Side.LEFT, "Default") + val helper = handlePartialCommit(Side.LEFT, "Default Changelist") "N".replace("N2") "M".replace("M2") @@ -345,7 +343,7 @@ class PartialLineStatusTrackerTest : BaseLineStatusTrackerTestCase() { "C".replace("C2") assertRanges(Range(1, 3, 1, 4)) - assertAffectedChangeLists("Default") + assertAffectedChangeLists("Default Changelist") undo() @@ -357,7 +355,7 @@ class PartialLineStatusTrackerTest : BaseLineStatusTrackerTestCase() { redo() assertRanges(Range(1, 3, 1, 4)) - assertAffectedChangeLists("Default") + assertAffectedChangeLists("Default Changelist") undo() @@ -382,7 +380,7 @@ class PartialLineStatusTrackerTest : BaseLineStatusTrackerTestCase() { "C".replace("C2") assertRanges(Range(1, 3, 1, 4)) - assertAffectedChangeLists("Default") + assertAffectedChangeLists("Default Changelist") range(0).moveTo("Test 1") assertAffectedChangeLists("Test 1") @@ -420,9 +418,9 @@ class PartialLineStatusTrackerTest : BaseLineStatusTrackerTestCase() { "C".replace("C2") assertRanges(Range(1, 3, 1, 4)) - assertAffectedChangeLists("Default") + assertAffectedChangeLists("Default Changelist") - tracker.virtualFile.moveChanges("Default", "Test 1") + tracker.virtualFile.moveChanges("Default Changelist", "Test 1") assertAffectedChangeLists("Test 1") undo()