Search in sources :

Example 26 with SelectedResourcesProvider

use of com.oxygenxml.git.view.staging.ChangesPanel.SelectedResourcesProvider in project oxygen-git-client-addon by oxygenxml.

the class FlatView3Test method testDiscard.

/**
 * Discard changes. THose files must not appear in either stage/un-stage area.
 *
 * @throws Exception If it fails.
 */
public void testDiscard() throws Exception {
    /**
     * Local repository location.
     */
    String localTestRepository = "target/test-resources/testDiscard_NewFile_local";
    /**
     * Remote repository location.
     */
    String remoteTestRepository = "target/test-resources/testDiscard_NewFile_remote";
    new File(localTestRepository).mkdirs();
    File file = new File(localTestRepository + "/test.txt");
    file.createNewFile();
    setFileContent(file, "remote");
    // Create repositories
    Repository remoteRepo = createRepository(remoteTestRepository);
    Repository localRepo = createRepository(localTestRepository);
    // Bind the local repository to the remote one.
    bindLocalToRemote(localRepo, remoteRepo);
    // Add it to the index.
    add(new FileStatus(GitChangeType.UNKNOWN, "test.txt"));
    assertTableModels("", "ADD, test.txt");
    GitAccess.getInstance().commit("First version.");
    assertTableModels("", "");
    // Change the file.
    setFileContent(file, "index content");
    assertTableModels("MODIFIED, test.txt", "");
    add(new FileStatus(GitChangeType.MODIFIED, "test.txt"));
    assertTableModels("", "CHANGED, test.txt");
    // Change the file.
    setFileContent(file, "modified content");
    // The file is present in  both areas.
    assertTableModels("MODIFIED, test.txt", "CHANGED, test.txt");
    // Discard.
    DiscardAction discardAction = new DiscardAction(new SelectedResourcesProvider() {

        @Override
        public List<FileStatus> getOnlySelectedLeaves() {
            return null;
        }

        @Override
        public List<FileStatus> getAllSelectedResources() {
            return Arrays.asList(new FileStatus(GitChangeType.MODIFIED, "test.txt"));
        }
    }, stagingPanel.getGitController());
    discardAction.actionPerformed(null);
    waitForScheduler();
    assertTableModels("", "");
}
Also used : DiscardAction(com.oxygenxml.git.view.staging.actions.DiscardAction) Repository(org.eclipse.jgit.lib.Repository) FileStatus(com.oxygenxml.git.service.entities.FileStatus) SelectedResourcesProvider(com.oxygenxml.git.view.staging.ChangesPanel.SelectedResourcesProvider) List(java.util.List) File(java.io.File)

Example 27 with SelectedResourcesProvider

use of com.oxygenxml.git.view.staging.ChangesPanel.SelectedResourcesProvider in project oxygen-git-client-addon by oxygenxml.

the class BlameTest method testShowBlameFromStagingArea_askUserConfirmation.

/**
 * <p><b>Description:</b> Show blame from staging area. Ask save editor before blame if editor modified.</p>
 * <p><b>Bug ID:</b> EXM-45008</p>
 *
 * @author sorin_carbunaru
 *
 * @throws Exception
 */
