Return-Path: X-Original-To: apmail-deltaspike-commits-archive@www.apache.org Delivered-To: apmail-deltaspike-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 5D41D10169 for ; Sun, 15 Dec 2013 19:46:32 +0000 (UTC) Received: (qmail 12520 invoked by uid 500); 15 Dec 2013 19:46:32 -0000 Delivered-To: apmail-deltaspike-commits-archive@deltaspike.apache.org Received: (qmail 12461 invoked by uid 500); 15 Dec 2013 19:46:32 -0000 Mailing-List: contact commits-help@deltaspike.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@deltaspike.apache.org Delivered-To: mailing list commits@deltaspike.apache.org Received: (qmail 12451 invoked by uid 99); 15 Dec 2013 19:46:31 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 15 Dec 2013 19:46:31 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 763818B9AFE; Sun, 15 Dec 2013 19:46:31 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: gpetracek@apache.org To: commits@deltaspike.apache.org Date: Sun, 15 Dec 2013 19:46:32 -0000 Message-Id: <1370ab77d6d346a6a40ff13a00412baf@git.apache.org> In-Reply-To: <19830b9815864d60a474d3db221d807e@git.apache.org> References: <19830b9815864d60a474d3db221d807e@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] git commit: DELTASPIKE-466 improved external-container handling DELTASPIKE-466 improved external-container handling Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/7ec889fe Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/7ec889fe Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/7ec889fe Branch: refs/heads/master Commit: 7ec889fe2e6085fc03b96ec491da3a89376dc6c4 Parents: 7f14a66 Author: gpetracek Authored: Sun Dec 15 20:25:15 2013 +0100 Committer: gpetracek Committed: Sun Dec 15 20:44:09 2013 +0100 ---------------------------------------------------------------------- .../deltaspike/testcontrol/api/TestControl.java | 1 + .../testcontrol/api/junit/CdiTestRunner.java | 34 ++++++++++++++------ 2 files changed, 25 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/deltaspike/blob/7ec889fe/deltaspike/modules/test-control/api/src/main/java/org/apache/deltaspike/testcontrol/api/TestControl.java ---------------------------------------------------------------------- diff --git a/deltaspike/modules/test-control/api/src/main/java/org/apache/deltaspike/testcontrol/api/TestControl.java b/deltaspike/modules/test-control/api/src/main/java/org/apache/deltaspike/testcontrol/api/TestControl.java index c492c97..baba3cb 100644 --- a/deltaspike/modules/test-control/api/src/main/java/org/apache/deltaspike/testcontrol/api/TestControl.java +++ b/deltaspike/modules/test-control/api/src/main/java/org/apache/deltaspike/testcontrol/api/TestControl.java @@ -55,6 +55,7 @@ public @interface TestControl /** * Requires additional service-loader config + * Currently only supported on class-level */ boolean startExternalContainers() default true; } http://git-wip-us.apache.org/repos/asf/deltaspike/blob/7ec889fe/deltaspike/modules/test-control/api/src/main/java/org/apache/deltaspike/testcontrol/api/junit/CdiTestRunner.java ---------------------------------------------------------------------- diff --git a/deltaspike/modules/test-control/api/src/main/java/org/apache/deltaspike/testcontrol/api/junit/CdiTestRunner.java b/deltaspike/modules/test-control/api/src/main/java/org/apache/deltaspike/testcontrol/api/junit/CdiTestRunner.java index 9b331a9..af9d560 100644 --- a/deltaspike/modules/test-control/api/src/main/java/org/apache/deltaspike/testcontrol/api/junit/CdiTestRunner.java +++ b/deltaspike/modules/test-control/api/src/main/java/org/apache/deltaspike/testcontrol/api/junit/CdiTestRunner.java @@ -632,24 +632,38 @@ public class CdiTestRunner extends BlockJUnit4ClassRunner private void onScopeStarted(Class scopeClass) { - if (this.externalContainers != null) + List externalContainerList = collectExternalContainers(this); + + for (ExternalContainer externalContainer : externalContainerList) { - for (ExternalContainer externalContainer : this.externalContainers) - { - externalContainer.startScope(scopeClass); - } + externalContainer.startScope(scopeClass); } } private void onScopeStopped(Class scopeClass) { - if (this.externalContainers != null) + List externalContainerList = collectExternalContainers(this); + + for (ExternalContainer externalContainer : externalContainerList) { - for (ExternalContainer externalContainer : this.externalContainers) - { - externalContainer.stopScope(scopeClass); - } + externalContainer.stopScope(scopeClass); + } + } + + private static List collectExternalContainers(ContainerAwareTestContext testContext) + { + List result = new ArrayList(); + + if (testContext.externalContainers != null) + { + result.addAll(testContext.externalContainers); + } + + if (testContext.parent != null) + { + result.addAll(collectExternalContainers(testContext.parent)); } + return result; } } }