Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Constant2013-10-15 16:17:26 +0000
committerOlivier Constant2013-10-15 16:17:26 +0000
commita236f0c2d84b736513ddcc6956721a8451b17853 (patch)
tree1b494fe7515d67df3f840d9d53058ef979781f79 /tests/org.eclipse.emf.diffmerge.tests.wt.elements
parent0d40d8a47711ddbe1eb022a3335c2c906344cfc8 (diff)
downloadorg.eclipse.emf.diffmerge.core-a236f0c2d84b736513ddcc6956721a8451b17853.tar.gz
org.eclipse.emf.diffmerge.core-a236f0c2d84b736513ddcc6956721a8451b17853.tar.xz
org.eclipse.emf.diffmerge.core-a236f0c2d84b736513ddcc6956721a8451b17853.zip
Bug 417596 - NPE on cancel when no differences
Bug 419453 - Model scopes should be responsible for resource unloading Bug 419039 - Interactions between GUI Editor and workbench Parts are limited Bug 418523 - GUI requires EditingDomain
Diffstat (limited to 'tests/org.eclipse.emf.diffmerge.tests.wt.elements')
-rw-r--r--tests/org.eclipse.emf.diffmerge.tests.wt.elements/.gitignore1
-rw-r--r--tests/org.eclipse.emf.diffmerge.tests.wt.elements/src/org/eclipse/emf/diffmerge/tests/wt/elements/DiffMergeTestCase.java3
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/org.eclipse.emf.diffmerge.tests.wt.elements/.gitignore b/tests/org.eclipse.emf.diffmerge.tests.wt.elements/.gitignore
deleted file mode 100644
index 45f51bac..00000000
--- a/tests/org.eclipse.emf.diffmerge.tests.wt.elements/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/wintest
diff --git a/tests/org.eclipse.emf.diffmerge.tests.wt.elements/src/org/eclipse/emf/diffmerge/tests/wt/elements/DiffMergeTestCase.java b/tests/org.eclipse.emf.diffmerge.tests.wt.elements/src/org/eclipse/emf/diffmerge/tests/wt/elements/DiffMergeTestCase.java
index 62681455..971fbdf9 100644
--- a/tests/org.eclipse.emf.diffmerge.tests.wt.elements/src/org/eclipse/emf/diffmerge/tests/wt/elements/DiffMergeTestCase.java
+++ b/tests/org.eclipse.emf.diffmerge.tests.wt.elements/src/org/eclipse/emf/diffmerge/tests/wt/elements/DiffMergeTestCase.java
@@ -39,6 +39,7 @@ public abstract class DiffMergeTestCase extends UITestCaseSWT {
private static IProject __predefinedProject, __currentProject;
private static final String MODEL1 = "Ex1.elements";
private static final String MODEL2 = "Ex2.elements";
+ private static final String EDITOR_TITLE = "Compare [Ex1 - Ex2]";
private static final char SEP = '/';
@@ -117,7 +118,7 @@ public abstract class DiffMergeTestCase extends UITestCaseSWT {
*/
protected void closeCompareEditor(boolean dirty) throws Exception {
IUIContext ui = getUI();
- final String editorName = (dirty? "*": "") + "Compare";
+ final String editorName = (dirty? "*": "") + EDITOR_TITLE;
ui.contextClick(new CTabItemLocator(editorName), "Close");
ui.wait(new ShellDisposedCondition("Progress Information"));
if (dirty) {

Back to the top