Return-Path: X-Original-To: apmail-zest-commits-archive@minotaur.apache.org Delivered-To: apmail-zest-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C54E718BEA for ; Tue, 9 Feb 2016 22:43:59 +0000 (UTC) Received: (qmail 20808 invoked by uid 500); 9 Feb 2016 22:43:59 -0000 Delivered-To: apmail-zest-commits-archive@zest.apache.org Received: (qmail 20788 invoked by uid 500); 9 Feb 2016 22:43:59 -0000 Mailing-List: contact commits-help@zest.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@zest.apache.org Delivered-To: mailing list commits@zest.apache.org Received: (qmail 20779 invoked by uid 99); 9 Feb 2016 22:43:59 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 09 Feb 2016 22:43:59 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 6B742E6991; Tue, 9 Feb 2016 22:43:59 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: paulmerlin@apache.org To: commits@zest.apache.org Date: Tue, 09 Feb 2016 22:44:01 -0000 Message-Id: In-Reply-To: <8fc61d929371455291b30820e3f0f37c@git.apache.org> References: <8fc61d929371455291b30820e3f0f37c@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/3] zest-java git commit: Some little more coverage for @This injection Some little more coverage for @This injection Project: http://git-wip-us.apache.org/repos/asf/zest-java/repo Commit: http://git-wip-us.apache.org/repos/asf/zest-java/commit/5f737d52 Tree: http://git-wip-us.apache.org/repos/asf/zest-java/tree/5f737d52 Diff: http://git-wip-us.apache.org/repos/asf/zest-java/diff/5f737d52 Branch: refs/heads/ZEST-132 Commit: 5f737d52fedab2d93fa73e8b7f455e74794cc559 Parents: b87b63a Author: Paul Merlin Authored: Tue Feb 9 23:35:27 2016 +0100 Committer: Paul Merlin Committed: Tue Feb 9 23:42:28 2016 +0100 ---------------------------------------------------------------------- .../runtime/injection/ThisInjectionTest.java | 56 ++++++++++++++------ 1 file changed, 39 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/zest-java/blob/5f737d52/core/runtime/src/test/java/org/apache/zest/runtime/injection/ThisInjectionTest.java ---------------------------------------------------------------------- diff --git a/core/runtime/src/test/java/org/apache/zest/runtime/injection/ThisInjectionTest.java b/core/runtime/src/test/java/org/apache/zest/runtime/injection/ThisInjectionTest.java index 7d071fd..d840a5f 100644 --- a/core/runtime/src/test/java/org/apache/zest/runtime/injection/ThisInjectionTest.java +++ b/core/runtime/src/test/java/org/apache/zest/runtime/injection/ThisInjectionTest.java @@ -83,17 +83,25 @@ public class ThisInjectionTest public static class TestMixin implements Test { - @This - Test test; + @This Test test; + @This TestPrivate testPrivate; + Test ctorTest; + TestPrivate ctorTestPrivate; - @This - TestPrivate testPrivate; + public TestMixin( @This Test test, @This TestPrivate testPrivate ) + { + ctorTest = test; + ctorTestPrivate = testPrivate; + } + @Override public boolean isInjected() { - return test != null && !testPrivate.testPrivate().get(); + return test != null && ctorTest != null && + !testPrivate.testPrivate().get() && !ctorTestPrivate.testPrivate().get(); } + @Override public String test() { return "Foo"; @@ -104,17 +112,23 @@ public class ThisInjectionTest extends ConcernOf implements Test { - @This - Test test; + @This Test test; + @This TestPrivate testPrivate; + Test ctorTest; + TestPrivate ctorTestPrivate; - @This - TestPrivate testPrivate; + public TestConcern( @This Test test, @This TestPrivate testPrivate ) + { + ctorTest = test; + ctorTestPrivate = testPrivate; + } + @Override public boolean isInjected() { - return test != null && test.test().equals( "Foo" ) && - !testPrivate.testPrivate().get() && - next.isInjected(); + return test != null && ctorTest != null && + !testPrivate.testPrivate().get() && !ctorTestPrivate.testPrivate().get() && + next.isInjected(); } } @@ -122,14 +136,22 @@ public class ThisInjectionTest extends SideEffectOf implements Test { - @This - Test test; - @This - TestPrivate testPrivate; + @This Test test; + @This TestPrivate testPrivate; + Test ctorTest; + TestPrivate ctorTestPrivate; + + public TestSideEffect( @This Test test, @This TestPrivate testPrivate ) + { + ctorTest = test; + ctorTestPrivate = testPrivate; + } + @Override public boolean isInjected() { - sideEffectInjected = test != null && !testPrivate.testPrivate().get(); + sideEffectInjected = test != null && ctorTest != null && + !testPrivate.testPrivate().get() && !ctorTestPrivate.testPrivate().get(); return false; }