TOMEE-2138 MockitoExtensionBean must implement Prioritized otherwise they won't get activated. That was clarified in the EG a bit ago.
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/05619f3f Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/05619f3f Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/05619f3f Branch: refs/heads/fb_tomee8 Commit: 05619f3fb16cef2bcd40ac46c74a15d9ccf21024 Parents: b06d4b7 Author: Mark Struberg <strub...@apache.org> Authored: Mon Oct 23 18:23:08 2017 +0200 Committer: Mark Struberg <strub...@apache.org> Committed: Mon Oct 23 18:23:08 2017 +0200 ---------------------------------------------------------------------- .../java/org/apache/openejb/mockito/MockitoExtension.java | 9 ++++++++- utils/pom.xml | 8 ++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/05619f3f/utils/openejb-mockito/src/main/java/org/apache/openejb/mockito/MockitoExtension.java ---------------------------------------------------------------------- diff --git a/utils/openejb-mockito/src/main/java/org/apache/openejb/mockito/MockitoExtension.java b/utils/openejb-mockito/src/main/java/org/apache/openejb/mockito/MockitoExtension.java index 359e85d..76c32d5 100644 --- a/utils/openejb-mockito/src/main/java/org/apache/openejb/mockito/MockitoExtension.java +++ b/utils/openejb-mockito/src/main/java/org/apache/openejb/mockito/MockitoExtension.java @@ -30,6 +30,8 @@ import javax.enterprise.inject.spi.Bean; import javax.enterprise.inject.spi.BeforeBeanDiscovery; import javax.enterprise.inject.spi.Extension; import javax.enterprise.inject.spi.InjectionPoint; +import javax.enterprise.inject.spi.Prioritized; +import javax.interceptor.Interceptor; import java.lang.annotation.Annotation; import java.lang.reflect.Proxy; import java.lang.reflect.Type; @@ -59,7 +61,7 @@ public class MockitoExtension implements Extension { } } - private static class MockBean<T> implements Bean<T> { + private static class MockBean<T> implements Bean<T>, Prioritized { protected static final Set<Annotation> QUALIFIERS = new HashSet<Annotation>(2) {{ add(DEFAULT_ANNOTATION); add(ANY_ANNOTATION); @@ -135,6 +137,11 @@ public class MockitoExtension implements Extension { public void destroy(final T instance, final CreationalContext<T> context) { // no-op } + + @Override + public int getPriority() { + return Interceptor.Priority.PLATFORM_AFTER+1000; + } } private static class NamedMockBean<T> extends MockBean<T> { http://git-wip-us.apache.org/repos/asf/tomee/blob/05619f3f/utils/pom.xml ---------------------------------------------------------------------- diff --git a/utils/pom.xml b/utils/pom.xml index 98c15cc..51bf61a 100644 --- a/utils/pom.xml +++ b/utils/pom.xml @@ -37,4 +37,12 @@ <module>log4j2-tomee</module> <module>livereload-tomee</module> </modules> + + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> + </dependencies> + </project>
