deltaspike-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gpetra...@apache.org
Subject [2/2] git commit: DELTASPIKE-762 disable mock-support for beans per default
Date Thu, 30 Oct 2014 21:27:57 GMT
DELTASPIKE-762 disable mock-support for beans per default

 (unified config - see DELTASPIKE-761)


Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/3063a769
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/3063a769
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/3063a769

Branch: refs/heads/master
Commit: 3063a76937a978699050c956a927cf440290e4f1
Parents: 61333b1
Author: gpetracek <gpetracek@apache.org>
Authored: Thu Oct 30 22:14:11 2014 +0100
Committer: gpetracek <gpetracek@apache.org>
Committed: Thu Oct 30 22:14:35 2014 +0100

----------------------------------------------------------------------
 .../deltaspike/testcontrol/impl/mock/DefaultMockFilter.java    | 6 +++++-
 .../src/test/resources/META-INF/apache-deltaspike.properties   | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/deltaspike/blob/3063a769/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 d3ead30..30ca751 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
@@ -94,7 +94,11 @@ public class DefaultMockFilter implements MockFilter
             return Boolean.parseBoolean(ConfigResolver.getPropertyValue(
                 "deltaspike.testcontrol.mock-support.allow_mocked_producers", Boolean.FALSE.toString()));
         }
-        return true;
+        else
+        {
+            return Boolean.parseBoolean(ConfigResolver.getPropertyValue(
+                "deltaspike.testcontrol.mock-support.allow_mocked_beans", Boolean.FALSE.toString()));
+        }
     }
 
     protected boolean isEjbOrAnnotatedTypeWithInterceptorAnnotation(BeanManager beanManager,

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/3063a769/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 b3c1764..6dca7fd 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,5 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
+deltaspike.testcontrol.mock-support.allow_mocked_beans=true
 deltaspike.testcontrol.mock-support.allow_mocked_producers=true
 org.apache.deltaspike.core.spi.activation.ClassDeactivator=org.apache.deltaspike.test.testcontrol.InternalTestClassDeactivator


Mime
View raw message