diff options
Diffstat (limited to 'plugins/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/egit/IgnoreDiFileChangesInGitMergeTest.java')
| -rw-r--r-- | plugins/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/egit/IgnoreDiFileChangesInGitMergeTest.java | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/plugins/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/egit/IgnoreDiFileChangesInGitMergeTest.java b/plugins/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/egit/IgnoreDiFileChangesInGitMergeTest.java index 2a65a39b7..4a625bb32 100644 --- a/plugins/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/egit/IgnoreDiFileChangesInGitMergeTest.java +++ b/plugins/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/egit/IgnoreDiFileChangesInGitMergeTest.java @@ -25,28 +25,24 @@ import org.junit.runner.RunWith; * Tests that concurrent changes to di-files do not cause conflicts. * <dl> * <dt>Origin:</dt> - * <dd>Given is a UML activity diagram with a di-file that contains a page list - * and sash model windows.</dd> + * <dd>Given is a UML activity diagram with a di-file that contains a page list and sash model windows.</dd> * <dt>Left:</dt> - * <dd>A new diagram is created, which causes the di-file to contain a new sash - * model window.</dd> + * <dd>A new diagram is created, which causes the di-file to contain a new sash model window.</dd> * <dt>Right:</dt> - * <dd>Again, a new diagram is created, which causes the di-file to contain a - * new sash model window.</dd> + * <dd>Again, a new diagram is created, which causes the di-file to contain a new sash model window.</dd> * </dl> * <p> - * Without properly ignoring changes of the di-file, this scenario would lead to - * a conflict. The requirement, however, dictates that di-file changes should - * never lead to a conflict (cf. bug 485494). + * Without properly ignoring changes of the di-file, this scenario would lead to a conflict. The requirement, + * however, dictates that di-file changes should never lead to a conflict (cf. bug 485494). * </p> * * @author Philip Langer <planger@eclipsesource.com> */ -@SuppressWarnings({ "nls" }) +@SuppressWarnings({"nls" }) @RunWith(GitTestRunner.class) @ResolutionStrategies(ResolutionStrategyID.WORKSPACE) public class IgnoreDiFileChangesInGitMergeTest { - + @GitMerge(localBranch = "branch1", remoteBranch = "branch2") @GitInput("data/ignore-di-file-changes.zip") public void testIgnoredDiFileChangesAfterGitMerge(GitTestSupport testSupport) throws Exception { @@ -55,5 +51,5 @@ public class IgnoreDiFileChangesInGitMergeTest { assertTrue(testSupport.fileExists("project1/model.notation")); assertTrue(testSupport.fileExists("project1/model.uml")); } - + } |