This is an automated email from the ASF dual-hosted git repository. sseifert pushed a commit to branch feature/SLING-7803-junit5 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-osgi-mock.git
commit 20c940ffdd4dd66b042183083d8d46644b425294 Author: sseifert <[email protected]> AuthorDate: Mon Aug 6 14:40:36 2018 +0200 SLING-7803 update to latest mockito version, update dependencies --- core/pom.xml | 32 +++++++++++++++------- .../sling/testing/mock/osgi/OsgiMetadataUtil.java | 2 +- ...ckBundleContextDynamicReferencesOsgiR6Test.java | 2 +- .../MockBundleContextDynamicReferencesTest.java | 2 +- ...ockBundleContextStaticGreedyReferencesTest.java | 2 +- .../testing/mock/osgi/MockBundleContextTest.java | 4 +-- .../testing/mock/osgi/MockEventAdminTest.java | 10 +++---- .../mock/osgi/context/ContextPluginsTest.java | 2 +- .../testing/mock/osgi/junit/OsgiContextTest.java | 2 +- 9 files changed, 35 insertions(+), 23 deletions(-) diff --git a/core/pom.xml b/core/pom.xml index 3a49e92..e8d3e49 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -35,22 +35,21 @@ <description>Mock implementation of selected OSGi APIs.</description> <dependencies> - + <dependency> <groupId>org.osgi</groupId> <artifactId>org.osgi.annotation.versioning</artifactId> <scope>provided</scope> </dependency> - <dependency> <groupId>org.osgi</groupId> <artifactId>osgi.core</artifactId> - <scope>compile</scope> + <scope>provided</scope> </dependency> <dependency> <groupId>org.osgi</groupId> <artifactId>osgi.cmpn</artifactId> - <scope>compile</scope> + <scope>provided</scope> </dependency> <dependency> @@ -63,7 +62,7 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> - <version>3.0.1</version> + <version>3.3.2</version> <scope>compile</scope> </dependency> <dependency> @@ -151,8 +150,8 @@ <dependency> <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> - <version>1.9.5</version> + <artifactId>mockito-core</artifactId> + <version>2.19.1</version> <scope>test</scope> </dependency> <dependency> @@ -168,16 +167,29 @@ </dependency> </dependencies> - + <build> <plugins> + <!-- Publish test artifact --> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>test-jar</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> <groupId>org.apache.felix</groupId> <artifactId>maven-bundle-plugin</artifactId> <extensions>true</extensions> </plugin> - + <plugin> <groupId>org.apache.rat</groupId> <artifactId>apache-rat-plugin</artifactId> @@ -253,5 +265,5 @@ </plugins> </build> - + </project> diff --git a/core/src/main/java/org/apache/sling/testing/mock/osgi/OsgiMetadataUtil.java b/core/src/main/java/org/apache/sling/testing/mock/osgi/OsgiMetadataUtil.java index 1e0b8d3..1bee861 100644 --- a/core/src/main/java/org/apache/sling/testing/mock/osgi/OsgiMetadataUtil.java +++ b/core/src/main/java/org/apache/sling/testing/mock/osgi/OsgiMetadataUtil.java @@ -254,7 +254,7 @@ final class OsgiMetadataUtil { * @return Cleaned up class name */ public static final String cleanupClassName(String className) { - return StringUtils.substringBefore(className, "$$Enhancer"); + return StringUtils.substringBefore(StringUtils.substringBefore(className, "$MockitoMock$"), "$$Enhancer"); } private static String getComponentName(Class clazz, Document metadata) { diff --git a/core/src/test/java/org/apache/sling/testing/mock/osgi/MockBundleContextDynamicReferencesOsgiR6Test.java b/core/src/test/java/org/apache/sling/testing/mock/osgi/MockBundleContextDynamicReferencesOsgiR6Test.java index 9de52ce..a23fd9a 100644 --- a/core/src/test/java/org/apache/sling/testing/mock/osgi/MockBundleContextDynamicReferencesOsgiR6Test.java +++ b/core/src/test/java/org/apache/sling/testing/mock/osgi/MockBundleContextDynamicReferencesOsgiR6Test.java @@ -32,7 +32,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; import org.osgi.framework.BundleContext; import org.osgi.framework.ServiceRegistration; diff --git a/core/src/test/java/org/apache/sling/testing/mock/osgi/MockBundleContextDynamicReferencesTest.java b/core/src/test/java/org/apache/sling/testing/mock/osgi/MockBundleContextDynamicReferencesTest.java index 4fcd531..5437e23 100644 --- a/core/src/test/java/org/apache/sling/testing/mock/osgi/MockBundleContextDynamicReferencesTest.java +++ b/core/src/test/java/org/apache/sling/testing/mock/osgi/MockBundleContextDynamicReferencesTest.java @@ -32,7 +32,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; import org.osgi.framework.BundleContext; import org.osgi.framework.ServiceRegistration; diff --git a/core/src/test/java/org/apache/sling/testing/mock/osgi/MockBundleContextStaticGreedyReferencesTest.java b/core/src/test/java/org/apache/sling/testing/mock/osgi/MockBundleContextStaticGreedyReferencesTest.java index a78ad3c..503b0c4 100644 --- a/core/src/test/java/org/apache/sling/testing/mock/osgi/MockBundleContextStaticGreedyReferencesTest.java +++ b/core/src/test/java/org/apache/sling/testing/mock/osgi/MockBundleContextStaticGreedyReferencesTest.java @@ -32,7 +32,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; import org.osgi.framework.BundleContext; import org.osgi.framework.ServiceReference; import org.osgi.framework.ServiceRegistration; diff --git a/core/src/test/java/org/apache/sling/testing/mock/osgi/MockBundleContextTest.java b/core/src/test/java/org/apache/sling/testing/mock/osgi/MockBundleContextTest.java index 0359040..dc425b0 100644 --- a/core/src/test/java/org/apache/sling/testing/mock/osgi/MockBundleContextTest.java +++ b/core/src/test/java/org/apache/sling/testing/mock/osgi/MockBundleContextTest.java @@ -25,7 +25,7 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; @@ -38,7 +38,7 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; import org.osgi.framework.BundleEvent; diff --git a/core/src/test/java/org/apache/sling/testing/mock/osgi/MockEventAdminTest.java b/core/src/test/java/org/apache/sling/testing/mock/osgi/MockEventAdminTest.java index e8004d0..9e1ca1d 100644 --- a/core/src/test/java/org/apache/sling/testing/mock/osgi/MockEventAdminTest.java +++ b/core/src/test/java/org/apache/sling/testing/mock/osgi/MockEventAdminTest.java @@ -23,8 +23,8 @@ import static org.junit.Assert.assertEquals; import java.util.ArrayList; import java.util.Dictionary; import java.util.List; +import java.util.Objects; -import org.apache.commons.lang3.ObjectUtils; import org.apache.sling.testing.mock.osgi.junit.OsgiContext; import org.junit.Before; import org.junit.Rule; @@ -110,10 +110,10 @@ public class MockEventAdminTest { // wait until result is as expected (with timeout) boolean expectedResult = false; while (!expectedResult) { - expectedResult = ObjectUtils.equals(ImmutableList.of(), eventHandler1.getReceivedEvents()) - && ObjectUtils.equals(ImmutableList.of(EVENT_SAMPLE_2), eventHandler12.getReceivedEvents()) - && ObjectUtils.equals(ImmutableList.of(EVENT_SAMPLE_2), eventHandlerSampleAll.getReceivedEvents()) - && ObjectUtils.equals(ImmutableList.of(EVENT_SAMPLE_2, EVENT_OTHER_3), eventHandlerAll.getReceivedEvents()); + expectedResult = Objects.equals(ImmutableList.of(), eventHandler1.getReceivedEvents()) + && Objects.equals(ImmutableList.of(EVENT_SAMPLE_2), eventHandler12.getReceivedEvents()) + && Objects.equals(ImmutableList.of(EVENT_SAMPLE_2), eventHandlerSampleAll.getReceivedEvents()) + && Objects.equals(ImmutableList.of(EVENT_SAMPLE_2, EVENT_OTHER_3), eventHandlerAll.getReceivedEvents()); } } diff --git a/core/src/test/java/org/apache/sling/testing/mock/osgi/context/ContextPluginsTest.java b/core/src/test/java/org/apache/sling/testing/mock/osgi/context/ContextPluginsTest.java index 1a97478..e3983fb 100644 --- a/core/src/test/java/org/apache/sling/testing/mock/osgi/context/ContextPluginsTest.java +++ b/core/src/test/java/org/apache/sling/testing/mock/osgi/context/ContextPluginsTest.java @@ -27,7 +27,7 @@ import org.apache.sling.testing.mock.osgi.junit.OsgiContext; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; @RunWith(MockitoJUnitRunner.class) @SuppressWarnings({"unchecked","null"}) diff --git a/core/src/test/java/org/apache/sling/testing/mock/osgi/junit/OsgiContextTest.java b/core/src/test/java/org/apache/sling/testing/mock/osgi/junit/OsgiContextTest.java index e374516..9c6c401 100644 --- a/core/src/test/java/org/apache/sling/testing/mock/osgi/junit/OsgiContextTest.java +++ b/core/src/test/java/org/apache/sling/testing/mock/osgi/junit/OsgiContextTest.java @@ -26,7 +26,7 @@ import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; @RunWith(MockitoJUnitRunner.class) @SuppressWarnings("null")
