Examples with GitController com.oxygenxml.git.view.event.GitController used on opensource projects

Example 6 with GitController

use of com.oxygenxml.git.view.event.GitController in project oxygen-git-client-addon by oxygenxml.

the class FlatView2Test method testShowInterruptedRebaseDlg_thenAbort.

/**
 * <p><b>Description:</b> Show interrupted rebase dialog and abort.</p>
 * <p><b>Bug ID:</b> EXM-42025</p>
 *
 * @author sorin_carbunaru
 *
 * @throws Exception If it fails.
 */
@Test
public void testShowInterruptedRebaseDlg_thenAbort() throws Exception {
    String localTestRepository_1 = "target/test-resources/testShowInterruptedRebaseDlg_thenAbort-local-1";
    String localTestRepository_2 = "target/test-resources/testShowInterruptedRebaseDlg_thenAbort-local-2";
    String remoteTestRepository = "target/test-resources/testShowInterruptedRebaseDlg_thenAbort-remote";
    // Create and repositories
    Repository remoteRepo = createRepository(remoteTestRepository);
    Repository localRepo_1 = createRepository(localTestRepository_1);
    Repository localRepo_2 = createRepository(localTestRepository_2);
    bindLocalToRemote(localRepo_1, remoteRepo);
    bindLocalToRemote(localRepo_2, remoteRepo);
    new File(localTestRepository_1).mkdirs();
    new File(localTestRepository_2).mkdirs();
    // --------------  REPO 1
    GitAccess.getInstance().setRepositorySynchronously(localTestRepository_1);
    File firstRepoFile = new File(localTestRepository_1 + "/test.txt");
    firstRepoFile.createNewFile();
    setFileContent(firstRepoFile, "First version");
    GitAccess.getInstance().add(new FileStatus(GitChangeType.UNKNOWN, "test.txt"));
    GitAccess.getInstance().commit("First commit.");
    push("", "");
    // ----------------- REPO 2
    GitAccess.getInstance().setRepositorySynchronously(localTestRepository_2);
    File secondRepoFile = new File(localTestRepository_2 + "/test.txt");
    refreshSupport.call();
    waitForScheduler();
    assertFalse(secondRepoFile.exists());
    pull("", "", PullType.REBASE, false);
    assertTrue(secondRepoFile.exists());
    // Modify file and commit and push
    setFileContent(secondRepoFile, "Second versions");
    GitAccess.getInstance().add(new FileStatus(GitChangeType.MODIFIED, "test.txt"));
    GitAccess.getInstance().commit("Second commit.");
    push("", "");
    // --------------  REPO 1
    GitAccess.getInstance().setRepositorySynchronously(localTestRepository_1);
    setFileContent(firstRepoFile, "Third version");
    GitAccess.getInstance().add(new FileStatus(GitChangeType.MODIFIED, "test.txt"));
    GitAccess.getInstance().commit("Third commit.");
    // Now pull to generate conflict
    ConflictButtonsPanel rebasePanel = stagingPanel.getConflictButtonsPanel();
    assertFalse(rebasePanel.isShowing());
    flushAWT();
    PullResponse pullResponse = pull("", "", PullType.REBASE, false);
    refreshSupport.call();
    waitForScheduler();
    assertEquals(PullStatus.CONFLICTS, pullResponse.getStatus());
    assertTrue(rebasePanel.isShowing());
    Semaphore s = new Semaphore(0);
    GitController ppc = new GitController() {

        @Override
        protected void showRebaseInProgressDialog() {
            s.release();
            super.showRebaseInProgressDialog();
        }
    };
    ppc.pull(PullType.REBASE);
    s.acquire();
    flushAWT();
    JDialog interruptedRebaseDlg = findDialog(Tags.REBASE_IN_PROGRESS);
    assertNotNull(interruptedRebaseDlg);
    JButton abortBtn = findFirstButton(interruptedRebaseDlg.getRootPane(), Translator.getInstance().getTranslation(Tags.ABORT_REBASE));
    abortBtn.doClick();
    waitForScheduler();
    flushAWT();
    interruptedRebaseDlg = findDialog(Tags.REBASE_IN_PROGRESS);
    assertNull(interruptedRebaseDlg);
    assertFalse(rebasePanel.isShowing());
    assertTableModels(// Unstaged
    "", // Staged
    "");
}

