Exclude feature in tests. Change-Id: I76e8e425a26cb1adbed674f525992315a4ff9f1a
diff --git a/org.eclipse.fmc.blockdiagram.editor.tests/pom.xml b/org.eclipse.fmc.blockdiagram.editor.tests/pom.xml index 00e2a5e..fb54e9e 100644 --- a/org.eclipse.fmc.blockdiagram.editor.tests/pom.xml +++ b/org.eclipse.fmc.blockdiagram.editor.tests/pom.xml
@@ -49,16 +49,17 @@ <useUIHarness>true</useUIHarness> <useUIThread>true</useUIThread> <argLine>-Xmx512m -XX:MaxPermSize=256m -XstartOnFirstThread</argLine> + <showEclipseLog>true</showEclipseLog> <excludes> <exclude>**/Meta*.java</exclude> </excludes> - <bundleStartLevel> - <bundle> - <id>org.eclipse.fmc.blockdiagram.editor</id> - <level>1</level> - <autoStart>true</autoStart> - </bundle> - </bundleStartLevel> + <dependencies> + <dependency> + <type>eclipse-feature</type> + <artifactId>org.eclipse.graphiti.feature</artifactId> + <version>0.0.0</version> + </dependency> + </dependencies> </configuration> </plugin> </plugins>
diff --git a/org.eclipse.fmc.blockdiagram.editor.tests/src/org/eclipse/fmc/FMCTestCase.java b/org.eclipse.fmc.blockdiagram.editor.tests/src/org/eclipse/fmc/FMCTestCase.java index 29a78f6..cf53253 100644 --- a/org.eclipse.fmc.blockdiagram.editor.tests/src/org/eclipse/fmc/FMCTestCase.java +++ b/org.eclipse.fmc.blockdiagram.editor.tests/src/org/eclipse/fmc/FMCTestCase.java
@@ -18,6 +18,7 @@ import static org.eclipse.fmc.blockdiagram.editor.diagram.BlockDiagramFeatureProvider.CREATE_CON_MODIFY_ACCESS; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; +import static org.junit.Assert.assertNotNull; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -106,6 +107,7 @@ } protected Diagram getDiagram() { + assertNotNull("Editor cannot be found", editor); return editor.getDiagramTypeProvider().getDiagram(); } @@ -213,11 +215,13 @@ @Before public void setUp() throws PartInitException, CoreException { + IWorkbenchPage activePage = PlatformUI.getWorkbench() .getActiveWorkbenchWindow().getActivePage(); - + assertNotNull("Eclipse environment has not been setup correctly", activePage); editor = (BlockDiagramEditor) IDE.openEditor(activePage, getFmcFile(BLOCKDIAG_FILENAME)); + assertNotNull("Editor cannot be opened" , editor); ViewIntroAdapterPart viewIntro = (ViewIntroAdapterPart) activePage .findView(IIntroConstants.INTRO_VIEW_ID); if (viewIntro != null)