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

fix groovy compilation errors?

Browse Source
This commit is contained in:
peter
2012-04-16 17:30:27 +02:00
parent 963dd29aee
commit 125edc1572
2 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/git4idea/tests/git4idea/cherrypick/GitCherryPickTest.groovy
+3 -4
View File
@@ -27,17 +27,16 @@ import git4idea.history.browser.CherryPicker
import git4idea.history.browser.GitCommit
import git4idea.history.browser.SHAHash
import git4idea.history.wholeTree.AbstractHash
import git4idea.repo.GitRepository
import git4idea.test.GitFastTest
import git4idea.test.GitLightRepository
import git4idea.test.MockGit
import git4idea.test.MockVcsHelper
import sun.security.provider.SHA
import static git4idea.test.MockGit.OperationName.CHERRY_PICK
import static git4idea.test.MockGit.commitMessageForCherryPick
import static junit.framework.Assert.assertEquals
import static junit.framework.Assert.assertTrue
import static git4idea.test.MockGit.commitMessageForCherryPick
import git4idea.test.MockVcsHelper
/**
* Common parent for all tests on cherry-pick
@@ -103,7 +102,7 @@ hint: and commit the result with 'git commit'
}
void invokeCherryPick(List<GitCommit> commits) {
myCherryPicker.cherryPick(Collections.<GitRepository, List<GitCommit>> singletonMap(myRepository, commits))
myCherryPicker.cherryPick(Collections.singletonMap(myRepository, commits))
}
void assertHeadCommit(GitCommit commit) {
plugins/git4idea/tests/git4idea/test/MockGit.groovy
+7 -7
View File
@@ -40,11 +40,6 @@ class MockGit implements Git {
public static final GitCommandResult FAKE_SUCCESS_RESULT = new GitCommandResult(true, 0, Collections.emptyList(), Collections.emptyList())
private final Map<OperationName, Queue<OperationExecutor>> myExecutors = new HashMap<OperationName, Queue<OperationExecutor>>()
public static interface OperationExecutor {
GitCommandResult execute();
OperationName getName();
}
public enum OperationName {
CHERRY_PICK,
GET_UNMERGED_FILES;
@@ -201,7 +196,7 @@ class MockGit implements Git {
return null;
}
public static class SimpleErrorOperationExecutor implements MockGit.OperationExecutor {
public static class SimpleErrorOperationExecutor implements OperationExecutor {
String myOutput
MockGit.OperationName myOperationName
@@ -222,7 +217,7 @@ class MockGit implements Git {
}
}
public static class SimpleSuccessOperationExecutor implements MockGit.OperationExecutor {
public static class SimpleSuccessOperationExecutor implements OperationExecutor {
String myOutput
MockGit.OperationName myOperationName
@@ -274,3 +269,8 @@ class MockGit implements Git {
}
}
interface OperationExecutor {
GitCommandResult execute();
MockGit.OperationName getName();
}