Skip to content

Commit

Permalink
Tests use mockito via Import-Package
Browse files Browse the repository at this point in the history
As Platform has adopted upstream Mockito bundle with different
Bundle-SymbolicName, switch to Import-Package to allow different
providers.
  • Loading branch information
mickaelistria committed Jan 3, 2022
1 parent 53ce5cf commit f57b599
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,13 @@ Bundle-RequiredExecutionEnvironment: JavaSE-11
Fragment-Host: org.eclipse.tycho.p2.maven.repository
Require-Bundle: org.junit,
org.hamcrest.core,
org.eclipse.equinox.p2.publisher,
org.mockito
org.eclipse.equinox.p2.publisher
Import-Package: org.eclipse.tycho.locking.facade,
org.eclipse.tycho.repository.local.testutil,
org.eclipse.tycho.repository.streaming.testutil,
org.eclipse.tycho.repository.testutil,
org.eclipse.tycho.test.util
org.eclipse.tycho.test.util,
org.mockito,
org.mockito.stubbing,
org.mockito.hamcrest
Automatic-Module-Name: org.eclipse.tycho.p2.maven.repository.tests
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ Bundle-Version: 2.6.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-11
Fragment-Host: org.eclipse.tycho.p2.resolver.shared
Bundle-Vendor: Eclipse Tycho
Require-Bundle: org.mockito
Import-Package: org.junit,
org.junit.jupiter.api;version:="[5.6.0,6.0.0)"
Automatic-Module-Name: org.eclipse.tycho.p2.resolver.shared.tests
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,14 @@ Bundle-RequiredExecutionEnvironment: JavaSE-11
Fragment-Host: org.eclipse.tycho.p2.tools.impl
Require-Bundle: org.junit;bundle-version="[4.8.1,5.0.0)",
org.hamcrest.core,
org.eclipse.tycho.p2.resolver.impl,
org.mockito
org.eclipse.tycho.p2.resolver.impl
Bundle-Vendor: %providerName
Import-Package: org.eclipse.tycho,
org.eclipse.tycho.p2.testutil,
org.eclipse.tycho.repository.module,
org.eclipse.tycho.repository.p2base.metadata,
org.eclipse.tycho.test.util
org.eclipse.tycho.test.util,
org.mockito,
org.mockito.stubbing,
org.mockito.invocation
Automatic-Module-Name: org.eclipse.tycho.p2.tools.tests

0 comments on commit f57b599

Please sign in to comment.