Fixed test cases.
Change-Id: I72f2bfce2c95c950d7f918d6159018b1a4a66973
diff --git a/org.eclipse.fmc.blockdiagram.editor.tests/src/org/eclipse/fmc/blockdiagram/editor/property/PropertySheetTest.java b/org.eclipse.fmc.blockdiagram.editor.tests/src/org/eclipse/fmc/blockdiagram/editor/property/PropertySheetTest.java
index 4d4a42f..6413ceb 100644
--- a/org.eclipse.fmc.blockdiagram.editor.tests/src/org/eclipse/fmc/blockdiagram/editor/property/PropertySheetTest.java
+++ b/org.eclipse.fmc.blockdiagram.editor.tests/src/org/eclipse/fmc/blockdiagram/editor/property/PropertySheetTest.java
@@ -67,25 +67,39 @@
@Override
public void setUp() throws PartInitException, CoreException {
+ initPropSheet();
super.setUp();
}
-
- TabbedPropertySheetPage getTabbedPropSheet() throws PartInitException {
- IWorkbenchPage activePage = PlatformUI.getWorkbench()
- .getActiveWorkbenchWindow().getActivePage();
-
- PropertySheet propSheet = (PropertySheet) activePage
- .findView(IPageLayout.ID_PROP_SHEET);
- if (propSheet == null)
- propSheet = (PropertySheet) activePage
+
+ void initPropSheet() throws PartInitException {
+ PropertySheet propSheet = getPropertySheet();
+ if (propSheet == null){
+ propSheet = (PropertySheet) getActivePage()
.showView(IPageLayout.ID_PROP_SHEET);
- activePage.bringToTop(propSheet);
+ }
+ }
+
+ IWorkbenchPage getActivePage(){
+ return PlatformUI.getWorkbench()
+ .getActiveWorkbenchWindow().getActivePage();
+ }
+
+ PropertySheet getPropertySheet(){
+ return (PropertySheet) getActivePage()
+ .findView(IPageLayout.ID_PROP_SHEET);
+ }
+
+ TabbedPropertySheetPage getTabbedPropSheet(){
+ PropertySheet propSheet = getPropertySheet();
+ getActivePage().bringToTop(propSheet);
+ propSheet.setFocus();
return (TabbedPropertySheetPage) propSheet.getCurrentPage();
}
@Test
public void testDiagramPropertySection() throws PartInitException {
// Diagram selected
+ select(getDiagram());
TabbedPropertySheetPage page = getTabbedPropSheet();
checkTabsForDiagram(page);
page.setSelectedTab(TAB_DIAGRAM);
@@ -107,6 +121,8 @@
getEditor().setPictogramElementForSelection(element);
getEditor().getDiagramBehavior().selectBufferedPictogramElements();
getEditor().getDiagramBehavior().refresh();
+ assertEquals("Expected selection of exactly one pictogram element", 1, getEditor().getDiagramBehavior().getSelectedPictogramElements().length);
+ assertEquals("Selection failed", element, getEditor().getDiagramBehavior().getSelectedPictogramElements()[0]);
}
@Test
