Author: jdcasey Date: Thu Aug 18 02:33:53 2011 New Revision: 1158996 URL: http://svn.apache.org/viewvc?rev=1158996&view=rev Log: enabling a couple more tests (that don't work), and annotating sites to fix in the component-selection module
Modified: maven/sandbox/trunk/mae/mae-booter/src/main/java/org/apache/maven/mae/boot/embed/ComponentSelectionModule.java maven/sandbox/trunk/mae/mae-booter/src/test/java/org/apache/maven/mae/internal/container/MAEApplicationTest.java Modified: maven/sandbox/trunk/mae/mae-booter/src/main/java/org/apache/maven/mae/boot/embed/ComponentSelectionModule.java URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mae/mae-booter/src/main/java/org/apache/maven/mae/boot/embed/ComponentSelectionModule.java?rev=1158996&r1=1158995&r2=1158996&view=diff ============================================================================== --- maven/sandbox/trunk/mae/mae-booter/src/main/java/org/apache/maven/mae/boot/embed/ComponentSelectionModule.java (original) +++ maven/sandbox/trunk/mae/mae-booter/src/main/java/org/apache/maven/mae/boot/embed/ComponentSelectionModule.java Thu Aug 18 02:33:53 2011 @@ -72,6 +72,7 @@ public class ComponentSelectionModule private static final class ComponentSelectionInjector<T> implements MembersInjector<T> { + // FIXME: This is NOT being injected!! @Inject private Injector injector; Modified: maven/sandbox/trunk/mae/mae-booter/src/test/java/org/apache/maven/mae/internal/container/MAEApplicationTest.java URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mae/mae-booter/src/test/java/org/apache/maven/mae/internal/container/MAEApplicationTest.java?rev=1158996&r1=1158995&r2=1158996&view=diff ============================================================================== --- maven/sandbox/trunk/mae/mae-booter/src/test/java/org/apache/maven/mae/internal/container/MAEApplicationTest.java (original) +++ maven/sandbox/trunk/mae/mae-booter/src/test/java/org/apache/maven/mae/internal/container/MAEApplicationTest.java Thu Aug 18 02:33:53 2011 @@ -27,6 +27,9 @@ import org.apache.maven.mae.MAEException import org.apache.maven.mae.app.AbstractMAEApplication; import org.apache.maven.mae.boot.embed.MAEEmbedderBuilder; import org.apache.maven.mae.internal.container.fixture.ContainerOwner; +import org.apache.maven.mae.internal.container.fixture.DefaultSingletonOwner; +import org.apache.maven.mae.internal.container.fixture.SingletonLiteralOwner; +import org.apache.maven.mae.internal.container.fixture.SingletonOwner; import org.junit.Test; public class MAEApplicationTest @@ -82,45 +85,40 @@ public class MAEApplicationTest // // assertNull( members.get( "simple" + ComponentKey.LITERAL_SUFFIX ) ); // } - // - // @Test - // public void singletonImpliedRequirementOnComponentWithImpliedHint() - // throws Throwable - // { - // final ContainerConfiguration config = new DefaultContainerConfiguration().setClassPathScanning( "ON" ); - // - // final MAEContainer container = new MAEContainer( config, new ComponentSelector(), new InstanceRegistry() ); - // - // final DefaultSingletonOwner owner = container.lookup( DefaultSingletonOwner.class ); - // - // assertNotNull( owner.singleton() ); - // } - // - // @Test - // public void singletonNonLiteralRequirement() - // throws Throwable - // { - // final ContainerConfiguration config = new DefaultContainerConfiguration().setClassPathScanning( "ON" ); - // - // final MAEContainer container = new MAEContainer( config, new ComponentSelector(), new InstanceRegistry() ); - // - // final SingletonOwner owner = container.lookup( SingletonOwner.class ); - // - // assertNotNull( owner.singleton() ); - // } - // - // @Test - // public void singletonLiteralRequirement() - // throws Throwable - // { - // final ContainerConfiguration config = new DefaultContainerConfiguration().setClassPathScanning( "ON" ); - // - // final MAEContainer container = new MAEContainer( config, new ComponentSelector(), new InstanceRegistry() ); - // - // final SingletonLiteralOwner owner = container.lookup( SingletonLiteralOwner.class ); - // - // assertNotNull( owner.singletonLiteral() ); - // } + + @Test + public void singletonImpliedRequirementOnComponentWithImpliedHint() + throws Throwable + { + ContainerOwner owner = new ContainerOwner(); + new TestApplication().load(); + final DefaultSingletonOwner single = owner.container.lookup( DefaultSingletonOwner.class ); + + assertThat( single.singleton(), notNullValue() ); + } + + @Test + public void singletonNonLiteralRequirement() + throws Throwable + { + ContainerOwner owner = new ContainerOwner(); + new TestApplication().load(); + final SingletonOwner single = owner.container.lookup( SingletonOwner.class ); + + assertThat( single.singleton(), notNullValue() ); + } + + @Test + public void singletonLiteralRequirement() + throws Throwable + { + ContainerOwner owner = new ContainerOwner(); + new TestApplication().load(); + final SingletonLiteralOwner single = owner.container.lookup( SingletonLiteralOwner.class ); + + assertThat( single.singletonLiteral(), notNullValue() ); + } + // // @Test // public void initializableUsingRequirement()