diff options
Diffstat (limited to 'plugins/git4idea/tests/git4idea')
5 files changed, 468 insertions, 66 deletions
diff --git a/plugins/git4idea/tests/git4idea/repo/GitRepositoryReaderTest.java b/plugins/git4idea/tests/git4idea/repo/GitRepositoryReaderTest.java index b8bce9b7ee82..7c233195a7f2 100644 --- a/plugins/git4idea/tests/git4idea/repo/GitRepositoryReaderTest.java +++ b/plugins/git4idea/tests/git4idea/repo/GitRepositoryReaderTest.java @@ -54,7 +54,7 @@ public class GitRepositoryReaderTest extends GitPlatformTest { }); } - @SuppressWarnings({"JUnitTestCaseWithNonTrivialConstructors", "UnusedParameters"}) + @SuppressWarnings({"UnusedParameters"}) public GitRepositoryReaderTest(@NotNull String name, @NotNull File testDir) { myTestCaseDir = testDir; } diff --git a/plugins/git4idea/tests/git4idea/test/GitPlatformTest.java b/plugins/git4idea/tests/git4idea/test/GitPlatformTest.java index c02ec553dd8f..b433a5b8a0bf 100644 --- a/plugins/git4idea/tests/git4idea/test/GitPlatformTest.java +++ b/plugins/git4idea/tests/git4idea/test/GitPlatformTest.java @@ -30,6 +30,7 @@ import com.intellij.testFramework.UsefulTestCase; import com.intellij.testFramework.fixtures.IdeaProjectTestFixture; import com.intellij.testFramework.fixtures.IdeaTestFixtureFactory; import com.intellij.testFramework.vcs.AbstractVcsTestCase; +import com.intellij.util.ArrayUtil; import com.intellij.util.ObjectUtils; import git4idea.DialogManager; import git4idea.GitPlatformFacade; @@ -43,6 +44,7 @@ import git4idea.repo.GitRepositoryManager; import org.jetbrains.annotations.NotNull; import java.io.IOException; +import java.util.*; public abstract class GitPlatformTest extends UsefulTestCase { @@ -157,13 +159,20 @@ public abstract class GitPlatformTest extends UsefulTestCase { } private void enableDebugLogging() { - TestLoggerFactory.enableDebugLogging(myTestRootDisposable, "#" + Executor.class.getName(), - "#" + GitHandler.class.getName(), - GitHandler.class.getName()); + List<String> commonCategories = new ArrayList<String>(Arrays.asList("#" + Executor.class.getName(), + "#" + GitHandler.class.getName(), + GitHandler.class.getName())); + commonCategories.addAll(getDebugLogCategories()); + TestLoggerFactory.enableDebugLogging(myTestRootDisposable, ArrayUtil.toStringArray(commonCategories)); myTestStartedIndicator = createTestStartedIndicator(); LOG.info(myTestStartedIndicator); } + @NotNull + protected Collection<String> getDebugLogCategories() { + return Collections.emptyList(); + } + @Override protected void defaultRunBare() throws Throwable { try { diff --git a/plugins/git4idea/tests/git4idea/test/MockVcsHelper.java b/plugins/git4idea/tests/git4idea/test/MockVcsHelper.java new file mode 100644 index 000000000000..45f1e3965bea --- /dev/null +++ b/plugins/git4idea/tests/git4idea/test/MockVcsHelper.java @@ -0,0 +1,225 @@ +/* + * Copyright 2000-2014 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package git4idea.test; + +import com.intellij.ide.errorTreeView.HotfixData; +import com.intellij.openapi.project.Project; +import com.intellij.openapi.vcs.*; +import com.intellij.openapi.vcs.annotate.AnnotationProvider; +import com.intellij.openapi.vcs.annotate.FileAnnotation; +import com.intellij.openapi.vcs.changes.Change; +import com.intellij.openapi.vcs.changes.CommitResultHandler; +import com.intellij.openapi.vcs.changes.LocalChangeList; +import com.intellij.openapi.vcs.history.VcsFileRevision; +import com.intellij.openapi.vcs.history.VcsHistoryProvider; +import com.intellij.openapi.vcs.merge.MergeDialogCustomizer; +import com.intellij.openapi.vcs.merge.MergeProvider; +import com.intellij.openapi.vcs.versionBrowser.ChangeBrowserSettings; +import com.intellij.openapi.vcs.versionBrowser.CommittedChangeList; +import com.intellij.openapi.vfs.VirtualFile; +import org.jetbrains.annotations.Nls; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +import java.awt.*; +import java.io.File; +import java.util.Collection; +import java.util.Collections; +import java.util.List; +import java.util.Map; + +public class MockVcsHelper extends AbstractVcsHelper { + private volatile boolean myCommitDialogShown; + private volatile boolean myMergeDialogShown; + + private CommitHandler myCommitHandler; + private MergeHandler myMergeHandler; + + public MockVcsHelper(@NotNull Project project) { + super(project); + } + + @Override + public void showErrors(List<VcsException> abstractVcsExceptions, @NotNull String tabDisplayName) { + throw new UnsupportedOperationException(); + } + + @Override + public void showErrors(Map<HotfixData, List<VcsException>> exceptionGroups, @NotNull String tabDisplayName) { + throw new UnsupportedOperationException(); + } + + @Override + public List<VcsException> runTransactionRunnable(AbstractVcs vcs, TransactionRunnable runnable, Object vcsParameters) { + throw new UnsupportedOperationException(); + } + + @Override + public void showAnnotation(FileAnnotation annotation, VirtualFile file, AbstractVcs vcs) { + throw new UnsupportedOperationException(); + } + + @Override + public void showDifferences(VcsFileRevision cvsVersionOn, VcsFileRevision cvsVersionOn1, File file) { + throw new UnsupportedOperationException(); + } + + @Override + public void showChangesListBrowser(CommittedChangeList changelist, @Nls String title) { + throw new UnsupportedOperationException(); + } + + @Override + public void showChangesBrowser(List<CommittedChangeList> changelists) { + throw new UnsupportedOperationException(); + } + + @Override + public void showChangesBrowser(List<CommittedChangeList> changelists, @Nls String title) { + throw new UnsupportedOperationException(); + } + + @Override + public void showChangesBrowser(CommittedChangesProvider provider, + RepositoryLocation location, + @Nls String title, + @Nullable Component parent) { + throw new UnsupportedOperationException(); + } + + @Override + public void showWhatDiffersBrowser(@Nullable Component parent, Collection<Change> changes, @Nls String title) { + throw new UnsupportedOperationException(); + } + + @Override + public <T extends CommittedChangeList, U extends ChangeBrowserSettings> T chooseCommittedChangeList(@NotNull CommittedChangesProvider<T, U> provider, + RepositoryLocation location) { + throw new UnsupportedOperationException(); + } + + @Override + public void openCommittedChangesTab(AbstractVcs vcs, VirtualFile root, ChangeBrowserSettings settings, int maxCount, String title) { + throw new UnsupportedOperationException(); + } + + @Override + public void openCommittedChangesTab(CommittedChangesProvider provider, + RepositoryLocation location, + ChangeBrowserSettings settings, + int maxCount, + String title) { + throw new UnsupportedOperationException(); + } + + @NotNull + @Override + public List<VirtualFile> showMergeDialog(List<VirtualFile> files, + MergeProvider provider, + @NotNull MergeDialogCustomizer mergeDialogCustomizer) { + myMergeDialogShown = true; + if (myMergeHandler != null) { + myMergeHandler.showMergeDialog(); + } + return Collections.emptyList(); + } + + public boolean mergeDialogWasShown() { + return myMergeDialogShown; + } + + @Override + public void showFileHistory(VcsHistoryProvider vcsHistoryProvider, FilePath path, AbstractVcs vcs, String repositoryPath) { + throw new UnsupportedOperationException(); + } + + @Override + public void showFileHistory(VcsHistoryProvider vcsHistoryProvider, + AnnotationProvider annotationProvider, + FilePath path, + String repositoryPath, + AbstractVcs vcs) { + throw new UnsupportedOperationException(); + } + + @Override + public void showRollbackChangesDialog(List<Change> changes) { + throw new UnsupportedOperationException(); + } + + @Override + public Collection<VirtualFile> selectFilesToProcess(List<VirtualFile> files, + String title, + @Nullable String prompt, + String singleFileTitle, + String singleFilePromptTemplate, + VcsShowConfirmationOption confirmationOption) { + throw new UnsupportedOperationException(); + } + + @Override + public Collection<FilePath> selectFilePathsToProcess(List<FilePath> files, + String title, + @Nullable String prompt, + String singleFileTitle, + String singleFilePromptTemplate, + VcsShowConfirmationOption confirmationOption) { + throw new UnsupportedOperationException(); + } + + @Override + public boolean commitChanges(@NotNull Collection<Change> changes, @NotNull LocalChangeList initialChangeList, + @NotNull String commitMessage, @Nullable CommitResultHandler customResultHandler) { + myCommitDialogShown = true; + if (myCommitHandler != null) { + boolean success = myCommitHandler.commit(commitMessage); + if (customResultHandler != null) { + if (success) { + customResultHandler.onSuccess(commitMessage); + } + else { + customResultHandler.onFailure(); + } + } + return success; + } + if (customResultHandler != null) { + customResultHandler.onFailure(); + } + return false; + } + + public void registerHandler(CommitHandler handler) { + myCommitHandler = handler; + } + + public void registerHandler(MergeHandler handler) { + myMergeHandler = handler; + } + + public boolean commitDialogWasShown() { + return myCommitDialogShown; + } + + public interface CommitHandler { + boolean commit(String commitMessage); + } + + public interface MergeHandler { + void showMergeDialog(); + } + +} diff --git a/plugins/git4idea/tests/git4idea/test/MockVirtualFile.java b/plugins/git4idea/tests/git4idea/test/MockVirtualFile.java new file mode 100644 index 000000000000..e3f0a3afe071 --- /dev/null +++ b/plugins/git4idea/tests/git4idea/test/MockVirtualFile.java @@ -0,0 +1,162 @@ +/* + * Copyright 2000-2014 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package git4idea.test; + +import com.intellij.mock.MockVirtualFileSystem; +import com.intellij.openapi.fileTypes.FileType; +import com.intellij.openapi.fileTypes.FileTypes; +import com.intellij.openapi.util.io.FileUtil; +import com.intellij.openapi.vfs.VirtualFile; +import com.intellij.openapi.vfs.VirtualFileSystem; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +import java.io.File; +import java.io.InputStream; +import java.io.OutputStream; + +/** + * VirtualFile implementation for tests based on {@link java.io.File}. + * Not reusing {@link com.intellij.mock.MockVirtualFile}, because the latter holds everything in memory, which is fast, but requires + * synchronization with the real file system. + */ +public class MockVirtualFile extends VirtualFile { + + private static final VirtualFileSystem ourFileSystem = new MockVirtualFileSystem(); + + private final String myPath; + + public MockVirtualFile(@NotNull String path) { + myPath = FileUtil.toSystemIndependentName(path); + } + + @NotNull + @Override + public String getName() { + return new File(myPath).getName(); + } + + @NotNull + @Override + public VirtualFileSystem getFileSystem() { + return ourFileSystem; + } + + @NotNull + @Override + public String getPath() { + return myPath; + } + + @Override + public boolean isWritable() { + throw new UnsupportedOperationException(); + } + + @Override + public boolean isDirectory() { + return new File(myPath).isDirectory(); + } + + @Override + public boolean isValid() { + return new File(myPath).exists(); + } + + @Override + @Nullable + public VirtualFile getParent() { + File parentFile = FileUtil.getParentFile(new File(myPath)); + return parentFile != null ? new MockVirtualFile(parentFile.getPath()) : null; + } + + @Override + public VirtualFile[] getChildren() { + String[] list = new File(myPath).list(); + if (list == null) { + return EMPTY_ARRAY; + } + VirtualFile[] files = new VirtualFile[list.length]; + for (int i = 0; i < list.length; i++) { + files[i] = new MockVirtualFile(myPath + "/" + list[i]); + } + return files; + } + + @NotNull + @Override + public OutputStream getOutputStream(Object requestor, long newModificationStamp, long newTimeStamp) { + throw new UnsupportedOperationException(); + } + + @NotNull + @Override + public byte[] contentsToByteArray() { + throw new UnsupportedOperationException(); + } + + @Override + public long getTimeStamp() { + throw new UnsupportedOperationException(); + } + + @Override + public long getLength() { + throw new UnsupportedOperationException(); + } + + @Override + public void refresh(boolean asynchronous, boolean recursive, Runnable postRunnable) { + } + + @Override + public InputStream getInputStream() { + throw new UnsupportedOperationException(); + } + + @Override + public String toString() { + return myPath; + } + + @NotNull + @Override + public String getUrl() { + return myPath; + } + + @NotNull + @Override + public FileType getFileType() { + return FileTypes.PLAIN_TEXT; + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + + MockVirtualFile file = (MockVirtualFile)o; + + return myPath.equals(file.myPath); + } + + @Override + public int hashCode() { + return myPath.hashCode(); + } + +} diff --git a/plugins/git4idea/tests/git4idea/validators/GitRefNameValidatorTest.java b/plugins/git4idea/tests/git4idea/validators/GitRefNameValidatorTest.java index 1b4908f3a41e..c7da36abec88 100644 --- a/plugins/git4idea/tests/git4idea/validators/GitRefNameValidatorTest.java +++ b/plugins/git4idea/tests/git4idea/validators/GitRefNameValidatorTest.java @@ -16,8 +16,12 @@ package git4idea.validators; import com.intellij.util.Function; -import org.testng.annotations.DataProvider; -import org.testng.annotations.Test; +import com.intellij.util.containers.ContainerUtil; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.Parameterized; + +import java.util.Collection; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; @@ -26,52 +30,16 @@ import static org.testng.Assert.assertTrue; * The test for {@link GitRefNameValidator}. * Tests are based on the <a href="http://www.kernel.org/pub/software/scm/git/docs/git-check-ref-format.html"> * specification of valid Git references</a> - * - * @author Kirill Likhodedov */ +@RunWith(Parameterized.class) public class GitRefNameValidatorTest { - - @DataProvider(name = "valid") - public Object[][] createValidData() { - return new Object[][] { - { "WORD", "branch" }, - { "UNDERSCORED_WORD", "new_branch" }, - { "HIERARCHY", "user/branch" }, - { "HIERARCHY_2", "user/branch/sub_branch" }, - { "BEGINS_WITH_SLASH", "/branch" }, // actual branch name will be with trimmed slash - { "NON_CONS_DOTS", "complex.branch.name" } - }; - } - - @DataProvider(name = "simple_invalid") - public Object[][] createInvalidData() { - return new Object[][] { - { "BEGIN_WITH_DOT", ".branch" }, - { "ONLY_DOT", "." }, - { "ENDS_WITH_SLASH", "branch/" }, - { "ENDS_WITH_DOT", "branch." }, - { "ENDS_WITH_LOCK", "branch.lock" }, - { "TWO_DOTS_1", "branch..name" }, - { "TWO_DOTS_2", "..name" }, - { "TWO_DOTS_3", "..branch" } - }; - } private static final String[] ILLEGAL_CHARS = { " ", "~", "^", ":", "?", "*", "[", "@{", "\\" }; - - @DataProvider(name = "invalid_chars") - public Object[][] createInvalidCharsData() { - return populateWithIllegalChars(ILLEGAL_CHARS, new Function<String, String>() { - @Override public String fun(String s) { - return s; - } - }); - } - - private static final int CONTROL_CHARS_START = 5; // we can't test from 0 to 4 via @DataProvider due to TestNG limitations + private static final int CONTROL_CHARS_START = 0; private static final int CONTROL_CHARS_END = 31; private static final int CONTROL_CHARS_SIZE = CONTROL_CHARS_END - CONTROL_CHARS_START + 1; private static final String[] CONTROL_CHARS = new String[CONTROL_CHARS_SIZE + 1]; // + DEL + static { for (int i = CONTROL_CHARS_START; i <= CONTROL_CHARS_END; i++) { CONTROL_CHARS[i-CONTROL_CHARS_START] = String.valueOf((char)i); @@ -79,8 +47,42 @@ public class GitRefNameValidatorTest { CONTROL_CHARS[CONTROL_CHARS_SIZE] = "\u007F"; // DEL } - @DataProvider(name = "invalid_control_chars") - public Object[][] createInvalidControlCharsData() { + private final String myRefNameToTest; + private final boolean myIsExpectedValid; + + private static Object[][] createValidData() { + return new Object[][] { + { "WORD", "branch" }, + { "UNDERSCORED_WORD", "new_branch" }, + { "HIERARCHY", "user/branch" }, + { "HIERARCHY_2", "user/branch/sub_branch" }, + { "BEGINS_WITH_SLASH", "/branch" }, // actual branch name will be with trimmed slash + { "NON_CONS_DOTS", "complex.branch.name" } + }; + } + + private static Object[][] createInvalidData() { + return new Object[][] { + { "BEGIN_WITH_DOT", ".branch" }, + { "ONLY_DOT", "." }, + { "ENDS_WITH_SLASH", "branch/" }, + { "ENDS_WITH_DOT", "branch." }, + { "ENDS_WITH_LOCK", "branch.lock" }, + { "TWO_DOTS_1", "branch..name" }, + { "TWO_DOTS_2", "..name" }, + { "TWO_DOTS_3", "..branch" } + }; + } + + public static Object[][] createInvalidCharsData() { + return populateWithIllegalChars(ILLEGAL_CHARS, new Function<String, String>() { + @Override public String fun(String s) { + return s; + } + }); + } + + public static Object[][] createInvalidControlCharsData() { return populateWithIllegalChars(CONTROL_CHARS, new Function<String, String>() { @Override public String fun(String s) { Character c = s.charAt(0); @@ -99,34 +101,38 @@ public class GitRefNameValidatorTest { return data; } - @Test(dataProvider = "valid") - public void testValid(String testName, String branchName) { - assertValid(branchName); + @Parameterized.Parameters(name = "{0}") + public static Collection<Object[]> data() { + Collection<Object[]> data = ContainerUtil.newArrayList(); + populateData(data, createValidData(), true); + populateData(data, createInvalidData(), false); + populateData(data, createInvalidCharsData(), false); + populateData(data, createInvalidControlCharsData(), false); + return data; } - @Test(dataProvider = "simple_invalid") - public void testSimpleInvalid(String testName, String branchName) { - assertInvalid(branchName); + private static void populateData(Collection<Object[]> data, Object[][] source, boolean valid) { + for (Object[] testCase : source) { + data.add(new Object[] {testCase[0], testCase[1], valid}); + } } - @Test(dataProvider = "invalid_chars") - public void testInvalidChars(String testName, String branchName) { - assertInvalid(branchName); + @SuppressWarnings("UnusedParameters") + public GitRefNameValidatorTest(String name, String refNameToTest, boolean valid) { + myRefNameToTest = refNameToTest; + myIsExpectedValid = valid; } - @Test(dataProvider = "invalid_control_chars") - public void control_chars_are_invalid(String testName, String branchName) { - assertInvalid(branchName); - } - - // \u0000 to \u0004 can't be passed to the TestNG DataProvider - see org.testng.remote.strprotocol.MessageHelper @Test - public void control_chars_from_0_to_4_are_invalid() { - for (int i = 0; i < 5; i++) { - assertInvalid("bra" + (char)i + "nch"); + public void testAll() { + if (myIsExpectedValid) { + assertValid(myRefNameToTest); + } + else { + assertInvalid(myRefNameToTest); } } - + private static void assertValid(String branchName) { assertTrue(GitRefNameValidator.getInstance().checkInput(branchName), "Should be valid"); assertTrue(GitRefNameValidator.getInstance().canClose(branchName), "Should be valid"); |