Example 7 with GitController

use of com.oxygenxml.git.view.event.GitController in project oxygen-git-client-addon by oxygenxml.

the class RemoteVisualTests method testTrackRemoteBranch.

/**
 * <p><b>Description:</b> Tests the "Track remote branch" action from remote button of git staging toolbar.</p>
 * <p><b>Bug ID:</b> EXM-40858</p>
 *
 * @author Alex_Smarandache
 *
 * @throws Exception
 */
public void testTrackRemoteBranch() throws Exception {
    final String remoteRepo2Branch = "branch_remote_repo_2";
    final String remote2 = "remote2_name";
    // Creates the remote repository.
    createRepository(REMOTE_REPO2);
    Repository remoteRepository = gitAccess.getRepository();
    addRemote(localRepository, remoteRepository, remote2);
    gitAccess.createBranch(remoteRepo2Branch);
    File file = new File(REMOTE_REPO2, "remote2.txt");
    file.createNewFile();
    setFileContent(file, "remote2content");
    gitAccess.add(new FileStatus(GitChangeType.ADD, "remote2.txt"));
    gitAccess.commit("First remote2 commit.");
    // Make the first commit for the local repository
    file = new File(LOCAL_REPO, "local.txt");
    file.createNewFile();
    setFileContent(file, "local content");
    gitAccess.add(new FileStatus(GitChangeType.ADD, "local.txt"));
    gitAccess.commit("First local commit.");
    // Make the first commit for the remote repository and create a branch for it.
    gitAccess.setRepositorySynchronously(REMOTE_REPO);
    file = new File(REMOTE_REPO, "remote1.txt");
    file.createNewFile();
    setFileContent(file, "remote content");
    gitAccess.add(new FileStatus(GitChangeType.ADD, "remote1.txt"));
    gitAccess.commit("First remote commit.");
    // Switch back to local repo and create local branch
    gitAccess.setRepositorySynchronously(LOCAL_REPO);
    gitAccess.createBranch(LOCAL_BRANCH);
    gitAccess.fetch();
    JFrame frame = new JFrame();
    try {
        // Init UI
        GitController gitCtrl = new GitController();
        GitActionsManager gitActionsManager = new GitActionsManager(gitCtrl, null, null, refreshSupport);
        stagingPanel = new StagingPanel(refreshSupport, gitCtrl, null, gitActionsManager);
        frame.getContentPane().add(stagingPanel);
        frame.pack();
        frame.setVisible(true);
        flushAWT();
        refreshSupport.call();
        flushAWT();
        SwingUtilities.invokeLater(() -> gitActionsManager.getTrackRemoteBranchAction().actionPerformed(null));
        flushAWT();
        CurrentBranchRemotesDialog[] trackRemoteDialog = new CurrentBranchRemotesDialog[1];
        trackRemoteDialog[0] = (CurrentBranchRemotesDialog) findDialog(Tags.CONFIGURE_REMOTE_FOR_BRANCH);
        assertNotNull(trackRemoteDialog);
        flushAWT();
        JComboBox<RemoteBranchItem> remoteBranches = trackRemoteDialog[0].getRemoteBranchItems();
        assertNotNull(remoteBranches);
        assertEquals(2, remoteBranches.getItemCount());
        assertEquals("origin", gitAccess.getRemoteFromCurrentBranch());
        RemoteBranchItem currentSelected = (RemoteBranchItem) remoteBranches.getSelectedItem();
        assertEquals("origin/main", currentSelected.toString());
        remoteBranches.setSelectedIndex(1);
        currentSelected = (RemoteBranchItem) remoteBranches.getSelectedItem();
        assertEquals("remote2_name/main", currentSelected.toString());
        flushAWT();
        sleep(500);
        SwingUtilities.invokeLater(() -> trackRemoteDialog[0].getOkButton().doClick());
        // Test if the config file is updated after user confirmation.
        SwingUtilities.invokeLater(() -> gitActionsManager.getTrackRemoteBranchAction().actionPerformed(null));
        flushAWT();
        trackRemoteDialog[0] = (CurrentBranchRemotesDialog) findDialog(Tags.CONFIGURE_REMOTE_FOR_BRANCH);
        assertNotNull(trackRemoteDialog);
        flushAWT();
        remoteBranches = trackRemoteDialog[0].getRemoteBranchItems();
        assertNotNull(remoteBranches);
        assertEquals(remote2, gitAccess.getRemoteFromCurrentBranch());
        currentSelected = (RemoteBranchItem) remoteBranches.getSelectedItem();
        assertEquals("remote2_name/main", currentSelected.toString());
    } finally {
        frame.setVisible(false);
        frame.dispose();
    }
}

