Trivial fixes for tests failing under Java 8 -> types should be public
Project: http://git-wip-us.apache.org/repos/asf/zest-qi4j/repo Commit: http://git-wip-us.apache.org/repos/asf/zest-qi4j/commit/d7159b14 Tree: http://git-wip-us.apache.org/repos/asf/zest-qi4j/tree/d7159b14 Diff: http://git-wip-us.apache.org/repos/asf/zest-qi4j/diff/d7159b14 Branch: refs/heads/master Commit: d7159b14c6d49be1f47244dfdbaf07b15963751a Parents: 298397e Author: Paul Merlin <[email protected]> Authored: Sat Apr 4 13:50:20 2015 +0200 Committer: Paul Merlin <[email protected]> Committed: Sat Apr 4 13:50:20 2015 +0200 ---------------------------------------------------------------------- .../composite/CompositeModelResolverTest.java | 4 ++-- .../instantiation/ServiceInstantiationTests.java | 18 ++++-------------- .../transients/TransientBuilderFactoryTest.java | 2 +- .../org/qi4j/runtime/instantiation/My.properties | 1 + .../runtime/instantiation/MyService.properties | 1 - 5 files changed, 8 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/d7159b14/core/runtime/src/test/java/org/qi4j/runtime/composite/CompositeModelResolverTest.java ---------------------------------------------------------------------- diff --git a/core/runtime/src/test/java/org/qi4j/runtime/composite/CompositeModelResolverTest.java b/core/runtime/src/test/java/org/qi4j/runtime/composite/CompositeModelResolverTest.java index a8f852b..560e0bb 100644 --- a/core/runtime/src/test/java/org/qi4j/runtime/composite/CompositeModelResolverTest.java +++ b/core/runtime/src/test/java/org/qi4j/runtime/composite/CompositeModelResolverTest.java @@ -135,12 +135,12 @@ public class CompositeModelResolverTest } } - private static interface TestComposite1 + public static interface TestComposite1 extends TransientComposite, TestA, TestB { } - private static interface TestComposite2 + public static interface TestComposite2 extends Composite, TestC, TestD { } http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/d7159b14/core/runtime/src/test/java/org/qi4j/runtime/instantiation/ServiceInstantiationTests.java ---------------------------------------------------------------------- diff --git a/core/runtime/src/test/java/org/qi4j/runtime/instantiation/ServiceInstantiationTests.java b/core/runtime/src/test/java/org/qi4j/runtime/instantiation/ServiceInstantiationTests.java index 48ced5e..1ec1c3b 100644 --- a/core/runtime/src/test/java/org/qi4j/runtime/instantiation/ServiceInstantiationTests.java +++ b/core/runtime/src/test/java/org/qi4j/runtime/instantiation/ServiceInstantiationTests.java @@ -20,11 +20,9 @@ package org.qi4j.runtime.instantiation; import org.junit.Assert; import org.junit.Test; import org.qi4j.api.configuration.Configuration; -import org.qi4j.api.configuration.ConfigurationComposite; import org.qi4j.api.injection.scope.This; import org.qi4j.api.mixin.Mixins; import org.qi4j.api.property.Property; -import org.qi4j.api.service.ServiceComposite; import org.qi4j.api.service.ServiceReference; import org.qi4j.bootstrap.AssemblyException; import org.qi4j.bootstrap.ModuleAssembly; @@ -35,11 +33,12 @@ public class ServiceInstantiationTests extends AbstractQi4jTest { + @Override public void assemble( ModuleAssembly module ) throws AssemblyException { - module.entities( MyConfigurationEntity.class ); - module.services( MyService.class ); + module.entities( MyConfiguration.class ); + module.services( My.class ); new EntityTestAssembler().assemble( module ); } @@ -52,21 +51,11 @@ public class ServiceInstantiationTests } @Mixins( MyMixin.class ) - private interface MyService - extends My, ServiceComposite - { - } - public interface My { String doSomething(); } - public interface MyConfigurationEntity - extends MyConfiguration, ConfigurationComposite - { - } - public interface MyConfiguration { Property<String> data(); @@ -78,6 +67,7 @@ public class ServiceInstantiationTests @This Configuration<MyConfiguration> config; + @Override public String doSomething() { return config.get().data().get(); http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/d7159b14/core/runtime/src/test/java/org/qi4j/runtime/transients/TransientBuilderFactoryTest.java ---------------------------------------------------------------------- diff --git a/core/runtime/src/test/java/org/qi4j/runtime/transients/TransientBuilderFactoryTest.java b/core/runtime/src/test/java/org/qi4j/runtime/transients/TransientBuilderFactoryTest.java index c0a6584..85c002c 100644 --- a/core/runtime/src/test/java/org/qi4j/runtime/transients/TransientBuilderFactoryTest.java +++ b/core/runtime/src/test/java/org/qi4j/runtime/transients/TransientBuilderFactoryTest.java @@ -208,7 +208,7 @@ public class TransientBuilderFactoryTest AnyData data; } - interface AnyData + public interface AnyData { @UseDefaults Property<String> foo(); http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/d7159b14/core/runtime/src/test/resources/org/qi4j/runtime/instantiation/My.properties ---------------------------------------------------------------------- diff --git a/core/runtime/src/test/resources/org/qi4j/runtime/instantiation/My.properties b/core/runtime/src/test/resources/org/qi4j/runtime/instantiation/My.properties new file mode 100644 index 0000000..b62e816 --- /dev/null +++ b/core/runtime/src/test/resources/org/qi4j/runtime/instantiation/My.properties @@ -0,0 +1 @@ +data=HabbaZout \ No newline at end of file http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/d7159b14/core/runtime/src/test/resources/org/qi4j/runtime/instantiation/MyService.properties ---------------------------------------------------------------------- diff --git a/core/runtime/src/test/resources/org/qi4j/runtime/instantiation/MyService.properties b/core/runtime/src/test/resources/org/qi4j/runtime/instantiation/MyService.properties deleted file mode 100644 index b62e816..0000000 --- a/core/runtime/src/test/resources/org/qi4j/runtime/instantiation/MyService.properties +++ /dev/null @@ -1 +0,0 @@ -data=HabbaZout \ No newline at end of file
