Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPauline DEVILLE2022-11-10 09:48:45 +0000
committerQuentin Le Menez2022-11-14 10:48:53 +0000
commit543997375ac728486e9a1474fe92b76d18da1a98 (patch)
treef0f83f4de85027ae2310656169c7723cf25ef594 /tests/junit
parent533557fdcaee863752a336b3ec34b092a7694246 (diff)
downloadorg.eclipse.papyrus-543997375ac728486e9a1474fe92b76d18da1a98.tar.gz
org.eclipse.papyrus-543997375ac728486e9a1474fe92b76d18da1a98.tar.xz
org.eclipse.papyrus-543997375ac728486e9a1474fe92b76d18da1a98.zip
Bug 580313 - [Releng] Update bundles tests
Change-Id: I4086762e4405666471ebee49bd7c8596aecf0465 Signed-off-by: Pauline DEVILLE <pauline.deville@cea.fr>
Diffstat (limited to 'tests/junit')
-rwxr-xr-xtests/junit/framework/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/BundlesTests.java19
1 files changed, 13 insertions, 6 deletions
diff --git a/tests/junit/framework/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/BundlesTests.java b/tests/junit/framework/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/BundlesTests.java
index a18899b02f6..b96027152d4 100755
--- a/tests/junit/framework/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/BundlesTests.java
+++ b/tests/junit/framework/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/BundlesTests.java
@@ -67,6 +67,10 @@ public class BundlesTests extends AbstractPapyrusTest {
private static final String GLAZED_LIST_VERSION = "1.9.0";//$NON-NLS-1$
+ private static final String GUAVA_VERSION = "30.1.0"; //$NON-NLS-1$
+
+ private static final String GSON_VERSION = "2.9.1"; //$NON-NLS-1$
+
private static final String UML2_UML_VERSION_RANGE = "bundle-version=\"[5.3.0,6.0.0)\"";//$NON-NLS-1$
@Condition
@@ -218,7 +222,7 @@ public class BundlesTests extends AbstractPapyrusTest {
*/
@Test
public void batikDependencyVersionTest() {
- testPapyrusDependencies2("org.apache.batik", BATIK_VERSION);//$NON-NLS-1$
+ testPapyrusDependencies("org.apache.batik", BATIK_VERSION, Collections.emptyList());//$NON-NLS-1$
}
@Test
@@ -228,17 +232,22 @@ public class BundlesTests extends AbstractPapyrusTest {
@Test
public void glazedListDependencyVersionTest() {
- testPapyrusDependencies2("ca.odell.glazedlists", GLAZED_LIST_VERSION);//$NON-NLS-1$
+ testPapyrusDependencies("ca.odell.glazedlists", GLAZED_LIST_VERSION, Collections.emptyList());//$NON-NLS-1$
}
@Test
public void guavaDependencyVersionTest() {
- testPapyrusDependencies2("com.google.guava", "30.1.0");//$NON-NLS-1$ //$NON-NLS-2$
+ testPapyrusDependencies("com.google.guava", GUAVA_VERSION, Collections.emptyList());//$NON-NLS-1$
}
@Test
public void injectDependencyVersionTest() {
- testPapyrusDependencies2("com.google.inject", INJECT_VERSION);//$NON-NLS-1$
+ testPapyrusDependencies("com.google.inject", INJECT_VERSION, Collections.emptyList());//$NON-NLS-1$
+ }
+
+ @Test
+ public void gsonDependencyVersionTest() {
+ testPapyrusDependencies("com.google.gson", GSON_VERSION, Collections.emptyList());//$NON-NLS-1$
}
@Test
@@ -448,7 +457,6 @@ public class BundlesTests extends AbstractPapyrusTest {
possibleIds.add("ID");//$NON-NLS-1$
possibleIds.add("PLUGIN_ID");//$NON-NLS-1$
int nbError = 0;
- int nbWarning = 0;
for (final Bundle current : BundleTestsUtils.getPapyrusBundles()) {
if (!BundleTestsUtils.isJavaProject(current)) {
continue; // useful for oep.infra.gmfdiag.css.theme for example
@@ -473,7 +481,6 @@ public class BundlesTests extends AbstractPapyrusTest {
}
} else {
// Never happens. An exception is thrown.
- nbWarning++;
warningMessage.append(NLS.bind("The activator of {0} has no field named PLUGIN_ID.\n", current.getSymbolicName())); //$NON-NLS-1$
}
} catch (final Exception e) {

Back to the top