@Test
public void testShowBlameFromStagingArea_askUserConfirmation() throws Exception {
    URL script = getClass().getClassLoader().getResource("scripts/blame_script.txt");
    File wcTree = new File("target/gen/BlameTest_testBlame");
    RepoGenerationScript.generateRepository(script, wcTree);
    try {
        GitAccess.getInstance().setRepositorySynchronously(wcTree.getAbsolutePath());
        String content = "Line 1\n" + "Line 2\n" + "Line 3\n" + "Line 4\n" + "Line 5";
        HashMap<Integer, int[]> line2offsets = computeLineMappings(content);
        // Mock plugin workspace
        StandalonePluginWorkspace pluginWSMock = Mockito.mock(StandalonePluginWorkspace.class);
        PluginWorkspaceProvider.setPluginWorkspace(pluginWSMock);
        // Mock "open()"
        Mockito.when(pluginWSMock.open(Mockito.any(), Mockito.any(), Mockito.any())).thenReturn(true);
        // Mock util access
        UtilAccess utilAcces = Mockito.mock(UtilAccess.class);
        Mockito.when(utilAcces.correctURL(Mockito.anyString())).thenReturn("");
        Mockito.when(pluginWSMock.getUtilAccess()).thenReturn(utilAcces);
        // Mock confirmation
        boolean[] confirmDialogShown = new boolean[1];
        Mockito.doAnswer(new Answer<Integer>() {

            @Override
            public Integer answer(InvocationOnMock invocation) throws Throwable {
                confirmDialogShown[0] = true;
                return 0;
            }
        }).when(pluginWSMock).showConfirmDialog(Mockito.anyString(), Mockito.anyString(), Mockito.any(), Mockito.any());
        // Mock editor and page
        boolean[] editorSaved = new boolean[1];
        WSEditor wsEditor = Mockito.mock(WSEditor.class);
        Mockito.when(wsEditor.isModified()).thenReturn(true);
        Mockito.when(pluginWSMock.getEditorAccess(Mockito.any(), Mockito.anyInt())).thenReturn(wsEditor);
        Mockito.doAnswer(new Answer<Void>() {

            @Override
            public Void answer(InvocationOnMock invocation) throws Throwable {
                editorSaved[0] = true;
                return null;
            }
        }).when(wsEditor).save();
        Mockito.doNothing().when(wsEditor).changePage(Mockito.anyString());
        WSXMLTextEditorPage page = Mockito.mock(WSXMLTextEditorPage.class);
        JTextArea textArea = new JTextArea();
        Mockito.when(page.getTextComponent()).thenReturn(textArea);
        Mockito.when(wsEditor.getCurrentPage()).thenReturn(page);
        // Methods for mapping lines to offsets and back.
        Mockito.when(page.getOffsetOfLineStart(Mockito.anyInt())).thenAnswer(new Answer<Integer>() {

            @Override
            public Integer answer(InvocationOnMock invocation) throws Throwable {
                Object key = invocation.getArguments()[0];
                return line2offsets.get(key)[0];
            }
        });
        Mockito.when(page.getOffsetOfLineEnd(Mockito.anyInt())).thenAnswer(new Answer<Integer>() {

            @Override
            public Integer answer(InvocationOnMock invocation) throws Throwable {
                return line2offsets.get(invocation.getArguments()[0])[1];
            }
        });
        Mockito.when(page.getLineOfOffset(Mockito.anyInt())).thenAnswer(new Answer<Integer>() {

            @Override
            public Integer answer(InvocationOnMock invocation) throws Throwable {
                int offset = (int) invocation.getArguments()[0];
                for (Integer line : line2offsets.keySet()) {
                    int[] is = line2offsets.get(line);
                    if (is[0] <= offset && offset < is[1]) {
                        return line;
                    }
                }
                return -1;
            }
        });
        // Intercept history view requests.
        final List<RevCommit> commits = new ArrayList<>();
        HistoryController historyController = Mockito.mock(HistoryController.class);
        Mockito.doAnswer(new Answer<Void>() {

            @Override
            public Void answer(InvocationOnMock invocation) throws Throwable {
                RevCommit rev = (RevCommit) invocation.getArguments()[1];
                commits.add(rev);
                return null;
            }
        }).when(historyController).showCommit(Mockito.anyString(), Mockito.any());
        Mockito.when(historyController.isHistoryShowing()).thenReturn(Boolean.TRUE);
        textArea.setText(content);
        flushAWT();
        // >>> Show blame <<<
        ShowBlameForUnstagedResourceAction showBlameAction = new ShowBlameForUnstagedResourceAction(historyController, new SelectedResourcesProvider() {

            @Override
            public List<FileStatus> getOnlySelectedLeaves() {
                return null;
            }

            @Override
            public List<FileStatus> getAllSelectedResources() {
                return Arrays.asList(new FileStatus(GitChangeType.MODIFIED, "file1.txt"));
            }
        });
        showBlameAction.actionPerformed(null);
        assertTrue(confirmDialogShown[0]);
        assertTrue(editorSaved[0]);
        Highlight[] highlights = textArea.getHighlighter().getHighlights();
        assertEquals(5, highlights.length);
        String expected = dumpOffsetMap(line2offsets);
        String actual = dumpHighlights(highlights);
        assertEquals(expected, actual);
    } finally {
        GitAccess.getInstance().closeRepo();
        FileUtils.deleteDirectory(wcTree);
    }
}
Also used : JTextArea(javax.swing.JTextArea) FileStatus(com.oxygenxml.git.service.entities.FileStatus) Highlight(javax.swing.text.Highlighter.Highlight) SelectedResourcesProvider(com.oxygenxml.git.view.staging.ChangesPanel.SelectedResourcesProvider) ArrayList(java.util.ArrayList) UtilAccess(ro.sync.exml.workspace.api.util.UtilAccess) URL(java.net.URL) HistoryController(com.oxygenxml.git.view.history.HistoryController) ArrayList(java.util.ArrayList) List(java.util.List) RevCommit(org.eclipse.jgit.revwalk.RevCommit) WSXMLTextEditorPage(ro.sync.exml.workspace.api.editor.page.text.xml.WSXMLTextEditorPage) ShowBlameForUnstagedResourceAction(com.oxygenxml.git.view.staging.actions.ShowBlameForUnstagedResourceAction) WSEditor(ro.sync.exml.workspace.api.editor.WSEditor) InvocationOnMock(org.mockito.invocation.InvocationOnMock) StandalonePluginWorkspace(ro.sync.exml.workspace.api.standalone.StandalonePluginWorkspace) File(java.io.File) Test(org.junit.Test)

Aggregations

SelectedResourcesProvider (com.oxygenxml.git.view.staging.ChangesPanel.SelectedResourcesProvider)27 List (java.util.List)27 FileStatus (com.oxygenxml.git.service.entities.FileStatus)26 ArrayList (java.util.ArrayList)22 GitResourceContextualMenu (com.oxygenxml.git.view.staging.GitResourceContextualMenu)21 File (java.io.File)6 Repository (org.eclipse.jgit.lib.Repository)6 DiscardAction (com.oxygenxml.git.view.staging.actions.DiscardAction)5 GitControllerBase (com.oxygenxml.git.service.GitControllerBase)3 GitAccess (com.oxygenxml.git.service.GitAccess)1 SubmoduleAccess (com.oxygenxml.git.service.SubmoduleAccess)1 HistoryController (com.oxygenxml.git.view.history.HistoryController)1 ShowBlameForUnstagedResourceAction (com.oxygenxml.git.view.staging.actions.ShowBlameForUnstagedResourceAction)1 URL (java.net.URL)1 JTextArea (javax.swing.JTextArea)1 Highlight (javax.swing.text.Highlighter.Highlight)1 RevCommit (org.eclipse.jgit.revwalk.RevCommit)1 Test (org.junit.Test)1 InvocationOnMock (org.mockito.invocation.InvocationOnMock)1 PrepareForTest (org.powermock.core.classloader.annotations.PrepareForTest)1