Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQuentin Le Menez2017-03-22 14:13:48 +0000
committerGerrit Code Review @ Eclipse.org2017-03-24 10:55:32 +0000
commit172c9b0b63ba3be2c93ff710a8b7b4d288db633e (patch)
tree6eb2a5d47555479616ed503c322554f1ef9d6c6b /tests/junit/plugins/uml/decoratormodel
parent28f1f7a11c28f8e416afdc7bac212f2275d0c85f (diff)
downloadorg.eclipse.papyrus-172c9b0b63ba3be2c93ff710a8b7b4d288db633e.tar.gz
org.eclipse.papyrus-172c9b0b63ba3be2c93ff710a8b7b4d288db633e.tar.xz
org.eclipse.papyrus-172c9b0b63ba3be2c93ff710a8b7b4d288db633e.zip
[releng] [oxygen] Update guava dependencies to 21.0.0
- Update target definitions to the latest orbit repository and set guava dependecy to 21.0.0 - Update MANIFEST.MF guava version references to 21.0.0 throughout the repository - regenerate the target platforms - update the sdk feature.xml to point on guava 21.0.0.v20170206-1425 from guava 15.0.0.v201403281430 - modified manifests and java classes to fit the new API - ameneded the tests on guava version targets in the manifests Change-Id: I7d15679cd28585f6ea517466e70bc0848dd3179d Signed-off-by: Quentin Le Menez <quentin.lemenez@cea.fr>
Diffstat (limited to 'tests/junit/plugins/uml/decoratormodel')
-rw-r--r--tests/junit/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.controlmode.tests/META-INF/MANIFEST.MF2
-rw-r--r--tests/junit/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.tests/META-INF/MANIFEST.MF2
-rw-r--r--tests/junit/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.tests/src/org/eclipse/papyrus/uml/decoratormodel/internal/resource/index/tests/ProfileIndexTest.java6
3 files changed, 5 insertions, 5 deletions
diff --git a/tests/junit/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.controlmode.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.controlmode.tests/META-INF/MANIFEST.MF
index 7b0ae05a10a..f77391c593c 100644
--- a/tests/junit/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.controlmode.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.controlmode.tests/META-INF/MANIFEST.MF
@@ -16,7 +16,7 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.papyrus.junit.utils;bundle-version="1.2.0",
org.eclipse.papyrus.junit.framework;bundle-version="1.2.0",
org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)",
- com.google.guava;bundle-version="15.0.0",
+ com.google.guava;bundle-version="21.0.0",
org.eclipse.core.expressions;bundle-version="3.4.600",
org.eclipse.papyrus.infra.services.controlmode;bundle-version="1.2.0",
org.eclipse.papyrus.uml.decoratormodel.controlmode;bundle-version="1.2.0"
diff --git a/tests/junit/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.tests/META-INF/MANIFEST.MF
index 20828c11762..a1519fb1968 100644
--- a/tests/junit/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.tests/META-INF/MANIFEST.MF
@@ -16,7 +16,7 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.papyrus.junit.utils;bundle-version="1.2.0",
org.eclipse.papyrus.junit.framework;bundle-version="1.2.0",
org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)",
- com.google.guava;bundle-version="15.0.0",
+ com.google.guava;bundle-version="21.0.0",
org.eclipse.core.expressions;bundle-version="3.4.600",
org.eclipse.papyrus.uml.modelrepair;bundle-version="1.2.0"
Export-Package: org.eclipse.papyrus.uml.decoratormodel.helper.tests,
diff --git a/tests/junit/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.tests/src/org/eclipse/papyrus/uml/decoratormodel/internal/resource/index/tests/ProfileIndexTest.java b/tests/junit/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.tests/src/org/eclipse/papyrus/uml/decoratormodel/internal/resource/index/tests/ProfileIndexTest.java
index 34a7a676372..cfc70a75d57 100644
--- a/tests/junit/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.tests/src/org/eclipse/papyrus/uml/decoratormodel/internal/resource/index/tests/ProfileIndexTest.java
+++ b/tests/junit/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.tests/src/org/eclipse/papyrus/uml/decoratormodel/internal/resource/index/tests/ProfileIndexTest.java
@@ -56,7 +56,7 @@ public class ProfileIndexTest {
IProfileIndex index = registry.getService(IProfileIndex.class);
ListenableFuture<Set<URI>> futureProfileURIs = index.getAppliedProfiles(project.getURI("testmodel.uml"));
- Set<URI> profileURIs = trimFragments(Futures.get(futureProfileURIs, 1L, TimeUnit.MINUTES, ServiceException.class));
+ Set<URI> profileURIs = trimFragments(Futures.getChecked(futureProfileURIs, ServiceException.class, 1L, TimeUnit.MINUTES));
Set<URI> expected = ImmutableSet.of(
project.getURI("profile/profile1.profile.uml"), // an externally applied profile
@@ -70,7 +70,7 @@ public class ProfileIndexTest {
IProfileIndex index = registry.getService(IProfileIndex.class);
ListenableFuture<Set<URI>> futureProfileURIs = index.getAppliedProfiles(project.getURI("profile/profile1.profile.uml"));
- Set<URI> profileURIs = trimFragments(Futures.get(futureProfileURIs, 1L, TimeUnit.MINUTES, ServiceException.class));
+ Set<URI> profileURIs = trimFragments(Futures.getChecked(futureProfileURIs, ServiceException.class, 1L, TimeUnit.MINUTES));
assertThat(profileURIs, is(Collections.singleton(URI.createURI(UMLResource.ECORE_PROFILE_URI))));
}
@@ -80,7 +80,7 @@ public class ProfileIndexTest {
IProfileIndex index = registry.getService(IProfileIndex.class);
ListenableFuture<Set<URI>> futureProfileURIs = index.getAppliedProfiles(project.getURI("package2.decorator.uml"));
- Set<URI> profileURIs = trimFragments(Futures.get(futureProfileURIs, 1L, TimeUnit.MINUTES, ServiceException.class));
+ Set<URI> profileURIs = trimFragments(Futures.getChecked(futureProfileURIs, ServiceException.class, 1L, TimeUnit.MINUTES));
Set<URI> expected = Collections.emptySet(); // We don't index these as user models, but as decorators only
assertThat(profileURIs, is(expected));

Back to the top