diff options
author | Michael Keppler | 2018-11-22 06:57:23 +0000 |
---|---|---|
committer | Matthias Sohn | 2018-11-22 09:21:25 +0000 |
commit | 0ef9c59cbb90eede5053c749c40c9e968f72868b (patch) | |
tree | eefe8633eb6734876f5c87fc19abc9a4b2f28d5a | |
parent | 78a301cdfc9a14601b081f15971cb0ee028ded01 (diff) | |
download | egit-github-0ef9c59cbb90eede5053c749c40c9e968f72868b.tar.gz egit-github-0ef9c59cbb90eede5053c749c40c9e968f72868b.tar.xz egit-github-0ef9c59cbb90eede5053c749c40c9e968f72868b.zip |
Update Orbit to S20181120221132 for 2018-12
* update to latest Orbit drop for 2018-12 M3
Update mockito and its dependencies to latest version available in
Orbit:
* mockito 2.13.0.v20180426-1843
* net.bytebuddy.byte-buddy 1.7.9.v20180420-1519
* net.bytebuddy.byte-buddy-agent 1.7.9.v20180420-1519
* org.objenesis 2.6.0.v20180420-1519
* Update version ranges of mockito and objenesis
* Use the non-deprecated JUnit runner
* Remove some unused stubbing from a test
Change-Id: I2b6d84c71ba33df1bbf56fdfd4d38a27cdb094ba
Signed-off-by: Michael Keppler <Michael.Keppler@gmx.de>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
22 files changed, 33 insertions, 34 deletions
diff --git a/org.eclipse.egit.github.core.tests/META-INF/MANIFEST.MF b/org.eclipse.egit.github.core.tests/META-INF/MANIFEST.MF index d36f5f84..4e0ddde5 100644 --- a/org.eclipse.egit.github.core.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.github.core.tests/META-INF/MANIFEST.MF @@ -13,10 +13,11 @@ Import-Package: com.google.gson;version="[1.6.0,3.0.0]", org.eclipse.egit.github.core.event;version="[5.2.0,5.3.0)", org.eclipse.egit.github.core.service;version="[5.2.0,5.3.0)", org.eclipse.egit.github.core.util;version="[5.2.0,5.3.0)", - org.mockito;version="[1.8.4,2.0.0)", - org.mockito.runners;version="[1.8.4,2.0.0)", - org.mockito.stubbing;version="[1.8.4,2.0.0)" + org.mockito;version="[2.13.0,3.0.0)", + org.mockito.junit;version="2.13.0", + org.mockito.runners;version="[2.13.0,3.0.0)", + org.mockito.stubbing;version="[2.13.0,3.0.0)" Require-Bundle: org.junit;bundle-version="[4.8.1,5.0.0)", org.hamcrest;bundle-version="[1.1.0,2.0.0)", - org.objenesis;bundle-version="[1.0.0,2.0.0)" + org.objenesis;bundle-version="[2.6.0,3.0.0)" Bundle-Vendor: %providerName diff --git a/org.eclipse.egit.github.core.tests/src/org/eclipse/egit/github/core/tests/CollaboratorServiceTest.java b/org.eclipse.egit.github.core.tests/src/org/eclipse/egit/github/core/tests/CollaboratorServiceTest.java index 8bc1a12b..2721a88b 100644 --- a/org.eclipse.egit.github.core.tests/src/org/eclipse/egit/github/core/tests/CollaboratorServiceTest.java +++ b/org.eclipse.egit.github.core.tests/src/org/eclipse/egit/github/core/tests/CollaboratorServiceTest.java @@ -28,7 +28,7 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; /** * Unit tests of {@link CollaboratorService} diff --git a/org.eclipse.egit.github.core.tests/src/org/eclipse/egit/github/core/tests/CommitServiceTest.java b/org.eclipse.egit.github.core.tests/src/org/eclipse/egit/github/core/tests/CommitServiceTest.java index a1e8f36b..4b0e0ed6 100644 --- a/org.eclipse.egit.github.core.tests/src/org/eclipse/egit/github/core/tests/CommitServiceTest.java +++ b/org.eclipse.egit.github.core.tests/src/org/eclipse/egit/github/core/tests/CommitServiceTest.java @@ -36,7 +36,7 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; /** * Unit tests of {@link CommitService} diff --git a/org.eclipse.egit.github.core.tests/src/org/eclipse/egit/github/core/tests/ContentsServiceTest.java b/org.eclipse.egit.github.core.tests/src/org/eclipse/egit/github/core/tests/ContentsServiceTest.java index e7e2fe8b..2ce4f00c 100644 --- a/org.eclipse.egit.github.core.tests/src/org/eclipse/egit/github/core/tests/ContentsServiceTest.java +++ b/org.eclipse.egit.github.core.tests/src/org/eclipse/egit/github/core/tests/ContentsServiceTest.java @@ -27,7 +27,7 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; /** * Unit tests of {@link ContentsService} diff --git a/org.eclipse.egit.github.core.tests/src/org/eclipse/egit/github/core/tests/DataServiceTest.java b/org.eclipse.egit.github.core.tests/src/org/eclipse/egit/github/core/tests/DataServiceTest.java index 7dbc2f6f..2f485e24 100644 --- a/org.eclipse.egit.github.core.tests/src/org/eclipse/egit/github/core/tests/DataServiceTest.java +++ b/org.eclipse.egit.github.core.tests/src/org/eclipse/egit/github/core/tests/DataServiceTest.java @@ -38,7 +38,7 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; /** * Unit tests of {@link DataService} diff --git a/org.eclipse.egit.github.core.tests/src/org/eclipse/egit/github/core/tests/DeployKeyServiceTest.java b/org.eclipse.egit.github.core.tests/src/org/eclipse/egit/github/core/tests/DeployKeyServiceTest.java index fc9ecc0f..66b53405 100644 --- a/org.eclipse.egit.github.core.tests/src/org/eclipse/egit/github/core/tests/DeployKeyServiceTest.java +++ b/org.eclipse.egit.github.core.tests/src/org/eclipse/egit/github/core/tests/DeployKeyServiceTest.java @@ -29,7 +29,7 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; /** * Unit tests of {@link DeployKeyService} diff --git a/org.eclipse.egit.github.core.tests/src/org/eclipse/egit/github/core/tests/DownloadServiceTest.java b/org.eclipse.egit.github.core.tests/src/org/eclipse/egit/github/core/tests/DownloadServiceTest.java index 6f63071d..4eaa179c 100644 --- a/org.eclipse.egit.github.core.tests/src/org/eclipse/egit/github/core/tests/DownloadServiceTest.java +++ b/org.eclipse.egit.github.core.tests/src/org/eclipse/egit/github/core/tests/DownloadServiceTest.java @@ -31,7 +31,7 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; /** * Unit tests of {@link DownloadService} diff --git a/org.eclipse.egit.github.core.tests/src/org/eclipse/egit/github/core/tests/EventServiceTest.java b/org.eclipse.egit.github.core.tests/src/org/eclipse/egit/github/core/tests/EventServiceTest.java index 31b5fbab..09bf4297 100644 --- a/org.eclipse.egit.github.core.tests/src/org/eclipse/egit/github/core/tests/EventServiceTest.java +++ b/org.eclipse.egit.github.core.tests/src/org/eclipse/egit/github/core/tests/EventServiceTest.java @@ -15,14 +15,11 @@ package org.eclipse.egit.github.core.tests; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -import static org.mockito.Matchers.any; -import static org.mockito.Mockito.doReturn; import java.io.IOException; import org.eclipse.egit.github.core.RepositoryId; import org.eclipse.egit.github.core.client.GitHubClient; -import org.eclipse.egit.github.core.client.GitHubRequest; import org.eclipse.egit.github.core.client.GitHubResponse; import org.eclipse.egit.github.core.client.PageIterator; import org.eclipse.egit.github.core.event.Event; @@ -31,7 +28,7 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; /** * Unit tests of {@link EventService} @@ -54,7 +51,6 @@ public class EventServiceTest { */ @Before public void before() throws IOException { - doReturn(response).when(gitHubClient).get(any(GitHubRequest.class)); eventService = new EventService(gitHubClient); } diff --git a/org.eclipse.egit.github.core.tests/src/org/eclipse/egit/github/core/tests/GistServiceTest.java b/org.eclipse.egit.github.core.tests/src/org/eclipse/egit/github/core/tests/GistServiceTest.java index 49ef9b9e..b33cfc47 100644 --- a/org.eclipse.egit.github.core.tests/src/org/eclipse/egit/github/core/tests/GistServiceTest.java +++ b/org.eclipse.egit.github.core.tests/src/org/eclipse/egit/github/core/tests/GistServiceTest.java @@ -36,7 +36,7 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; /** * Unit tests of {@link GistService} diff --git a/org.eclipse.egit.github.core.tests/src/org/eclipse/egit/github/core/tests/IssueServiceTest.java b/org.eclipse.egit.github.core.tests/src/org/eclipse/egit/github/core/tests/IssueServiceTest.java index ebeb3807..d63cb29e 100644 --- a/org.eclipse.egit.github.core.tests/src/org/eclipse/egit/github/core/tests/IssueServiceTest.java +++ b/org.eclipse.egit.github.core.tests/src/org/eclipse/egit/github/core/tests/IssueServiceTest.java @@ -38,7 +38,7 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; /** * Unit tests of {@link IssueService} diff --git a/org.eclipse.egit.github.core.tests/src/org/eclipse/egit/github/core/tests/LabelServiceTest.java b/org.eclipse.egit.github.core.tests/src/org/eclipse/egit/github/core/tests/LabelServiceTest.java index 07ed472f..ee4b19a9 100644 --- a/org.eclipse.egit.github.core.tests/src/org/eclipse/egit/github/core/tests/LabelServiceTest.java +++ b/org.eclipse.egit.github.core.tests/src/org/eclipse/egit/github/core/tests/LabelServiceTest.java @@ -33,7 +33,7 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; /** * Unit tests of {@link LabelService} diff --git a/org.eclipse.egit.github.core.tests/src/org/eclipse/egit/github/core/tests/MarkdownServiceTest.java b/org.eclipse.egit.github.core.tests/src/org/eclipse/egit/github/core/tests/MarkdownServiceTest.java index aec20921..c7ae3f87 100644 --- a/org.eclipse.egit.github.core.tests/src/org/eclipse/egit/github/core/tests/MarkdownServiceTest.java +++ b/org.eclipse.egit.github.core.tests/src/org/eclipse/egit/github/core/tests/MarkdownServiceTest.java @@ -28,7 +28,7 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; /** * Unit tests of {@link MarkdownService} diff --git a/org.eclipse.egit.github.core.tests/src/org/eclipse/egit/github/core/tests/MilestoneServiceTest.java b/org.eclipse.egit.github.core.tests/src/org/eclipse/egit/github/core/tests/MilestoneServiceTest.java index 646b8dfa..d5cf5b83 100644 --- a/org.eclipse.egit.github.core.tests/src/org/eclipse/egit/github/core/tests/MilestoneServiceTest.java +++ b/org.eclipse.egit.github.core.tests/src/org/eclipse/egit/github/core/tests/MilestoneServiceTest.java @@ -29,7 +29,7 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; /** * Unit tests of {@link MilestoneService} diff --git a/org.eclipse.egit.github.core.tests/src/org/eclipse/egit/github/core/tests/OAuthServiceTest.java b/org.eclipse.egit.github.core.tests/src/org/eclipse/egit/github/core/tests/OAuthServiceTest.java index 216a6607..6735836c 100644 --- a/org.eclipse.egit.github.core.tests/src/org/eclipse/egit/github/core/tests/OAuthServiceTest.java +++ b/org.eclipse.egit.github.core.tests/src/org/eclipse/egit/github/core/tests/OAuthServiceTest.java @@ -31,7 +31,7 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; /** * Unit tests of {@link OAuthService} diff --git a/org.eclipse.egit.github.core.tests/src/org/eclipse/egit/github/core/tests/OrganizationServiceTest.java b/org.eclipse.egit.github.core.tests/src/org/eclipse/egit/github/core/tests/OrganizationServiceTest.java index ac58e8e6..4c163171 100644 --- a/org.eclipse.egit.github.core.tests/src/org/eclipse/egit/github/core/tests/OrganizationServiceTest.java +++ b/org.eclipse.egit.github.core.tests/src/org/eclipse/egit/github/core/tests/OrganizationServiceTest.java @@ -30,7 +30,7 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; /** * Unit test of {@link OrganizationService} diff --git a/org.eclipse.egit.github.core.tests/src/org/eclipse/egit/github/core/tests/PullRequestServiceTest.java b/org.eclipse.egit.github.core.tests/src/org/eclipse/egit/github/core/tests/PullRequestServiceTest.java index a37fd4ae..e8569b6d 100644 --- a/org.eclipse.egit.github.core.tests/src/org/eclipse/egit/github/core/tests/PullRequestServiceTest.java +++ b/org.eclipse.egit.github.core.tests/src/org/eclipse/egit/github/core/tests/PullRequestServiceTest.java @@ -35,7 +35,7 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; /** * Unit tests of {@link PullRequestService} diff --git a/org.eclipse.egit.github.core.tests/src/org/eclipse/egit/github/core/tests/RepositoryServiceTest.java b/org.eclipse.egit.github.core.tests/src/org/eclipse/egit/github/core/tests/RepositoryServiceTest.java index 7484f6ef..dbd39311 100644 --- a/org.eclipse.egit.github.core.tests/src/org/eclipse/egit/github/core/tests/RepositoryServiceTest.java +++ b/org.eclipse.egit.github.core.tests/src/org/eclipse/egit/github/core/tests/RepositoryServiceTest.java @@ -34,7 +34,7 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; /** * Unit tests of {@link RepositoryService} diff --git a/org.eclipse.egit.github.core.tests/src/org/eclipse/egit/github/core/tests/StargazerServiceTest.java b/org.eclipse.egit.github.core.tests/src/org/eclipse/egit/github/core/tests/StargazerServiceTest.java index b5c1749a..e6c5fbf7 100644 --- a/org.eclipse.egit.github.core.tests/src/org/eclipse/egit/github/core/tests/StargazerServiceTest.java +++ b/org.eclipse.egit.github.core.tests/src/org/eclipse/egit/github/core/tests/StargazerServiceTest.java @@ -33,7 +33,7 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; /** * Unit tests of {@link StargazerService} diff --git a/org.eclipse.egit.github.core.tests/src/org/eclipse/egit/github/core/tests/TeamServiceTest.java b/org.eclipse.egit.github.core.tests/src/org/eclipse/egit/github/core/tests/TeamServiceTest.java index ea5c6044..1aee516e 100644 --- a/org.eclipse.egit.github.core.tests/src/org/eclipse/egit/github/core/tests/TeamServiceTest.java +++ b/org.eclipse.egit.github.core.tests/src/org/eclipse/egit/github/core/tests/TeamServiceTest.java @@ -36,7 +36,7 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; /** * Unit tests of {@link TeamService} diff --git a/org.eclipse.egit.github.core.tests/src/org/eclipse/egit/github/core/tests/UserServiceTest.java b/org.eclipse.egit.github.core.tests/src/org/eclipse/egit/github/core/tests/UserServiceTest.java index 3f291924..7ec6fc43 100644 --- a/org.eclipse.egit.github.core.tests/src/org/eclipse/egit/github/core/tests/UserServiceTest.java +++ b/org.eclipse.egit.github.core.tests/src/org/eclipse/egit/github/core/tests/UserServiceTest.java @@ -29,7 +29,7 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; /** * Unit tests of {@link UserService} diff --git a/org.eclipse.mylyn.github-feature/github.target b/org.eclipse.mylyn.github-feature/github.target index 6792d332..63ca8535 100644 --- a/org.eclipse.mylyn.github-feature/github.target +++ b/org.eclipse.mylyn.github-feature/github.target @@ -6,10 +6,12 @@ <location includeAllPlatforms="false" includeMode="planner" includeSource="true" type="InstallableUnit"> <unit id="org.hamcrest" version="1.1.0.v20090501071000"/> <unit id="com.google.gson" version="2.8.2.v20180104-1110"/> -<unit id="org.mockito" version="1.8.4.v201303031500"/> -<unit id="org.objenesis" version="1.0.0.v201505121915"/> +<unit id="org.mockito" version="2.13.0.v20180426-1843"/> +<unit id="net.bytebuddy.byte-buddy" version="1.7.9.v20180420-1519"/> +<unit id="net.bytebuddy.byte-buddy-agent" version="1.7.9.v20180420-1519"/> +<unit id="org.objenesis" version="2.6.0.v20180420-1519"/> <unit id="org.junit" version="4.12.0.v201504281640"/> -<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/S20180829155938/repository/"/> +<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/S20181120221132/repository/"/> </location> <location includeAllPlatforms="false" includeMode="planner" includeSource="true" type="InstallableUnit"> <unit id="org.eclipse.egit.feature.group" version="0.0.0"/> diff --git a/org.eclipse.mylyn.github.tests/META-INF/MANIFEST.MF b/org.eclipse.mylyn.github.tests/META-INF/MANIFEST.MF index 534c8d27..145dfed6 100644 --- a/org.eclipse.mylyn.github.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.mylyn.github.tests/META-INF/MANIFEST.MF @@ -11,10 +11,10 @@ Require-Bundle: org.eclipse.jface.text;bundle-version="[3.5.0,4.0.0)", org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)", org.junit;bundle-version="[4.8.1,5.0.0)", org.hamcrest;bundle-version="[1.1.0,2.0.0)", - org.objenesis;bundle-version="[1.0.0,2.0.0)" + org.objenesis;bundle-version="[2.6.0,3.0.0)" Bundle-Vendor: Eclipse EGit Import-Package: org.eclipse.mylyn.internal.github.core;version="[5.2.0,5.3.0)", org.eclipse.mylyn.internal.github.ui.issue;version="[5.2.0,5.3.0)", - org.mockito;version="[1.8.4,2.0.0)", - org.mockito.runners;version="[1.8.4,2.0.0)", - org.mockito.stubbing;version="[1.8.4,2.0.0)" + org.mockito;version="[2.13.0,3.0.0)", + org.mockito.runners;version="[2.13.0,3.0.0)", + org.mockito.stubbing;version="[2.13.0,3.0.0)" |