Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEsteban Dugueperoux2015-11-02 14:35:18 +0000
committerEsteban Dugueperoux2015-11-02 14:35:18 +0000
commit36ca1a9ce46db76bab32641b43303347d518ad7c (patch)
treed785a38c301aa6a9488f4622cca5ddc8e2ad132a
parent7bf70fa2cb36dc5555e36dfdd782a84a434d9783 (diff)
downloadorg.eclipse.sirius-36ca1a9ce46db76bab32641b43303347d518ad7c.tar.gz
org.eclipse.sirius-36ca1a9ce46db76bab32641b43303347d518ad7c.tar.xz
org.eclipse.sirius-36ca1a9ce46db76bab32641b43303347d518ad7c.zip
[480773] Update DialectEditorsOpeningWithFailingSessionOpeningTests
- Update DialectEditorsOpeningWithFailingSessionOpeningTests JUnit tests to test StyledTet Bug: 480773 Change-Id: I7804164cf6f5d338b926fb006a8896c3a56a9e47 Signed-off-by: Esteban Dugueperoux <esteban.dugueperoux@obeo.fr>
-rw-r--r--plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/common/DialectEditorsOpeningWithFailingSessionOpeningTests.java24
1 files changed, 17 insertions, 7 deletions
diff --git a/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/common/DialectEditorsOpeningWithFailingSessionOpeningTests.java b/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/common/DialectEditorsOpeningWithFailingSessionOpeningTests.java
index 452432ea39..6a2d49f7ce 100644
--- a/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/common/DialectEditorsOpeningWithFailingSessionOpeningTests.java
+++ b/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/common/DialectEditorsOpeningWithFailingSessionOpeningTests.java
@@ -10,6 +10,8 @@
*******************************************************************************/
package org.eclipse.sirius.tests.unit.common;
+import java.text.MessageFormat;
+
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.core.runtime.OperationCanceledException;
import org.eclipse.draw2d.IFigure;
@@ -39,6 +41,7 @@ import org.eclipse.sirius.ui.business.api.session.SessionEditorInput;
import org.eclipse.sirius.ui.business.api.session.SessionEditorInputFactory;
import org.eclipse.sirius.viewpoint.ViewpointFactory;
import org.eclipse.sirius.viewpoint.provider.SiriusEditPlugin;
+import org.eclipse.swt.custom.StyledText;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.ui.IEditorPart;
@@ -142,6 +145,7 @@ public class DialectEditorsOpeningWithFailingSessionOpeningTests extends SiriusT
openedEditor = IDE.openEditor(activePage, sessionEditorInput, editorID);
TestsUtil.synchronizationWithUIThread();
+ String expectedMessage = null;
String displayedMessage = null;
if (editorID == DDiagramEditor.EDITOR_ID) {
assertTrue(openedEditor instanceof DDiagramEditorImpl);
@@ -154,6 +158,7 @@ public class DialectEditorsOpeningWithFailingSessionOpeningTests extends SiriusT
Object child = layer.getChildren().get(layer.getChildren().size() - 1);
assertTrue(child instanceof Label);
Label statusLabel = (Label) child;
+ expectedMessage = MessageFormat.format(org.eclipse.sirius.diagram.ui.provider.Messages.DDiagramEditorImpl_editorToBeClosedAndReopenedSinceContentIsNotAccessible, exceptionMessage);
displayedMessage = statusLabel.getText();
} else if (editorID == DTreeEditor.ID) {
assertTrue(openedEditor instanceof DTreeEditor);
@@ -163,8 +168,9 @@ public class DialectEditorsOpeningWithFailingSessionOpeningTests extends SiriusT
Composite composite = (Composite) control;
assertEquals(1, composite.getChildren().length);
Control child = composite.getChildren()[0];
- assertTrue(child instanceof org.eclipse.swt.widgets.Label);
- org.eclipse.swt.widgets.Label label = (org.eclipse.swt.widgets.Label) child;
+ assertTrue(child instanceof StyledText);
+ StyledText label = (StyledText) child;
+ expectedMessage = MessageFormat.format(org.eclipse.sirius.tree.ui.provider.Messages.DTreeEditor_editorToBeClosedAndReopenedSinceContentIsNotAccessible, exceptionMessage);
displayedMessage = label.getText();
} else if (editorID == DTableEditionEditor.ID) {
assertTrue(openedEditor instanceof DTableEditionEditor);
@@ -174,8 +180,10 @@ public class DialectEditorsOpeningWithFailingSessionOpeningTests extends SiriusT
Composite composite = (Composite) control;
assertEquals(1, composite.getChildren().length);
Control child = composite.getChildren()[0];
- assertTrue(child instanceof org.eclipse.swt.widgets.Label);
- org.eclipse.swt.widgets.Label label = (org.eclipse.swt.widgets.Label) child;
+ assertTrue(child instanceof StyledText);
+ StyledText label = (StyledText) child;
+ expectedMessage = MessageFormat.format(org.eclipse.sirius.table.metamodel.table.provider.Messages.AbstractDTableEditor_editorToBeClosedAndReopenedSinceContentIsNotAccessible,
+ exceptionMessage);
displayedMessage = label.getText();
} else if (editorID == DTableCrossEditor.ID) {
assertTrue(openedEditor instanceof DTableCrossEditor);
@@ -185,11 +193,13 @@ public class DialectEditorsOpeningWithFailingSessionOpeningTests extends SiriusT
Composite composite = (Composite) control;
assertEquals(1, composite.getChildren().length);
Control child = composite.getChildren()[0];
- assertTrue(child instanceof org.eclipse.swt.widgets.Label);
- org.eclipse.swt.widgets.Label label = (org.eclipse.swt.widgets.Label) child;
+ assertTrue(child instanceof StyledText);
+ StyledText label = (StyledText) child;
+ expectedMessage = MessageFormat.format(org.eclipse.sirius.table.metamodel.table.provider.Messages.AbstractDTableEditor_editorToBeClosedAndReopenedSinceContentIsNotAccessible,
+ exceptionMessage);
displayedMessage = label.getText();
}
- assertEquals("The exception message should be displayed in background of opened dialect editor to explain why the session opening has failed", exceptionMessage, displayedMessage);
+ assertEquals("The exception message should be displayed in background of opened dialect editor to explain why the session opening has failed", expectedMessage, displayedMessage);
}
@Override

Back to the top