Example 8 with GitController

use of com.oxygenxml.git.view.event.GitController in project oxygen-git-client-addon by oxygenxml.

the class StashVisualTests method testListStashDeleteAction.

/**
 * <p><b>Description:</b> Tests the "List stashes" delete action</p>
 * <p><b>Bug ID:</b> EXM-45983</p>
 *
 * @author Alex_Smarandache
 *
 * @throws Exception
 */
public void testListStashDeleteAction() throws Exception {
    // Make the first commit for the local repository
    File file = new File(LOCAL_REPO, "local.txt");
    file.createNewFile();
    setFileContent(file, "local content");
    gitAccess.add(new FileStatus(GitChangeType.ADD, "local.txt"));
    gitAccess.commit("First local commit.");
    // Make the first commit for the remote repository
    gitAccess.setRepositorySynchronously(REMOTE_REPO);
    file = new File(REMOTE_REPO, "remote1.txt");
    file.createNewFile();
    setFileContent(file, "remote content");
    gitAccess.add(new FileStatus(GitChangeType.ADD, "remote1.txt"));
    gitAccess.commit("First remote commit.");
    // Switch back to local repo and create local branch
    gitAccess.setRepositorySynchronously(LOCAL_REPO);
    gitAccess.createBranch(LOCAL_BRANCH);
    gitAccess.fetch();
    JFrame frame = new JFrame();
    try {
        // Init UI
        GitController gitCtrl = new GitController();
        GitActionsManager gitActionsManager = new GitActionsManager(gitCtrl, null, null, refreshSupport);
        stagingPanel = new StagingPanel(refreshSupport, gitCtrl, null, gitActionsManager);
        ToolbarPanel toolbarPanel = stagingPanel.getToolbarPanel();
        frame.getContentPane().add(stagingPanel);
        frame.pack();
        frame.setVisible(true);
        flushAWT();
        toolbarPanel.updateButtonsStates();
        refreshSupport.call();
        flushAWT();
        SplitMenuButton stashButton = toolbarPanel.getStashButton();
        initStashes(toolbarPanel);
        List<RevCommit> stashes = new ArrayList<>(gitAccess.listStashes());
        assertEquals(3, stashes.size());
        JMenuItem[] listStashesItem = new JMenuItem[1];
        listStashesItem[0] = stashButton.getItem(1);
        SwingUtilities.invokeLater(() -> listStashesItem[0].getAction().actionPerformed(null));
        ListStashesDialog listStashesDialog = (ListStashesDialog) findDialog(Tags.STASHES);
        assertNotNull(listStashesDialog);
        assertEquals(3, listStashesDialog.getStashesTable().getModel().getRowCount());
        JButton[] deleteSelectedStashButton = new JButton[1];
        flushAWT();
        deleteSelectedStashButton[0] = findFirstButton(listStashesDialog, Tags.DELETE);
        assertNotNull(deleteSelectedStashButton);
        SwingUtilities.invokeLater(() -> deleteSelectedStashButton[0].doClick());
        flushAWT();
        // Test the no button.
        JDialog deleteSelectedStashDialog = findDialog(Tags.DELETE_STASH);
        assertNotNull(deleteSelectedStashDialog);
        JButton[] noButton = new JButton[1];
        flushAWT();
        noButton[0] = findFirstButton(deleteSelectedStashDialog, Tags.NO);
        assertNotNull(noButton[0]);
        SwingUtilities.invokeLater(() -> noButton[0].doClick());
        flushAWT();
        stashes = new ArrayList<>(gitAccess.listStashes());
        assertEquals(3, stashes.size());
        listStashesItem[0] = stashButton.getItem(1);
        SwingUtilities.invokeLater(() -> listStashesItem[0].getAction().actionPerformed(null));
        // Test the yes button.
        String[] stashesMessages = { "Stash1", "Stash0" };
        // Delete all stashes one by one
        for (int i = 0; i < 3; i++) {
            flushAWT();
            deleteSelectedStashButton[0] = findFirstButton(listStashesDialog, Tags.DELETE);
            assertNotNull(deleteSelectedStashButton);
            SwingUtilities.invokeLater(() -> deleteSelectedStashButton[0].doClick());
            flushAWT();
            deleteSelectedStashDialog = findDialog(Tags.DELETE_STASH);
            assertNotNull(deleteSelectedStashDialog);
            flushAWT();
            JButton yesButton = findFirstButton(deleteSelectedStashDialog, Tags.YES);
            assertNotNull(yesButton);
            SwingUtilities.invokeLater(yesButton::doClick);
            flushAWT();
            stashes = new ArrayList<>(gitAccess.listStashes());
            assertEquals(3 - i - 1, stashes.size());
            assertEquals(3 - i - 1, listStashesDialog.getStashesTable().getRowCount());
            int stashIndex = 0;
            for (int j = i + 1; j < 3; j++) {
                assertEquals(stashesMessages[i + stashIndex], stashes.get(stashIndex).getFullMessage());
                assertEquals(stashesMessages[i + stashIndex], listStashesDialog.getStashesTable().getValueAt(stashIndex++, 1));
            }
        }
        flushAWT();
        JButton cancelButton = findFirstButton(listStashesDialog, Tags.CLOSE);
        assertNotNull(cancelButton);
        cancelButton.doClick();
    } finally {
        frame.setVisible(false);
        frame.dispose();
    }
}

