diff options
Diffstat (limited to 'plugins/git4idea/tests/git4idea')
| -rw-r--r-- | plugins/git4idea/tests/git4idea/history/GitHistoryUtilsTest.java | 2 | ||||
| -rw-r--r-- | plugins/git4idea/tests/git4idea/log/GitRefManagerTest.java | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/plugins/git4idea/tests/git4idea/history/GitHistoryUtilsTest.java b/plugins/git4idea/tests/git4idea/history/GitHistoryUtilsTest.java index 29072ea53940..bdf87b265427 100644 --- a/plugins/git4idea/tests/git4idea/history/GitHistoryUtilsTest.java +++ b/plugins/git4idea/tests/git4idea/history/GitHistoryUtilsTest.java @@ -38,9 +38,9 @@ import java.io.File; import java.io.IOException; import java.util.*; +import static com.intellij.dvcs.DvcsUtil.getShortHash; import static com.intellij.openapi.vcs.Executor.overwrite; import static com.intellij.openapi.vcs.Executor.touch; -import static git4idea.GitUtil.getShortHash; import static git4idea.test.GitExecutor.*; import static git4idea.test.GitTestUtil.USER_EMAIL; import static git4idea.test.GitTestUtil.USER_NAME; diff --git a/plugins/git4idea/tests/git4idea/log/GitRefManagerTest.java b/plugins/git4idea/tests/git4idea/log/GitRefManagerTest.java index 14d88315c596..2ce560800066 100644 --- a/plugins/git4idea/tests/git4idea/log/GitRefManagerTest.java +++ b/plugins/git4idea/tests/git4idea/log/GitRefManagerTest.java @@ -3,6 +3,7 @@ package git4idea.log; import com.intellij.mock.MockVirtualFile; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Condition; +import com.intellij.openapi.vcs.AbstractVcs; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.testFramework.UsefulTestCase; import com.intellij.util.Function; @@ -285,6 +286,12 @@ public class GitRefManagerTest extends UsefulTestCase { @Nullable @Override + public AbstractVcs getVcs() { + return null; + } + + @Nullable + @Override public String getCurrentRevision() { throw new UnsupportedOperationException(); } |