[415657] Re-instate no longer failing test
diff --git a/org.eclipse.modisco.jee.jsp.generation.tests/META-INF/MANIFEST.MF b/org.eclipse.modisco.jee.jsp.generation.tests/META-INF/MANIFEST.MF
index 844dd74..5f09dc6 100644
--- a/org.eclipse.modisco.jee.jsp.generation.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.jee.jsp.generation.tests/META-INF/MANIFEST.MF
@@ -10,7 +10,9 @@
org.eclipse.gmt.modisco.infra.common.core;bundle-version="0.8.0",
org.eclipse.acceleo.engine;bundle-version="3.0.0",
org.eclipse.modisco.jee.jsp.generation;bundle-version="0.9.0",
- org.junit;bundle-version="4.8.1"
+ org.junit;bundle-version="4.8.1",
+ org.eclipse.modisco.jee,
+ org.eclipse.modisco.jee.jsp.discoverer.tests
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Export-Package: org.eclipse.modisco.jee.jsp.generation.tests
diff --git a/org.eclipse.modisco.jee.jsp.generation.tests/src/org/eclipse/modisco/jee/jsp/generation/tests/DiffGeneratedJspTest.java b/org.eclipse.modisco.jee.jsp.generation.tests/src/org/eclipse/modisco/jee/jsp/generation/tests/DiffGeneratedJspTest.java
index f2ff956..add77cc 100644
--- a/org.eclipse.modisco.jee.jsp.generation.tests/src/org/eclipse/modisco/jee/jsp/generation/tests/DiffGeneratedJspTest.java
+++ b/org.eclipse.modisco.jee.jsp.generation.tests/src/org/eclipse/modisco/jee/jsp/generation/tests/DiffGeneratedJspTest.java
@@ -48,11 +48,7 @@
*
*/
public class DiffGeneratedJspTest {
-
- /* Bug 415657 - Disabling of 'org.eclipse.modisco.jee.jsp.discoverer' to deliver to Luna M1
private static final String JSP_DISCOVERER_TESTS_PLUGINID = org.eclipse.modisco.jee.jsp.discoverer.tests.Activator.PLUGIN_ID;
- */
- private static final String JSP_DISCOVERER_TESTS_PLUGINID = null;
private static final String RESOURCES_TEST1_XML = "resources/org.eclipse.modisco.jee.jsp.discoverer.tests.jspxmi"; //$NON-NLS-1$
private static final String RESOURCES_TEST1_JSP = "resources/"; //$NON-NLS-1$
private static final String DEPLOYED_TEST1_JSP = "resources/"; //$NON-NLS-1$
@@ -84,8 +80,7 @@
* @throws IOException
* @throws CoreException
*/
- @Ignore // FIXME Bug 552989
- @Test(timeout = 5 * 60 * 1000)
+ @Test // (timeout = 5 * 60 * 1000)
public final void testJspFileExistence() throws URISyntaxException,
CoreException, IOException {
File sourceJspModel = getInputModelFile();
@@ -227,8 +222,15 @@
jspGenerator.getModel());
Assert.assertTrue("JSP Model instance not found in jsp model before generation", //$NON-NLS-1$
jspGenerator.getModel().eClass().getName().equals("Model")); //$NON-NLS-1$
- jspGenerator.doGenerate(null);
-
+ try {
+ jspGenerator.doGenerate(null);
+ }
+ catch (IOException e) {
+ throw e;
+ }
+ catch (Exception e) {
+ throw new IOException("Acceleo generation failed", e);
+ }
}
/**
