Repository: deltaspike Updated Branches: refs/heads/master 1815fc827 -> 3063a7693
DELTASPIKE-761 disable mock-support for producers per default Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/61333b1e Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/61333b1e Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/61333b1e Branch: refs/heads/master Commit: 61333b1e6258ef10d36f8a60da5b8964eb5fb05e Parents: 1815fc8 Author: gpetracek <[email protected]> Authored: Thu Oct 30 22:11:23 2014 +0100 Committer: gpetracek <[email protected]> Committed: Thu Oct 30 22:11:23 2014 +0100 ---------------------------------------------------------------------- .../testcontrol/impl/mock/DefaultMockFilter.java | 19 +++++++++++++++++++ .../META-INF/apache-deltaspike.properties | 1 + 2 files changed, 20 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/deltaspike/blob/61333b1e/deltaspike/modules/test-control/impl/src/main/java/org/apache/deltaspike/testcontrol/impl/mock/DefaultMockFilter.java ---------------------------------------------------------------------- diff --git a/deltaspike/modules/test-control/impl/src/main/java/org/apache/deltaspike/testcontrol/impl/mock/DefaultMockFilter.java b/deltaspike/modules/test-control/impl/src/main/java/org/apache/deltaspike/testcontrol/impl/mock/DefaultMockFilter.java index 7b64f15..d3ead30 100644 --- a/deltaspike/modules/test-control/impl/src/main/java/org/apache/deltaspike/testcontrol/impl/mock/DefaultMockFilter.java +++ b/deltaspike/modules/test-control/impl/src/main/java/org/apache/deltaspike/testcontrol/impl/mock/DefaultMockFilter.java @@ -18,9 +18,12 @@ */ package org.apache.deltaspike.testcontrol.impl.mock; +import org.apache.deltaspike.core.api.config.ConfigResolver; import org.apache.deltaspike.testcontrol.spi.mock.MockFilter; +import javax.enterprise.inject.Produces; import javax.enterprise.inject.spi.Annotated; +import javax.enterprise.inject.spi.AnnotatedField; import javax.enterprise.inject.spi.AnnotatedMember; import javax.enterprise.inject.spi.AnnotatedMethod; import javax.enterprise.inject.spi.AnnotatedType; @@ -45,6 +48,11 @@ public class DefaultMockFilter implements MockFilter @Override public boolean isMockedImplementationSupported(BeanManager beanManager, Annotated annotated) { + if (!isMockSupportEnabled(annotated)) + { + return false; + } + Class origin = null; if (annotated instanceof AnnotatedType) { @@ -78,6 +86,17 @@ public class DefaultMockFilter implements MockFilter return origin != null && !isInternalPackage(origin.getPackage().getName()); } + protected boolean isMockSupportEnabled(Annotated annotated) + { + if ((annotated instanceof AnnotatedMethod || annotated instanceof AnnotatedField) && + annotated.getAnnotation(Produces.class) != null) + { + return Boolean.parseBoolean(ConfigResolver.getPropertyValue( + "deltaspike.testcontrol.mock-support.allow_mocked_producers", Boolean.FALSE.toString())); + } + return true; + } + protected boolean isEjbOrAnnotatedTypeWithInterceptorAnnotation(BeanManager beanManager, Set<Annotation> annotations, String origin) http://git-wip-us.apache.org/repos/asf/deltaspike/blob/61333b1e/deltaspike/modules/test-control/impl/src/test/resources/META-INF/apache-deltaspike.properties ---------------------------------------------------------------------- diff --git a/deltaspike/modules/test-control/impl/src/test/resources/META-INF/apache-deltaspike.properties b/deltaspike/modules/test-control/impl/src/test/resources/META-INF/apache-deltaspike.properties index d299861..b3c1764 100644 --- a/deltaspike/modules/test-control/impl/src/test/resources/META-INF/apache-deltaspike.properties +++ b/deltaspike/modules/test-control/impl/src/test/resources/META-INF/apache-deltaspike.properties @@ -15,4 +15,5 @@ # specific language governing permissions and limitations # under the License. +deltaspike.testcontrol.mock-support.allow_mocked_producers=true org.apache.deltaspike.core.spi.activation.ClassDeactivator=org.apache.deltaspike.test.testcontrol.InternalTestClassDeactivator