Example 9 with GitController

use of com.oxygenxml.git.view.event.GitController in project oxygen-git-client-addon by oxygenxml.

the class StashVisualTests method testListStashApplyAndPopAction.

/**
 * <p><b>Description:</b> Tests the "List stashes" apply and pop actions</p>
 * <p><b>Bug ID:</b> EXM-45983</p>
 *
 * @author Alex_Smarandache
 *
 * @throws Exception
 */
public void testListStashApplyAndPopAction() throws Exception {
    // Init UI
    JFrame frame = new JFrame();
    GitController gitCtrl = new GitController();
    GitActionsManager gitActionsManager = new GitActionsManager(gitCtrl, null, null, refreshSupport);
    stagingPanel = new StagingPanel(refreshSupport, gitCtrl, null, gitActionsManager);
    ToolbarPanel toolbarPanel = stagingPanel.getToolbarPanel();
    frame.getContentPane().add(stagingPanel);
    frame.pack();
    frame.setVisible(true);
    flushAWT();
    toolbarPanel.updateButtonsStates();
    refreshSupport.call();
    flushAWT();
    // Make the first commit for the local repository
    File file = new File(LOCAL_REPO, "local.txt");
    file.createNewFile();
    setFileContent(file, "local content");
    gitAccess.add(new FileStatus(GitChangeType.ADD, "local.txt"));
    gitAccess.commit("First local commit.");
    // Make the first commit for the remote repository
    gitAccess.setRepositorySynchronously(REMOTE_REPO);
    file = new File(REMOTE_REPO, "remote1.txt");
    file.createNewFile();
    setFileContent(file, "remote content");
    gitAccess.add(new FileStatus(GitChangeType.ADD, "remote1.txt"));
    gitAccess.commit("First remote commit.");
    // Switch back to local repo and create local branch
    gitAccess.setRepositorySynchronously(LOCAL_REPO);
    gitAccess.createBranch(LOCAL_BRANCH);
    gitAccess.fetch();
    try {
        SplitMenuButton stashButton = toolbarPanel.getStashButton();
        makeLocalChange("some_modification");
        flushAWT();
        JMenuItem[] stashChangesItem = new JMenuItem[1];
        stashChangesItem[0] = stashButton.getItem(0);
        SwingUtilities.invokeLater(() -> stashChangesItem[0].getAction().actionPerformed(null));
        flushAWT();
        // Stash changes and test if the actions become disabled.
        JDialog stashChangesDialog = findDialog(Tags.STASH_CHANGES);
        flushAWT();
        assertNotNull(stashChangesDialog);
        JButton doStashButton = findFirstButton(stashChangesDialog, Tags.STASH);
        assertNotNull(doStashButton);
        doStashButton.doClick();
        refreshSupport.call();
        flushAWT();
        assertEquals("local content", getFileContent(LOCAL_REPO + "/local.txt"));
        JMenuItem[] listStashesItem = new JMenuItem[1];
        listStashesItem[0] = stashButton.getItem(1);
        SwingUtilities.invokeLater(() -> listStashesItem[0].getAction().actionPerformed(null));
        flushAWT();
        ListStashesDialog listStashesDialog = (ListStashesDialog) findDialog(Tags.STASHES);
        flushAWT();
        assertNotNull(listStashesDialog);
        JCheckBox[] popStashCheckBox = new JCheckBox[1];
        flushAWT();
        popStashCheckBox[0] = findCheckBox(listStashesDialog, Tags.DELETE_STASH_AFTER_APPLIED);
        assertNotNull(popStashCheckBox[0]);
        SwingUtilities.invokeLater(() -> popStashCheckBox[0].setSelected(true));
        flushAWT();
        List<RevCommit> stashes = new ArrayList<>(gitAccess.listStashes());
        assertFalse(stashes.isEmpty());
        assertEquals(1, listStashesDialog.getStashesTable().getRowCount());
        JButton[] applyButton = new JButton[1];
        flushAWT();
        applyButton[0] = findFirstButton(listStashesDialog, Tags.APPLY);
        assertNotNull(applyButton[0]);
        SwingUtilities.invokeLater(() -> applyButton[0].doClick());
        flushAWT();
        // Check if the stash was been deleted and applied
        stashes = new ArrayList<>(gitAccess.listStashes());
        assertTrue(stashes.isEmpty());
        assertEquals(0, listStashesDialog.getStashesTable().getRowCount());
        assertEquals("some_modification", getFileContent(LOCAL_REPO + "/local.txt"));
        JButton cancelButton = findFirstButton(listStashesDialog, Tags.CLOSE);
        assertNotNull(cancelButton);
        cancelButton.doClick();
        stashChangesItem[0] = stashButton.getItem(0);
        SwingUtilities.invokeLater(() -> stashChangesItem[0].getAction().actionPerformed(null));
        flushAWT();
        stashChangesDialog = findDialog(Tags.STASH_CHANGES);
        assertNotNull(stashChangesDialog);
        doStashButton = findFirstButton(stashChangesDialog, Tags.STASH);
        assertNotNull(doStashButton);
        doStashButton.doClick();
        refreshSupport.call();
        flushAWT();
        assertEquals("local content", getFileContent(LOCAL_REPO + "/local.txt"));
        listStashesItem[0] = stashButton.getItem(1);
        SwingUtilities.invokeLater(() -> listStashesItem[0].getAction().actionPerformed(null));
        listStashesDialog = (ListStashesDialog) findDialog(Tags.STASHES);
        assertNotNull(listStashesDialog);
        popStashCheckBox[0] = findCheckBox(listStashesDialog, Tags.DELETE_STASH_AFTER_APPLIED);
        assertNotNull(popStashCheckBox[0]);
        SwingUtilities.invokeLater(() -> popStashCheckBox[0].setSelected(false));
        flushAWT();
        applyButton[0] = findFirstButton(listStashesDialog, Tags.APPLY);
        assertNotNull(applyButton[0]);
        SwingUtilities.invokeLater(() -> applyButton[0].doClick());
        flushAWT();
        stashes = new ArrayList<>(gitAccess.listStashes());
        assertFalse(stashes.isEmpty());
        assertEquals(1, listStashesDialog.getStashesTable().getRowCount());
        assertEquals("some_modification", getFileContent(LOCAL_REPO + "/local.txt"));
        cancelButton = findFirstButton(listStashesDialog, Tags.CLOSE);
        assertNotNull(cancelButton);
        cancelButton.doClick();
    } finally {
        frame.setVisible(false);
        frame.dispose();
    }
}

