Skip to main content
aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/internal/submodules/SubmoduleFolderTest.java
diff options
context:
space:
mode:
Diffstat (limited to 'org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/internal/submodules/SubmoduleFolderTest.java')
-rw-r--r--org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/internal/submodules/SubmoduleFolderTest.java58
1 files changed, 30 insertions, 28 deletions
diff --git a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/internal/submodules/SubmoduleFolderTest.java b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/internal/submodules/SubmoduleFolderTest.java
index 14b4c33091..9ae6640980 100644
--- a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/internal/submodules/SubmoduleFolderTest.java
+++ b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/internal/submodules/SubmoduleFolderTest.java
@@ -24,6 +24,7 @@ import static org.junit.Assert.assertTrue;
import java.io.File;
import java.util.Collections;
+import org.eclipse.core.commands.State;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IFolder;
import org.eclipse.core.resources.IProject;
@@ -32,10 +33,14 @@ import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.QualifiedName;
import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.egit.core.Activator;
import org.eclipse.egit.core.JobFamilies;
+import org.eclipse.egit.core.RepositoryCache;
+import org.eclipse.egit.core.RepositoryUtil;
+import org.eclipse.egit.core.info.GitItemState;
import org.eclipse.egit.core.internal.Utils;
+import org.eclipse.egit.core.internal.indexdiff.IndexDiffCache;
import org.eclipse.egit.core.internal.indexdiff.IndexDiffCacheEntry;
+import org.eclipse.egit.core.internal.info.GitItemStateFactory;
import org.eclipse.egit.core.project.GitProjectData;
import org.eclipse.egit.core.project.RepositoryMapping;
import org.eclipse.egit.core.test.TestRepository;
@@ -44,8 +49,6 @@ import org.eclipse.egit.ui.internal.UIText;
import org.eclipse.egit.ui.internal.clone.ProjectRecord;
import org.eclipse.egit.ui.internal.clone.ProjectUtils;
import org.eclipse.egit.ui.internal.repository.RepositoriesView;
-import org.eclipse.egit.ui.internal.resources.IResourceState;
-import org.eclipse.egit.ui.internal.resources.ResourceStateFactory;
import org.eclipse.egit.ui.test.ContextMenuHelper;
import org.eclipse.egit.ui.test.TestUtil;
import org.eclipse.jgit.api.Git;
@@ -62,6 +65,9 @@ import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem;
import org.eclipse.ui.IEditorReference;
import org.eclipse.ui.IViewPart;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.commands.ICommandService;
+import org.eclipse.ui.handlers.RegistryToggleState;
import org.hamcrest.BaseMatcher;
import org.hamcrest.Description;
import org.junit.After;
@@ -78,8 +84,6 @@ public class SubmoduleFolderTest extends LocalRepositoryTestCase {
private static final String CHILDPROJECT = "ChildProject";
- private static final TestUtil UTIL = new TestUtil();
-
private Repository parentRepository;
private Repository childRepository;
@@ -103,8 +107,7 @@ public class SubmoduleFolderTest extends LocalRepositoryTestCase {
parentRepositoryGitDir = createProjectAndCommitToRepository();
childRepositoryGitDir = createProjectAndCommitToRepository(CHILDREPO,
CHILDPROJECT);
- Activator.getDefault().getRepositoryUtil()
- .addConfiguredRepository(parentRepositoryGitDir);
+ RepositoryUtil.INSTANCE.addConfiguredRepository(parentRepositoryGitDir);
parentRepository = lookupRepository(parentRepositoryGitDir);
childRepository = lookupRepository(childRepositoryGitDir);
parentProject = ResourcesPlugin.getWorkspace().getRoot()
@@ -159,12 +162,10 @@ public class SubmoduleFolderTest extends LocalRepositoryTestCase {
@After
public void removeConfiguredRepositories() {
if (parentRepositoryGitDir != null) {
- Activator.getDefault().getRepositoryUtil()
- .removeDir(parentRepositoryGitDir);
+ RepositoryUtil.INSTANCE.removeDir(parentRepositoryGitDir);
}
if (childRepositoryGitDir != null) {
- Activator.getDefault().getRepositoryUtil()
- .removeDir(childRepositoryGitDir);
+ RepositoryUtil.INSTANCE.removeDir(childRepositoryGitDir);
}
childRepository = null;
parentRepository = null;
@@ -218,9 +219,9 @@ public class SubmoduleFolderTest extends LocalRepositoryTestCase {
util.getPluginLocalizedValue("AddToIndexAction_label"));
TestUtil.joinJobs(ADD_TO_INDEX);
TestUtil.joinJobs(JobFamilies.INDEX_DIFF_CACHE_UPDATE);
- IndexDiffCacheEntry cache = Activator.getDefault().getIndexDiffCache()
+ IndexDiffCacheEntry cache = IndexDiffCache.INSTANCE
.getIndexDiffCacheEntry(subRepository);
- IResourceState state = ResourceStateFactory.getInstance()
+ GitItemState state = GitItemStateFactory.getInstance()
.get(cache.getIndexDiff(), file);
assertTrue("File should be staged", state.isStaged());
TestUtil.waitForDecorations();
@@ -229,7 +230,7 @@ public class SubmoduleFolderTest extends LocalRepositoryTestCase {
util.getPluginLocalizedValue("RemoveFromIndexAction_label"));
TestUtil.joinJobs(REMOVE_FROM_INDEX);
TestUtil.joinJobs(JobFamilies.INDEX_DIFF_CACHE_UPDATE);
- state = ResourceStateFactory.getInstance().get(cache.getIndexDiff(),
+ state = GitItemStateFactory.getInstance().get(cache.getIndexDiff(),
file);
assertFalse("File should not be staged", state.isStaged());
assertTrue("File should be dirty", state.isDirty());
@@ -260,11 +261,15 @@ public class SubmoduleFolderTest extends LocalRepositoryTestCase {
@Test
public void testRepoViewFollowSelection() throws Exception {
+ ICommandService srv = PlatformUI.getWorkbench()
+ .getService(ICommandService.class);
+ State commandState = srv
+ .getCommand(RepositoriesView.LINK_WITH_SELECTION_ID)
+ .getState(RegistryToggleState.STATE_ID);
+ Boolean followsSelection = (Boolean) commandState.getValue();
+ commandState.setValue(Boolean.TRUE);
SWTBotView view = TestUtil.showView(RepositoriesView.VIEW_ID);
TestUtil.joinJobs(REPO_VIEW_REFRESH);
- view.toolbarButton(
- UTIL.getPluginLocalizedValue("LinkWithSelectionCommand"))
- .click();
try {
SWTBotTree projectExplorerTree = TestUtil.getExplorerTree();
SWTBotTreeItem node = TestUtil.navigateTo(projectExplorerTree,
@@ -299,9 +304,7 @@ public class SubmoduleFolderTest extends LocalRepositoryTestCase {
parentFound[0]);
} finally {
// Reset "follow selection"
- view.toolbarButton(
- UTIL.getPluginLocalizedValue("LinkWithSelectionCommand"))
- .click();
+ commandState.setValue(followsSelection);
}
}
@@ -391,16 +394,15 @@ public class SubmoduleFolderTest extends LocalRepositoryTestCase {
*/
@Test
public void testRepoRemoval() {
- Activator.getDefault().getRepositoryUtil()
- .addConfiguredRepository(childRepositoryGitDir);
+ RepositoryUtil.INSTANCE.addConfiguredRepository(childRepositoryGitDir);
assertTrue("Should still have the subrepo in the cache",
- containsRepo(Activator.getDefault().getRepositoryCache()
- .getAllRepositories(), subRepository));
- assertTrue("Should have changed the preference", Activator.getDefault()
- .getRepositoryUtil().removeDir(childRepositoryGitDir));
+ containsRepo(RepositoryCache.INSTANCE.getAllRepositories(),
+ subRepository));
+ assertTrue("Should have changed the preference",
+ RepositoryUtil.INSTANCE.removeDir(childRepositoryGitDir));
assertTrue("Should still have the subrepo in the cache",
- containsRepo(Activator.getDefault().getRepositoryCache()
- .getAllRepositories(), subRepository));
+ containsRepo(RepositoryCache.INSTANCE.getAllRepositories(),
+ subRepository));
}
@SuppressWarnings("restriction")

Back to the top