Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id CE87C200C28 for ; Mon, 13 Mar 2017 16:27:32 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id CD566160B60; Mon, 13 Mar 2017 15:27:32 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id F0CA2160B8E for ; Mon, 13 Mar 2017 16:27:31 +0100 (CET) Received: (qmail 8843 invoked by uid 500); 13 Mar 2017 15:27:31 -0000 Mailing-List: contact commits-help@polygene.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@polygene.apache.org Delivered-To: mailing list commits@polygene.apache.org Received: (qmail 8647 invoked by uid 99); 13 Mar 2017 15:27:29 -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; Mon, 13 Mar 2017 15:27:29 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 5281FDFF12; Mon, 13 Mar 2017 15:27:29 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: paulmerlin@apache.org To: commits@polygene.apache.org Date: Mon, 13 Mar 2017 15:27:30 -0000 Message-Id: <468c54ec725846a58716c20b71eae8dd@git.apache.org> In-Reply-To: <89fdd29d44af45b68baab882e90884e6@git.apache.org> References: <89fdd29d44af45b68baab882e90884e6@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/3] polygene-java git commit: Add some coverage for Initializable archived-at: Mon, 13 Mar 2017 15:27:32 -0000 Add some coverage for Initializable Project: http://git-wip-us.apache.org/repos/asf/polygene-java/repo Commit: http://git-wip-us.apache.org/repos/asf/polygene-java/commit/9a52edf4 Tree: http://git-wip-us.apache.org/repos/asf/polygene-java/tree/9a52edf4 Diff: http://git-wip-us.apache.org/repos/asf/polygene-java/diff/9a52edf4 Branch: refs/heads/develop Commit: 9a52edf4333fedd59b2e8d652f8e7dde13e18f72 Parents: 3570a91 Author: Paul Merlin Authored: Mon Mar 13 16:25:58 2017 +0100 Committer: Paul Merlin Committed: Mon Mar 13 16:25:58 2017 +0100 ---------------------------------------------------------------------- .../runtime/mixin/InitializableTest.java | 162 +++++++++++++++++-- 1 file changed, 149 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/polygene-java/blob/9a52edf4/core/runtime/src/test/java/org/apache/polygene/runtime/mixin/InitializableTest.java ---------------------------------------------------------------------- diff --git a/core/runtime/src/test/java/org/apache/polygene/runtime/mixin/InitializableTest.java b/core/runtime/src/test/java/org/apache/polygene/runtime/mixin/InitializableTest.java index d7edfaf..cc5e054 100644 --- a/core/runtime/src/test/java/org/apache/polygene/runtime/mixin/InitializableTest.java +++ b/core/runtime/src/test/java/org/apache/polygene/runtime/mixin/InitializableTest.java @@ -20,11 +20,15 @@ package org.apache.polygene.runtime.mixin; +import org.apache.polygene.api.injection.scope.This; +import org.apache.polygene.api.unitofwork.UnitOfWork; +import org.apache.polygene.test.EntityTestAssembler; +import org.apache.polygene.test.util.NotYetImplemented; +import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; -import org.apache.polygene.api.composite.TransientComposite; import org.apache.polygene.api.mixin.Initializable; import org.apache.polygene.api.mixin.Mixins; -import org.apache.polygene.bootstrap.AssemblyException; import org.apache.polygene.bootstrap.ModuleAssembly; import org.apache.polygene.test.AbstractPolygeneTest; @@ -34,58 +38,190 @@ import static org.junit.Assert.assertThat; /** * Test of Initializable interface */ -public class InitializableTest - extends AbstractPolygeneTest +public class InitializableTest extends AbstractPolygeneTest { public void assemble( ModuleAssembly module ) - throws AssemblyException { module.objects( TestObject.class ); - module.transients( TestComposite.class ); + module.transients( TestComposite.class, NoMethod.class ); + module.values( TestComposite.class ); + module.services( TestComposite.class ); + module.entities( TestComposite.class ); + new EntityTestAssembler().assemble( module ); } @Test - public void givenCompositeWithInitializableMixinWhenInstantiatedThenInvokeInitialize() + public void givenTransientWithInitializableMixinWhenInstantiatedThenInvokeInitialize() { TestComposite instance = transientBuilderFactory.newTransient( TestComposite.class ); assertThat( "mixin has been initialized", instance.ok(), equalTo( true ) ); } @Test + public void givenValueWithInitializableMixinWhenInstantiatedThenInvokeInitialize() + { + TestComposite instance = valueBuilderFactory.newValue( TestComposite.class ); + assertThat( "mixin has been initialized", instance.ok(), equalTo( true ) ); + } + + @Test + public void givenServiceWithInitializableMixinWhenInstantiatedThenInvokeInitialize() + { + TestComposite instance = serviceFinder.findService( TestComposite.class ).get(); + assertThat( "mixin has been initialized", instance.ok(), equalTo( true ) ); + } + + @Test + public void givenEntityWithInitializableMixinWhenInstantiatedThenInvokeInitialize() + { + try( UnitOfWork uow = unitOfWorkFactory.newUnitOfWork() ) + { + TestComposite instance = uow.newEntity( TestComposite.class ); + assertThat( "mixin has been initialized", instance.ok(), equalTo( true ) ); + } + } + + @Test public void givenObjectImplementingInitializableWhenInstantiatedThenInvokeInitialize() { TestObject instance = objectFactory.newObject( TestObject.class ); assertThat( "object has been initialized", instance.ok(), equalTo( true ) ); } + @NotYetImplemented( reason = "Mixin of types with no method are not scrutinized for Initializable implementation" ) + @Test + public void givenTypeWithNoMethodsAndInitializableMixinWhenInstantiatedThenInvokeInitialize() + { + NoMethod instance = transientBuilderFactory.newTransient( NoMethod.class ); + assertThat( "mixin has been initialized", noMethodMixinOk, equalTo( true ) ); + } + @Mixins( TestMixin.class ) - public interface TestComposite - extends TransientComposite + public interface TestComposite extends ComposedInitializable + { + boolean ok(); + } + + public abstract static class TestMixin implements TestComposite, Initializable + { + boolean ok = false; + + @This + ComposedInitializable composedInitializable; + + @This + PrivateInitializable privateInitializable; + + @Override + public void initialize() + { + ok = true; + } + + @Override + public boolean ok() + { + return ok && composedInitializable.composedOk() && privateInitializable.ok(); + } + } + + @Mixins( ComposedInitializableMixin.class ) + public interface ComposedInitializable + { + boolean composedOk(); + } + + public static class ComposedInitializableMixin implements ComposedInitializable, Initializable + { + boolean ok = false; + + @Override + public void initialize() + { + ok = true; + } + + @Override + public boolean composedOk() + { + return ok; + } + } + + @Mixins( PrivateInitializableMixin.class ) + public interface PrivateInitializable { boolean ok(); } - public abstract static class TestMixin - implements TestComposite, Initializable + public static class PrivateInitializableMixin implements PrivateInitializable, Initializable { + @This + NestedInitializable nestedInitializable; + boolean ok = false; + @Override public void initialize() { ok = true; } + @Override public boolean ok() { + return ok && nestedInitializable.nestedOk(); + } + } + + @Mixins( NestedInitializableMixin.class ) + public interface NestedInitializable + { + boolean nestedOk(); + } + + public static class NestedInitializableMixin implements NestedInitializable, Initializable + { + boolean ok = false; + + @Override + public void initialize() + { + ok = true; + } + + @Override + public boolean nestedOk() + { return ok; } } - public static class TestObject - implements Initializable + static boolean noMethodMixinOk; + + @Before + public void resetNoMethodMixinStaticState() + { + noMethodMixinOk = false; + } + + @Mixins( NoMethodMixin.class ) + public interface NoMethod {} + + public static class NoMethodMixin implements Initializable + { + @Override + public void initialize() + { + noMethodMixinOk = true; + } + } + + public static class TestObject implements Initializable { boolean ok = false; + @Override public void initialize() { ok = true;