Example 10 with GitController

use of com.oxygenxml.git.view.event.GitController in project oxygen-git-client-addon by oxygenxml.

the class ToolbarPanelTest method testButtonsWhenNoRepo.

/**
 * <p><b>Description:</b> when trying to switch to another branch from the branches menu
 * and the checkout fails, tests the dialog</p>
 * <p><b>Bug ID:</b> EXM-48502</p>
 *
 * @author Alex_Smarandache
 *
 * @throws Exception
 */
public void testButtonsWhenNoRepo() throws Exception {
    File testDir = new File(String.format("target/test-resources/ToolbarPanelTest/%s", this.getName()));
    try {
        GitController gitCtrl = new GitController();
        GitActionsManager gitActionsManager = new GitActionsManager(gitCtrl, null, null, refreshSupport);
        stagingPanel = new StagingPanel(refreshSupport, gitCtrl, null, gitActionsManager);
        refreshSupport.setStagingPanel(stagingPanel);
        ToolbarPanel toolbar = stagingPanel.getToolbarPanel();
        assertFalse("No repo, the button should be disabled.", toolbar.getPullMenuButton().isEnabled());
        assertFalse(toolbar.getPushButton().isEnabled());
        assertFalse(toolbar.getStashButton().isEnabled());
        // Creates repos
        String local = String.format("target/test-resources/ToolbarPanelTest/%s/localRepository", this.getName());
        String remote = String.format("target/test-resources/ToolbarPanelTest/%s/remoteRepository", this.getName());
        // Creates the remote repository.
        createRepo(remote, local);
        Repository remoteRepository = createRepository(remote);
        Repository localRepository = createRepository(local);
        bindLocalToRemote(localRepository, remoteRepository);
        flushAWT();
        assertTrue("Pull Merge action should be enabled.", gitActionsManager.getPullMergeAction().isEnabled());
        assertTrue("Pull Rebase action should be enabled.", gitActionsManager.getPullRebaseAction().isEnabled());
        assertTrue(toolbar.getPullMenuButton().isEnabled());
        assertTrue("Push action should be enabled.", gitActionsManager.getPushAction().isEnabled());
        assertTrue(toolbar.getPushButton().isEnabled());
        assertFalse(toolbar.getStashButton().isEnabled());
    } finally {
        FileSystemUtil.deleteRecursivelly(testDir);
    }
}