From 591612d74f5988dc6fdcd47626bd912c7b07a12e Mon Sep 17 00:00:00 2001 From: Konstantin Kolosovsky Date: Mon, 2 Jul 2018 16:39:47 +0300 Subject: [PATCH] svn: Refactor "SvnTreeConflictDataTest" - remove redundant duplicate "refresh local changes" calls --- .../idea/svn/SvnTreeConflictDataTest.java | 34 ------------------- 1 file changed, 34 deletions(-) diff --git a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnTreeConflictDataTest.java b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnTreeConflictDataTest.java index 65610d35b5c2..ff55ed36fc33 100644 --- a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnTreeConflictDataTest.java +++ b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnTreeConflictDataTest.java @@ -210,8 +210,6 @@ public class SvnTreeConflictDataTest extends SvnTestCase { ChangeListManager changeListManager = ChangeListManager.getInstance(myProject); VcsDirtyScopeManager.getInstance(myProject).markEverythingDirty(); changeListManager.ensureUpToDate(false); - VcsDirtyScopeManager.getInstance(myProject).markEverythingDirty(); - changeListManager.ensureUpToDate(false); VirtualFile vf = LocalFileSystem.getInstance().refreshAndFindFileByIoFile(new File(myWorkingCopyDir.getPath(), conflictFile)); assertNotNull(vf); @@ -243,8 +241,6 @@ public class SvnTreeConflictDataTest extends SvnTestCase { ChangeListManager changeListManager = ChangeListManager.getInstance(myProject); VcsDirtyScopeManager.getInstance(myProject).markEverythingDirty(); changeListManager.ensureUpToDate(false); - VcsDirtyScopeManager.getInstance(myProject).markEverythingDirty(); - changeListManager.ensureUpToDate(false); VirtualFile vf = LocalFileSystem.getInstance().refreshAndFindFileByIoFile(new File(myWorkingCopyDir.getPath(), conflictFile)); assertNotNull(vf); @@ -481,9 +477,6 @@ public class SvnTreeConflictDataTest extends SvnTestCase { VcsDirtyScopeManager.getInstance(myProject).markEverythingDirty(); changeListManager.ensureUpToDate(false); - VcsDirtyScopeManager.getInstance(myProject).markEverythingDirty(); - changeListManager.ensureUpToDate(false); - VirtualFile vf = LocalFileSystem.getInstance().refreshAndFindFileByIoFile(new File(myWorkingCopyDir.getPath(), conflictFile)); assertNotNull(vf); final Change change = changeListManager.getChange(vf); @@ -513,9 +506,6 @@ public class SvnTreeConflictDataTest extends SvnTestCase { VcsDirtyScopeManager.getInstance(myProject).markEverythingDirty(); changeListManager.ensureUpToDate(false); - VcsDirtyScopeManager.getInstance(myProject).markEverythingDirty(); - changeListManager.ensureUpToDate(false); - VirtualFile vf = LocalFileSystem.getInstance().refreshAndFindFileByIoFile(new File(myWorkingCopyDir.getPath(), conflictFile)); assertNotNull(vf); final Change change = changeListManager.getChange(vf); @@ -545,9 +535,6 @@ public class SvnTreeConflictDataTest extends SvnTestCase { VcsDirtyScopeManager.getInstance(myProject).markEverythingDirty(); changeListManager.ensureUpToDate(false); - VcsDirtyScopeManager.getInstance(myProject).markEverythingDirty(); - changeListManager.ensureUpToDate(false); - VirtualFile vf = LocalFileSystem.getInstance().refreshAndFindFileByIoFile(new File(myWorkingCopyDir.getPath(), conflictFile)); assertNotNull(vf); final Change change = changeListManager.getChange(vf); @@ -577,9 +564,6 @@ public class SvnTreeConflictDataTest extends SvnTestCase { VcsDirtyScopeManager.getInstance(myProject).markEverythingDirty(); changeListManager.ensureUpToDate(false); - VcsDirtyScopeManager.getInstance(myProject).markEverythingDirty(); - changeListManager.ensureUpToDate(false); - VirtualFile vf = LocalFileSystem.getInstance().refreshAndFindFileByIoFile(new File(myWorkingCopyDir.getPath(), conflictFile)); assertNotNull(vf); final Change change = changeListManager.getChange(vf); @@ -609,9 +593,6 @@ public class SvnTreeConflictDataTest extends SvnTestCase { VcsDirtyScopeManager.getInstance(myProject).markEverythingDirty(); changeListManager.ensureUpToDate(false); - VcsDirtyScopeManager.getInstance(myProject).markEverythingDirty(); - changeListManager.ensureUpToDate(false); - VirtualFile vf = LocalFileSystem.getInstance().refreshAndFindFileByIoFile(new File(myWorkingCopyDir.getPath(), conflictFile)); assertNotNull(vf); final Change change = changeListManager.getChange(vf); @@ -642,9 +623,6 @@ public class SvnTreeConflictDataTest extends SvnTestCase { VcsDirtyScopeManager.getInstance(myProject).markEverythingDirty(); changeListManager.ensureUpToDate(false); - VcsDirtyScopeManager.getInstance(myProject).markEverythingDirty(); - changeListManager.ensureUpToDate(false); - VirtualFile vf = LocalFileSystem.getInstance().refreshAndFindFileByIoFile(new File(myWorkingCopyDir.getPath(), conflictFile)); assertNotNull(vf); final Change change = changeListManager.getChange(vf); @@ -674,9 +652,6 @@ public class SvnTreeConflictDataTest extends SvnTestCase { VcsDirtyScopeManager.getInstance(myProject).markEverythingDirty(); changeListManager.ensureUpToDate(false); - VcsDirtyScopeManager.getInstance(myProject).markEverythingDirty(); - changeListManager.ensureUpToDate(false); - VirtualFile vf = LocalFileSystem.getInstance().refreshAndFindFileByIoFile(new File(myWorkingCopyDir.getPath(), conflictFile)); assertNotNull(vf); final Change change = changeListManager.getChange(vf); @@ -706,9 +681,6 @@ public class SvnTreeConflictDataTest extends SvnTestCase { VcsDirtyScopeManager.getInstance(myProject).markEverythingDirty(); changeListManager.ensureUpToDate(false); - VcsDirtyScopeManager.getInstance(myProject).markEverythingDirty(); - changeListManager.ensureUpToDate(false); - VirtualFile vf = LocalFileSystem.getInstance().refreshAndFindFileByIoFile(new File(myWorkingCopyDir.getPath(), conflictFile)); assertNotNull(vf); final Change change = changeListManager.getChange(vf); @@ -738,9 +710,6 @@ public class SvnTreeConflictDataTest extends SvnTestCase { VcsDirtyScopeManager.getInstance(myProject).markEverythingDirty(); changeListManager.ensureUpToDate(false); - VcsDirtyScopeManager.getInstance(myProject).markEverythingDirty(); - changeListManager.ensureUpToDate(false); - VirtualFile vf = LocalFileSystem.getInstance().refreshAndFindFileByIoFile(new File(myWorkingCopyDir.getPath(), conflictFile)); assertNotNull(vf); final Change change = changeListManager.getChange(vf); @@ -770,9 +739,6 @@ public class SvnTreeConflictDataTest extends SvnTestCase { VcsDirtyScopeManager.getInstance(myProject).markEverythingDirty(); changeListManager.ensureUpToDate(false); - VcsDirtyScopeManager.getInstance(myProject).markEverythingDirty(); - changeListManager.ensureUpToDate(false); - VirtualFile vf = LocalFileSystem.getInstance().refreshAndFindFileByIoFile(new File(myWorkingCopyDir.getPath(), conflictFile)); assertNotNull(vf); final Change change = changeListManager.getChange(vf);