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

Remove redundant type arguments in [svn4idea-tests]

Browse Source
This commit is contained in:
Konstantin Kolosovsky
2017-03-07 14:11:04 +03:00
parent a1b0a3c62e
commit 98d2d221af
6 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnCachingRevisionsTest.java
+4 -4
View File
@@ -219,7 +219,7 @@ public class SvnCachingRevisionsTest extends CodeInsightFixtureTestCase {
}
public void testJustLiveProvider() throws Exception {
performTest(11, 2, null, Collections.<Pair<Long, Long>>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.<Pair<Long, Long>>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.<Pair<Long, Long>>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.<Pair<Long, Long>>emptyList(), 15);
performTest(11, 2, new Pair<>(11L, 15L), Collections.emptyList(), 15);
}
public void testThreeByOne() throws Exception {
plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnMergeInfoTest.java
+1 -1
View File
@@ -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.<WCInfoWithBranches.Branch>emptyList(), vcsRoot,
myWCInfoWithBranches = new WCInfoWithBranches(myWCInfo, Collections.emptyList(), vcsRoot,
new WCInfoWithBranches.Branch(repoUrl + "/trunk"));
myMergeChecker = new BranchInfo(myVcs, myWCInfoWithBranches, new WCInfoWithBranches.Branch(repoUrl + "/branch"));
}
plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnRollbackTest.java
+13 -13
View File
@@ -75,7 +75,7 @@ public class SvnRollbackTest extends Svn17TestCase {
final Change change = myChangeListManager.getChange(a);
Assert.assertNotNull(change);
rollbackIMpl(Collections.singletonList(change), Collections.<Change>emptyList());
rollbackIMpl(Collections.singletonList(change), Collections.emptyList());
}
private void rollbackIMpl(List<Change> changes, final List<Change> 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.<Change>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.<Change>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.<Change>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.<Change>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.<Change>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.<Change>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.<Change>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.<Change>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.<FilePath>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.<FilePath>singletonList(VcsUtil.getFilePath(wasFile, true)), Collections.<FilePath>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.<FilePath>asList(VcsUtil.getFilePath(wasFile2, true), VcsUtil.getFilePath(wasFile1, false)), Collections.<FilePath>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.<FilePath>singletonList(VcsUtil.getFilePath(was, true)), Collections.<FilePath>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");
plugins/svn4idea/testSource/org/jetbrains/idea/svn16/SvnCachingRevisionsTest.java
+4 -4
View File
@@ -220,7 +220,7 @@ public class SvnCachingRevisionsTest extends CodeInsightFixtureTestCase {
}
public void testJustLiveProvider() throws Exception {
performTest(11, 2, null, Collections.<Pair<Long, Long>>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.<Pair<Long, Long>>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.<Pair<Long, Long>>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.<Pair<Long, Long>>emptyList(), 15);
performTest(11, 2, new Pair<>(11L, 15L), Collections.emptyList(), 15);
}
public void testThreeByOne() throws Exception {
plugins/svn4idea/testSource/org/jetbrains/idea/svn16/SvnMergeInfoTest.java
+1 -1
View File
@@ -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.<WCInfoWithBranches.Branch>emptyList(), vcsRoot,
myWCInfoWithBranches = new WCInfoWithBranches(myWCInfo, Collections.emptyList(), vcsRoot,
new WCInfoWithBranches.Branch(repoUrl + "/trunk"));
myMergeChecker = new BranchInfo(myVcs, myWCInfoWithBranches, new WCInfoWithBranches.Branch(repoUrl + "/branch"));
}
plugins/svn4idea/testSource/org/jetbrains/idea/svn16/SvnRollbackTest.java
+13 -13
View File
@@ -77,7 +77,7 @@ public class SvnRollbackTest extends Svn17TestCase {
final Change change = myChangeListManager.getChange(a);
Assert.assertNotNull(change);
rollbackIMpl(Collections.singletonList(change), Collections.<Change>emptyList());
rollbackIMpl(Collections.singletonList(change), Collections.emptyList());
}
private void rollbackIMpl(List<Change> changes, final List<Change> 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.<Change>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.<Change>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.<Change>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.<Change>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.<Change>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.<Change>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.<Change>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.<Change>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.<FilePath>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.<FilePath>singletonList(VcsUtil.getFilePath(wasFile, true)), Collections.<FilePath>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.<FilePath>asList(VcsUtil.getFilePath(wasFile2, true), VcsUtil.getFilePath(wasFile1, false)), Collections.<FilePath>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.<FilePath>singletonList(VcsUtil.getFilePath(was, true)), Collections.<FilePath>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");