diff options
| author | Camille Letavernier | 2015-09-02 11:15:05 +0000 |
|---|---|---|
| committer | Camille Letavernier | 2015-09-02 11:16:50 +0000 |
| commit | 717528511f3b798e21abf32b312604f8f78657f1 (patch) | |
| tree | 128a0ad27144fe599f31499ba9a8e965a62f635a | |
| parent | 3a3d693e2032f2b2038791dcf1f30253db8b9f31 (diff) | |
| download | org.eclipse.papyrus-717528511f3b798e21abf32b312604f8f78657f1.tar.gz org.eclipse.papyrus-717528511f3b798e21abf32b312604f8f78657f1.tar.xz org.eclipse.papyrus-717528511f3b798e21abf32b312604f8f78657f1.zip | |
[Releng - Tests] Update the BREE test to allow java 8. Remove the test
for the pdoc file, which is not used anymore
Change-Id: I9ed0a231edf99a8644e81f80dffb12dfe803ed05
Signed-off-by: Camille Letavernier <camille.letavernier@cea.fr>
2 files changed, 5 insertions, 26 deletions
diff --git a/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/BundleTestsUtils.java b/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/BundleTestsUtils.java index 947b4cf84e2..378c30eea0f 100644 --- a/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/BundleTestsUtils.java +++ b/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/BundleTestsUtils.java @@ -12,7 +12,6 @@ import org.eclipse.pde.internal.core.ifeature.IFeatureModel; import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
-@SuppressWarnings("restriction")
public class BundleTestsUtils {
// This version number should be changed at each release
@@ -40,7 +39,9 @@ public class BundleTestsUtils { public static final String JAVA_VERSION_7 = "JavaSE-1.7"; //$NON-NLS-1$
- public static final String JAVA_VERSION_REGEX = JAVA_VERSION_5 + "|" + JAVA_VERSION_6 + "|" + JAVA_VERSION_7;
+ public static final String JAVA_VERSION_8 = "JavaSE-1.8"; //$NON-NLS-1$
+
+ public static final String JAVA_VERSION_REGEX = JAVA_VERSION_5 + "|" + JAVA_VERSION_6 + "|" + JAVA_VERSION_7 + "|" + JAVA_VERSION_8;
public static final String REQUIRE_BUNDLE = "Require-Bundle"; //$NON-NLS-1$
@@ -71,7 +72,7 @@ public class BundleTestsUtils { * @param bundle
* a bundle
* @return
- * <code>true</code> if the bundle represents a Java Project
+ * <code>true</code> if the bundle represents a Java Project
*/
public static boolean isJavaProject(final Bundle bundle) {
// we are looking for folders "org/eclipse/papyrus" that contains classes. If not, it is not a Java project
@@ -82,7 +83,7 @@ public class BundleTestsUtils { /**
*
* @return
- * the list of the Papyrus features
+ * the list of the Papyrus features
*/
public static List<Feature> getPapyrusFeature() {
final List<Feature> features = new ArrayList<Feature>();
diff --git a/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/BundlesTests.java b/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/BundlesTests.java index dd1d6c0e8fc..2f84f073f3c 100644 --- a/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/BundlesTests.java +++ b/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/BundlesTests.java @@ -43,7 +43,6 @@ import org.osgi.framework.Bundle; * @author VL222926
*
*/
-@SuppressWarnings("restriction")
public class BundlesTests extends AbstractPapyrusTest {
// Transform the version number to the regex format
@@ -475,27 +474,6 @@ public class BundlesTests extends AbstractPapyrusTest { }
/**
- * This test verify that the plugin contains pdoc file
- */
- @NotImplemented("Documentation file is not mandatory")
- @Test
- public void documentationFileTest() {
- String message = null;
- int nb = 0;
- for (final Bundle bundle : BundleTestsUtils.getPapyrusBundles()) {
- final URL res = bundle.getResource("plugin.pdoc"); //$NON-NLS-1$
- if (res == null) {
- nb++;
- if (message == null) {
- message = "No file plugin.pdoc found for:"; //$NON-NLS-1$
- }
- message += NLS.bind("\n - {0}", bundle.getSymbolicName()); //$NON-NLS-1$
- }
- }
- Assert.assertNull(nb + " problems! " + message, message); //$NON-NLS-1$
- }
-
- /**
* verify that the field PLUGIN_ID is equals to the plugin name
*/
@Test
|