From 98d2d221af0b0befcf64c3adb77fe39d230d8955 Mon Sep 17 00:00:00 2001 From: Konstantin Kolosovsky Date: Fri, 3 Mar 2017 20:24:46 +0300 Subject: [PATCH] Remove redundant type arguments in [svn4idea-tests] --- .../idea/svn/SvnCachingRevisionsTest.java | 8 +++--- .../jetbrains/idea/svn/SvnMergeInfoTest.java | 2 +- .../jetbrains/idea/svn/SvnRollbackTest.java | 26 +++++++++---------- .../idea/svn16/SvnCachingRevisionsTest.java | 8 +++--- .../idea/svn16/SvnMergeInfoTest.java | 2 +- .../jetbrains/idea/svn16/SvnRollbackTest.java | 26 +++++++++---------- 6 files changed, 36 insertions(+), 36 deletions(-) diff --git a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnCachingRevisionsTest.java b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnCachingRevisionsTest.java index a0805c032b62..c2f15c10290a 100644 --- a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnCachingRevisionsTest.java +++ b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnCachingRevisionsTest.java @@ -219,7 +219,7 @@ public class SvnCachingRevisionsTest extends CodeInsightFixtureTestCase { } public void testJustLiveProvider() throws Exception { - performTest(11, 2, null, Collections.>emptyList(), 121); + performTest(11, 2, null, Collections.emptyList(), 121); } public void testLiveAndSimpleInternalProvider() throws Exception { @@ -230,7 +230,7 @@ public class SvnCachingRevisionsTest extends CodeInsightFixtureTestCase { public void testLiveAndSimpleCommittedProvider() throws Exception { for (int i = 0; i < 2 * PAGE; i+=2) { - performTest(11, 2, new Pair<>(19L, 117L), Collections.>emptyList(), 121 + i); + performTest(11, 2, new Pair<>(19L, 117L), Collections.emptyList(), 121 + i); } } @@ -259,7 +259,7 @@ public class SvnCachingRevisionsTest extends CodeInsightFixtureTestCase { } public void testShortLive() throws Exception { - performTest(11, 2, null, Collections.>emptyList(), 13); + performTest(11, 2, null, Collections.emptyList(), 13); } public void testShortInternal() throws Exception { @@ -267,7 +267,7 @@ public class SvnCachingRevisionsTest extends CodeInsightFixtureTestCase { } public void testShortCommitted() throws Exception { - performTest(11, 2, new Pair<>(11L, 15L), Collections.>emptyList(), 15); + performTest(11, 2, new Pair<>(11L, 15L), Collections.emptyList(), 15); } public void testThreeByOne() throws Exception { diff --git a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnMergeInfoTest.java b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnMergeInfoTest.java index f29a61acafbb..fb6fdac7d0ad 100644 --- a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnMergeInfoTest.java +++ b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnMergeInfoTest.java @@ -100,7 +100,7 @@ public class SvnMergeInfoTest extends Svn17TestCase { enableSilentOperation(VcsConfiguration.StandardConfirmation.REMOVE); final String repoUrl = SVNURL.parseURIDecoded(myRepoUrl).toString(); - myWCInfoWithBranches = new WCInfoWithBranches(myWCInfo, Collections.emptyList(), vcsRoot, + myWCInfoWithBranches = new WCInfoWithBranches(myWCInfo, Collections.emptyList(), vcsRoot, new WCInfoWithBranches.Branch(repoUrl + "/trunk")); myMergeChecker = new BranchInfo(myVcs, myWCInfoWithBranches, new WCInfoWithBranches.Branch(repoUrl + "/branch")); } diff --git a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnRollbackTest.java b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnRollbackTest.java index 571544480762..349340122686 100644 --- a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnRollbackTest.java +++ b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnRollbackTest.java @@ -75,7 +75,7 @@ public class SvnRollbackTest extends Svn17TestCase { final Change change = myChangeListManager.getChange(a); Assert.assertNotNull(change); - rollbackIMpl(Collections.singletonList(change), Collections.emptyList()); + rollbackIMpl(Collections.singletonList(change), Collections.emptyList()); } private void rollbackIMpl(List changes, final List allowedAfter) throws VcsException { @@ -116,7 +116,7 @@ public class SvnRollbackTest extends Svn17TestCase { final Change s1Change = assertMovedChange(tree.myS1File); final Change s2Change = assertMovedChange(tree.myS2File); - rollbackIMpl(Collections.singletonList(change), Collections.emptyList()); + rollbackIMpl(Collections.singletonList(change), Collections.emptyList()); } @Test @@ -141,7 +141,7 @@ public class SvnRollbackTest extends Svn17TestCase { Assert.assertTrue(!FileUtil.filesEqual(new File(unv.getPath()), wasUnversioned)); Assert.assertTrue(! wasUnversioned.exists()); - rollbackIMpl(Arrays.asList(change, s2Change), Collections.emptyList()); + rollbackIMpl(Arrays.asList(change, s2Change), Collections.emptyList()); Assert.assertTrue(wasUnversioned.exists()); } @@ -173,7 +173,7 @@ public class SvnRollbackTest extends Svn17TestCase { Assert.assertTrue(!FileUtil.filesEqual(new File(deepUnverioned.getPath()), was)); Assert.assertTrue(! was.exists()); - rollbackIMpl(Arrays.asList(change), Collections.emptyList()); + rollbackIMpl(Arrays.asList(change), Collections.emptyList()); Assert.assertTrue(was.exists()); } @@ -332,7 +332,7 @@ public class SvnRollbackTest extends Svn17TestCase { final Change change = assertDeletedChange(fpSource); final Change t11Change = assertDeletedChange(fpT11); - rollbackIMpl(Arrays.asList(change, t11Change), Collections.emptyList()); + rollbackIMpl(Arrays.asList(change, t11Change), Collections.emptyList()); } private Change assertDeletedChange(FilePath fpSource) { @@ -359,7 +359,7 @@ public class SvnRollbackTest extends Svn17TestCase { final Change inNewDirChange = assertCreatedChange(inNewDir); final Change inSourceChange = assertCreatedChange(inSource); - rollbackIMpl(Arrays.asList(change, inSourceChange), Collections.emptyList()); + rollbackIMpl(Arrays.asList(change, inSourceChange), Collections.emptyList()); } private Change assertCreatedChange(VirtualFile newDir) { @@ -432,7 +432,7 @@ public class SvnRollbackTest extends Svn17TestCase { Assert.assertTrue(! wasIgnored.exists()); Assert.assertTrue(FileStatus.IGNORED.equals(myChangeListManager.getStatus(ignored))); - rollbackIMpl(Collections.singletonList(dirChange), Collections.emptyList()); + rollbackIMpl(Collections.singletonList(dirChange), Collections.emptyList()); ignored = LocalFileSystem.getInstance().refreshAndFindFileByIoFile(wasIgnored); // ignored property was not committed Assert.assertTrue(FileStatus.UNKNOWN.equals(myChangeListManager.getStatus(ignored))); @@ -466,7 +466,7 @@ public class SvnRollbackTest extends Svn17TestCase { Assert.assertTrue(! wasIgnored.exists()); Assert.assertTrue(FileStatus.IGNORED.equals(myChangeListManager.getStatus(ignored))); - rollbackIMpl(Collections.singletonList(dirChange), Collections.emptyList()); + rollbackIMpl(Collections.singletonList(dirChange), Collections.emptyList()); ignored = LocalFileSystem.getInstance().refreshAndFindFileByIoFile(wasIgnored); // ignored property was not committed Assert.assertTrue(FileStatus.IGNORED.equals(myChangeListManager.getStatus(ignored))); @@ -490,7 +490,7 @@ public class SvnRollbackTest extends Svn17TestCase { final Change s1Change = assertMovedChange(tree.myS1File); final Change s2Change = assertMovedChange(tree.myS2File); - rollbackIMpl(Arrays.asList(dirChange, s1Change, s2Change), Collections.emptyList()); + rollbackIMpl(Arrays.asList(dirChange, s1Change, s2Change), Collections.emptyList()); } @Test @@ -533,7 +533,7 @@ public class SvnRollbackTest extends Svn17TestCase { Assert.assertTrue(deletedFiles.size() == 1); Assert.assertEquals(wasFile, deletedFiles.get(0).getPath().getIOFile()); - rollbackLocallyDeleted(Collections.singletonList(deletedFiles.get(0).getPath()), Collections.emptyList()); + rollbackLocallyDeleted(Collections.singletonList(deletedFiles.get(0).getPath()), Collections.emptyList()); } @Test @@ -563,7 +563,7 @@ public class SvnRollbackTest extends Svn17TestCase { } Assert.assertTrue(files.isEmpty()); - rollbackLocallyDeleted(Collections.singletonList(VcsUtil.getFilePath(wasFile, true)), Collections.emptyList()); + rollbackLocallyDeleted(Collections.singletonList(VcsUtil.getFilePath(wasFile, true)), Collections.emptyList()); } @Test @@ -604,7 +604,7 @@ public class SvnRollbackTest extends Svn17TestCase { Assert.assertTrue(files.contains(deletedFiles.get(1).getPath().getIOFile())); Assert.assertTrue(files.contains(deletedFiles.get(2).getPath().getIOFile())); - rollbackLocallyDeleted(Arrays.asList(VcsUtil.getFilePath(wasFile2, true), VcsUtil.getFilePath(wasFile1, false)), Collections.emptyList()); + rollbackLocallyDeleted(Arrays.asList(VcsUtil.getFilePath(wasFile2, true), VcsUtil.getFilePath(wasFile1, false)), Collections.emptyList()); } @Test @@ -635,7 +635,7 @@ public class SvnRollbackTest extends Svn17TestCase { "D root" + File.separator + "source" + File.separator + "s2.txt" ); - rollbackLocallyDeleted(Collections.singletonList(VcsUtil.getFilePath(was, true)), Collections.emptyList()); + rollbackLocallyDeleted(Collections.singletonList(VcsUtil.getFilePath(was, true)), Collections.emptyList()); runAndVerifyStatusSorted("D root" + File.separator + "source", "D root" + File.separator + "source" + File.separator + "s1.txt", "D root" + File.separator + "source" + File.separator + "s2.txt"); diff --git a/plugins/svn4idea/testSource/org/jetbrains/idea/svn16/SvnCachingRevisionsTest.java b/plugins/svn4idea/testSource/org/jetbrains/idea/svn16/SvnCachingRevisionsTest.java index fcf331d5c076..ef9ce40521f7 100644 --- a/plugins/svn4idea/testSource/org/jetbrains/idea/svn16/SvnCachingRevisionsTest.java +++ b/plugins/svn4idea/testSource/org/jetbrains/idea/svn16/SvnCachingRevisionsTest.java @@ -220,7 +220,7 @@ public class SvnCachingRevisionsTest extends CodeInsightFixtureTestCase { } public void testJustLiveProvider() throws Exception { - performTest(11, 2, null, Collections.>emptyList(), 121); + performTest(11, 2, null, Collections.emptyList(), 121); } public void testLiveAndSimpleInternalProvider() throws Exception { @@ -231,7 +231,7 @@ public class SvnCachingRevisionsTest extends CodeInsightFixtureTestCase { public void testLiveAndSimpleCommittedProvider() throws Exception { for (int i = 0; i < 2 * PAGE; i+=2) { - performTest(11, 2, new Pair<>(19L, 117L), Collections.>emptyList(), 121 + i); + performTest(11, 2, new Pair<>(19L, 117L), Collections.emptyList(), 121 + i); } } @@ -260,7 +260,7 @@ public class SvnCachingRevisionsTest extends CodeInsightFixtureTestCase { } public void testShortLive() throws Exception { - performTest(11, 2, null, Collections.>emptyList(), 13); + performTest(11, 2, null, Collections.emptyList(), 13); } public void testShortInternal() throws Exception { @@ -268,7 +268,7 @@ public class SvnCachingRevisionsTest extends CodeInsightFixtureTestCase { } public void testShortCommitted() throws Exception { - performTest(11, 2, new Pair<>(11L, 15L), Collections.>emptyList(), 15); + performTest(11, 2, new Pair<>(11L, 15L), Collections.emptyList(), 15); } public void testThreeByOne() throws Exception { diff --git a/plugins/svn4idea/testSource/org/jetbrains/idea/svn16/SvnMergeInfoTest.java b/plugins/svn4idea/testSource/org/jetbrains/idea/svn16/SvnMergeInfoTest.java index 044b6c1609c4..87aaaaa294c7 100644 --- a/plugins/svn4idea/testSource/org/jetbrains/idea/svn16/SvnMergeInfoTest.java +++ b/plugins/svn4idea/testSource/org/jetbrains/idea/svn16/SvnMergeInfoTest.java @@ -104,7 +104,7 @@ public class SvnMergeInfoTest extends Svn16TestCase { enableSilentOperation(VcsConfiguration.StandardConfirmation.REMOVE); final String repoUrl = SVNURL.parseURIDecoded(myRepoUrl).toString(); - myWCInfoWithBranches = new WCInfoWithBranches(myWCInfo, Collections.emptyList(), vcsRoot, + myWCInfoWithBranches = new WCInfoWithBranches(myWCInfo, Collections.emptyList(), vcsRoot, new WCInfoWithBranches.Branch(repoUrl + "/trunk")); myMergeChecker = new BranchInfo(myVcs, myWCInfoWithBranches, new WCInfoWithBranches.Branch(repoUrl + "/branch")); } diff --git a/plugins/svn4idea/testSource/org/jetbrains/idea/svn16/SvnRollbackTest.java b/plugins/svn4idea/testSource/org/jetbrains/idea/svn16/SvnRollbackTest.java index da4145433c2f..72331ad427ca 100644 --- a/plugins/svn4idea/testSource/org/jetbrains/idea/svn16/SvnRollbackTest.java +++ b/plugins/svn4idea/testSource/org/jetbrains/idea/svn16/SvnRollbackTest.java @@ -77,7 +77,7 @@ public class SvnRollbackTest extends Svn17TestCase { final Change change = myChangeListManager.getChange(a); Assert.assertNotNull(change); - rollbackIMpl(Collections.singletonList(change), Collections.emptyList()); + rollbackIMpl(Collections.singletonList(change), Collections.emptyList()); } private void rollbackIMpl(List changes, final List allowedAfter) throws VcsException { @@ -118,7 +118,7 @@ public class SvnRollbackTest extends Svn17TestCase { final Change s1Change = assertMovedChange(tree.myS1File); final Change s2Change = assertMovedChange(tree.myS2File); - rollbackIMpl(Collections.singletonList(change), Collections.emptyList()); + rollbackIMpl(Collections.singletonList(change), Collections.emptyList()); } @Test @@ -143,7 +143,7 @@ public class SvnRollbackTest extends Svn17TestCase { Assert.assertTrue(!FileUtil.filesEqual(new File(unv.getPath()), wasUnversioned)); Assert.assertTrue(! wasUnversioned.exists()); - rollbackIMpl(Arrays.asList(change, s2Change), Collections.emptyList()); + rollbackIMpl(Arrays.asList(change, s2Change), Collections.emptyList()); Assert.assertTrue(wasUnversioned.exists()); } @@ -175,7 +175,7 @@ public class SvnRollbackTest extends Svn17TestCase { Assert.assertTrue(!FileUtil.filesEqual(new File(deepUnverioned.getPath()), was)); Assert.assertTrue(! was.exists()); - rollbackIMpl(Arrays.asList(change), Collections.emptyList()); + rollbackIMpl(Arrays.asList(change), Collections.emptyList()); Assert.assertTrue(was.exists()); } @@ -334,7 +334,7 @@ public class SvnRollbackTest extends Svn17TestCase { final Change change = assertDeletedChange(fpSource); final Change t11Change = assertDeletedChange(fpT11); - rollbackIMpl(Arrays.asList(change, t11Change), Collections.emptyList()); + rollbackIMpl(Arrays.asList(change, t11Change), Collections.emptyList()); } private Change assertDeletedChange(FilePath fpSource) { @@ -361,7 +361,7 @@ public class SvnRollbackTest extends Svn17TestCase { final Change inNewDirChange = assertCreatedChange(inNewDir); final Change inSourceChange = assertCreatedChange(inSource); - rollbackIMpl(Arrays.asList(change, inSourceChange), Collections.emptyList()); + rollbackIMpl(Arrays.asList(change, inSourceChange), Collections.emptyList()); } private Change assertCreatedChange(VirtualFile newDir) { @@ -434,7 +434,7 @@ public class SvnRollbackTest extends Svn17TestCase { Assert.assertTrue(! wasIgnored.exists()); Assert.assertTrue(FileStatus.IGNORED.equals(myChangeListManager.getStatus(ignored))); - rollbackIMpl(Collections.singletonList(dirChange), Collections.emptyList()); + rollbackIMpl(Collections.singletonList(dirChange), Collections.emptyList()); ignored = LocalFileSystem.getInstance().refreshAndFindFileByIoFile(wasIgnored); // ignored property was not committed Assert.assertTrue(FileStatus.UNKNOWN.equals(myChangeListManager.getStatus(ignored))); @@ -468,7 +468,7 @@ public class SvnRollbackTest extends Svn17TestCase { Assert.assertTrue(! wasIgnored.exists()); Assert.assertTrue(FileStatus.IGNORED.equals(myChangeListManager.getStatus(ignored))); - rollbackIMpl(Collections.singletonList(dirChange), Collections.emptyList()); + rollbackIMpl(Collections.singletonList(dirChange), Collections.emptyList()); ignored = LocalFileSystem.getInstance().refreshAndFindFileByIoFile(wasIgnored); // ignored property was not committed Assert.assertTrue(FileStatus.IGNORED.equals(myChangeListManager.getStatus(ignored))); @@ -492,7 +492,7 @@ public class SvnRollbackTest extends Svn17TestCase { final Change s1Change = assertMovedChange(tree.myS1File); final Change s2Change = assertMovedChange(tree.myS2File); - rollbackIMpl(Arrays.asList(dirChange, s1Change, s2Change), Collections.emptyList()); + rollbackIMpl(Arrays.asList(dirChange, s1Change, s2Change), Collections.emptyList()); } @Test @@ -535,7 +535,7 @@ public class SvnRollbackTest extends Svn17TestCase { Assert.assertTrue(deletedFiles.size() == 1); Assert.assertEquals(wasFile, deletedFiles.get(0).getPath().getIOFile()); - rollbackLocallyDeleted(Collections.singletonList(deletedFiles.get(0).getPath()), Collections.emptyList()); + rollbackLocallyDeleted(Collections.singletonList(deletedFiles.get(0).getPath()), Collections.emptyList()); } @Test @@ -565,7 +565,7 @@ public class SvnRollbackTest extends Svn17TestCase { } Assert.assertTrue(files.isEmpty()); - rollbackLocallyDeleted(Collections.singletonList(VcsUtil.getFilePath(wasFile, true)), Collections.emptyList()); + rollbackLocallyDeleted(Collections.singletonList(VcsUtil.getFilePath(wasFile, true)), Collections.emptyList()); } @Test @@ -606,7 +606,7 @@ public class SvnRollbackTest extends Svn17TestCase { Assert.assertTrue(files.contains(deletedFiles.get(1).getPath().getIOFile())); Assert.assertTrue(files.contains(deletedFiles.get(2).getPath().getIOFile())); - rollbackLocallyDeleted(Arrays.asList(VcsUtil.getFilePath(wasFile2, true), VcsUtil.getFilePath(wasFile1, false)), Collections.emptyList()); + rollbackLocallyDeleted(Arrays.asList(VcsUtil.getFilePath(wasFile2, true), VcsUtil.getFilePath(wasFile1, false)), Collections.emptyList()); } @Test @@ -637,7 +637,7 @@ public class SvnRollbackTest extends Svn17TestCase { "D root" + File.separator + "source" + File.separator + "s2.txt" ); - rollbackLocallyDeleted(Collections.singletonList(VcsUtil.getFilePath(was, true)), Collections.emptyList()); + rollbackLocallyDeleted(Collections.singletonList(VcsUtil.getFilePath(was, true)), Collections.emptyList()); runAndVerifyStatusSorted("D root" + File.separator + "source", "D root" + File.separator + "source" + File.separator + "s1.txt", "D root" + File.separator + "source" + File.separator + "s2.txt");