Remove useless explicit assembly of DefaultUoWAssembler in tests
Project: http://git-wip-us.apache.org/repos/asf/polygene-java/repo Commit: http://git-wip-us.apache.org/repos/asf/polygene-java/commit/c41ebdb1 Tree: http://git-wip-us.apache.org/repos/asf/polygene-java/tree/c41ebdb1 Diff: http://git-wip-us.apache.org/repos/asf/polygene-java/diff/c41ebdb1 Branch: refs/heads/develop Commit: c41ebdb14c72bc404f85732d44577ee89cb38a76 Parents: f07b323 Author: Paul Merlin <[email protected]> Authored: Mon May 22 15:00:05 2017 +0200 Committer: Paul Merlin <[email protected]> Committed: Mon May 22 15:01:23 2017 +0200 ---------------------------------------------------------------------- .../org/apache/polygene/api/OperatorsTest.java | 2 -- .../polygene/bootstrap/ClassScannerTest.java | 3 --- .../entity/EntityBuilderWithStateTest.java | 2 -- .../runtime/entity/EntityVisibilityTest.java | 17 ++++++----------- .../ConstructorInjectionOfThisTest.java | 2 -- .../runtime/objects/ObjectVisibilityTest.java | 20 ++++++-------------- .../runtime/query/IterableQuerySourceTest.java | 14 ++++++-------- .../runtime/service/AvailableServiceTest.java | 10 ++++------ .../runtime/service/ServiceVisibilityTest.java | 18 ++++++------------ .../structure/TypeToCompositeLookupTest.java | 9 --------- .../transients/TransientVisibilityTest.java | 9 --------- .../unitofwork/PrivateEntityUnitOfWorkTest.java | 3 --- .../runtime/value/ValueComposite2Test.java | 6 ++---- .../runtime/value/ValueVisibilityTest.java | 8 -------- .../visibility/VisibilityInUnitOfWorkTest.java | 4 ---- .../polygene/test/AbstractPolygeneTest.java | 2 -- .../ElasticSearchQueryMultimoduleTest.java | 2 -- .../index/rdf/RdfNamedQueryMultimoduleTest.java | 3 --- .../index/rdf/RdfQueryMultimoduleTest.java | 4 ---- .../apache/polygene/index/rdf/RdfQueryTest.java | 2 -- .../polygene/migration/MigrationTest.java | 2 -- .../apache/polygene/library/jmx/JMXTest.java | 2 -- .../polygene/library/rest/admin/RestTest.java | 4 +--- ...taSourceConfigurationManagerServiceTest.java | 3 --- 24 files changed, 31 insertions(+), 120 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/polygene-java/blob/c41ebdb1/core/api/src/test/java/org/apache/polygene/api/OperatorsTest.java ---------------------------------------------------------------------- diff --git a/core/api/src/test/java/org/apache/polygene/api/OperatorsTest.java b/core/api/src/test/java/org/apache/polygene/api/OperatorsTest.java index 123e726..7a0da9a 100644 --- a/core/api/src/test/java/org/apache/polygene/api/OperatorsTest.java +++ b/core/api/src/test/java/org/apache/polygene/api/OperatorsTest.java @@ -36,7 +36,6 @@ import org.apache.polygene.api.value.ValueComposite; import org.apache.polygene.bootstrap.AssemblyException; import org.apache.polygene.bootstrap.ModuleAssembly; import org.apache.polygene.bootstrap.SingletonAssembler; -import org.apache.polygene.bootstrap.unitofwork.DefaultUnitOfWorkAssembler; import org.apache.polygene.test.EntityTestAssembler; import org.junit.Assert; import org.junit.Test; @@ -62,7 +61,6 @@ public class OperatorsTest module.values( TestValue.class ); module.forMixin( TestEntity.class ).declareDefaults().foo().set( "Bar" ); module.forMixin( TestValue.class ).declareDefaults().bar().set( "Xyz" ); - new DefaultUnitOfWorkAssembler().assemble( module ); } }; http://git-wip-us.apache.org/repos/asf/polygene-java/blob/c41ebdb1/core/bootstrap/src/test/java/org/apache/polygene/bootstrap/ClassScannerTest.java ---------------------------------------------------------------------- diff --git a/core/bootstrap/src/test/java/org/apache/polygene/bootstrap/ClassScannerTest.java b/core/bootstrap/src/test/java/org/apache/polygene/bootstrap/ClassScannerTest.java index f257aad..0d3e53f 100644 --- a/core/bootstrap/src/test/java/org/apache/polygene/bootstrap/ClassScannerTest.java +++ b/core/bootstrap/src/test/java/org/apache/polygene/bootstrap/ClassScannerTest.java @@ -21,7 +21,6 @@ package org.apache.polygene.bootstrap; import org.apache.polygene.api.activation.ActivationException; import org.apache.polygene.bootstrap.somepackage.Test2Value; -import org.apache.polygene.bootstrap.unitofwork.DefaultUnitOfWorkAssembler; import org.junit.Assert; import org.junit.Test; @@ -43,8 +42,6 @@ public class ClassScannerTest public void assemble( ModuleAssembly module ) throws AssemblyException { - new DefaultUnitOfWorkAssembler().assemble( module ); - // Find all classes starting from TestValue, but include only the ones that are named *Value findClasses( TestValue.class ).filter( matches( ".*Value" ) ) .forEach( module::values ); http://git-wip-us.apache.org/repos/asf/polygene-java/blob/c41ebdb1/core/runtime/src/test/java/org/apache/polygene/runtime/entity/EntityBuilderWithStateTest.java ---------------------------------------------------------------------- diff --git a/core/runtime/src/test/java/org/apache/polygene/runtime/entity/EntityBuilderWithStateTest.java b/core/runtime/src/test/java/org/apache/polygene/runtime/entity/EntityBuilderWithStateTest.java index 35539a2..8cb1aff 100644 --- a/core/runtime/src/test/java/org/apache/polygene/runtime/entity/EntityBuilderWithStateTest.java +++ b/core/runtime/src/test/java/org/apache/polygene/runtime/entity/EntityBuilderWithStateTest.java @@ -34,7 +34,6 @@ import org.apache.polygene.api.unitofwork.UnitOfWork; import org.apache.polygene.api.unitofwork.UnitOfWorkCompletionException; import org.apache.polygene.bootstrap.AssemblyException; import org.apache.polygene.bootstrap.ModuleAssembly; -import org.apache.polygene.bootstrap.unitofwork.DefaultUnitOfWorkAssembler; import org.apache.polygene.test.AbstractPolygeneTest; import org.apache.polygene.test.EntityTestAssembler; import org.junit.Test; @@ -54,7 +53,6 @@ public class EntityBuilderWithStateTest { new EntityTestAssembler().assemble( module ); module.entities( SomeEntity.class ); - new DefaultUnitOfWorkAssembler().assemble( module ); } @Test http://git-wip-us.apache.org/repos/asf/polygene-java/blob/c41ebdb1/core/runtime/src/test/java/org/apache/polygene/runtime/entity/EntityVisibilityTest.java ---------------------------------------------------------------------- diff --git a/core/runtime/src/test/java/org/apache/polygene/runtime/entity/EntityVisibilityTest.java b/core/runtime/src/test/java/org/apache/polygene/runtime/entity/EntityVisibilityTest.java index 642bb14..e2e466f 100644 --- a/core/runtime/src/test/java/org/apache/polygene/runtime/entity/EntityVisibilityTest.java +++ b/core/runtime/src/test/java/org/apache/polygene/runtime/entity/EntityVisibilityTest.java @@ -20,16 +20,11 @@ package org.apache.polygene.runtime.entity; -import org.apache.polygene.api.identity.Identity; -import org.apache.polygene.api.identity.StringIdentity; -import org.apache.polygene.api.unitofwork.UnitOfWorkFactory; -import org.apache.polygene.bootstrap.unitofwork.DefaultUnitOfWorkAssembler; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; import org.apache.polygene.api.common.Visibility; import org.apache.polygene.api.composite.TransientComposite; import org.apache.polygene.api.entity.EntityComposite; +import org.apache.polygene.api.identity.Identity; +import org.apache.polygene.api.identity.StringIdentity; import org.apache.polygene.api.injection.scope.Structure; import org.apache.polygene.api.mixin.Mixins; import org.apache.polygene.api.service.ServiceComposite; @@ -37,6 +32,7 @@ import org.apache.polygene.api.structure.Application; import org.apache.polygene.api.structure.Module; import org.apache.polygene.api.unitofwork.NoSuchEntityTypeException; import org.apache.polygene.api.unitofwork.UnitOfWork; +import org.apache.polygene.api.unitofwork.UnitOfWorkFactory; import org.apache.polygene.api.value.ValueComposite; import org.apache.polygene.bootstrap.ApplicationAssemblerAdapter; import org.apache.polygene.bootstrap.Assembler; @@ -44,6 +40,9 @@ import org.apache.polygene.bootstrap.AssemblyException; import org.apache.polygene.bootstrap.Energy4Java; import org.apache.polygene.bootstrap.ModuleAssembly; import org.apache.polygene.test.EntityTestAssembler; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; public class EntityVisibilityTest { @@ -667,7 +666,6 @@ public class EntityVisibilityTest module.entities( ModuleApplicationVisible.class ).visibleIn( Visibility.application ); module.entities( ModuleLayerVisible.class ).visibleIn( Visibility.layer ); module.entities( ModuleModuleVisible.class ).visibleIn( Visibility.module ); - new DefaultUnitOfWorkAssembler().assemble( module ); } } @@ -685,7 +683,6 @@ public class EntityVisibilityTest module.entities( BelowModuleVisible.class ).visibleIn( Visibility.module ); new EntityTestAssembler().visibleIn( Visibility.application ).assemble( module ); - new DefaultUnitOfWorkAssembler().assemble( module ); } } @@ -701,7 +698,6 @@ public class EntityVisibilityTest module.entities( AboveApplicationVisible.class ).visibleIn( Visibility.application ); module.entities( AboveLayerVisible.class ).visibleIn( Visibility.layer ); module.entities( AboveModuleVisible.class ).visibleIn( Visibility.module ); - new DefaultUnitOfWorkAssembler().assemble( module ); } } @@ -716,7 +712,6 @@ public class EntityVisibilityTest module.entities( BesideApplicationVisible.class ).visibleIn( Visibility.application ); module.entities( BesideLayerVisible.class ).visibleIn( Visibility.layer ); module.entities( BesideModuleVisible.class ).visibleIn( Visibility.module ); - new DefaultUnitOfWorkAssembler().assemble( module ); } } http://git-wip-us.apache.org/repos/asf/polygene-java/blob/c41ebdb1/core/runtime/src/test/java/org/apache/polygene/runtime/injection/ConstructorInjectionOfThisTest.java ---------------------------------------------------------------------- diff --git a/core/runtime/src/test/java/org/apache/polygene/runtime/injection/ConstructorInjectionOfThisTest.java b/core/runtime/src/test/java/org/apache/polygene/runtime/injection/ConstructorInjectionOfThisTest.java index 413b8c5..e7ecdc2 100644 --- a/core/runtime/src/test/java/org/apache/polygene/runtime/injection/ConstructorInjectionOfThisTest.java +++ b/core/runtime/src/test/java/org/apache/polygene/runtime/injection/ConstructorInjectionOfThisTest.java @@ -19,7 +19,6 @@ */ package org.apache.polygene.runtime.injection; -import org.apache.polygene.bootstrap.unitofwork.DefaultUnitOfWorkAssembler; import org.junit.Test; import org.apache.polygene.api.activation.ActivationException; import org.apache.polygene.api.common.UseDefaults; @@ -53,7 +52,6 @@ public class ConstructorInjectionOfThisTest throws AssemblyException { module.values( Does.class ).withMixins( DoesMixin.class ); - new DefaultUnitOfWorkAssembler().assemble( module ); } }; Module module = singletonAssembler.application().findModule( "Layer 1", "Module 1" ); http://git-wip-us.apache.org/repos/asf/polygene-java/blob/c41ebdb1/core/runtime/src/test/java/org/apache/polygene/runtime/objects/ObjectVisibilityTest.java ---------------------------------------------------------------------- diff --git a/core/runtime/src/test/java/org/apache/polygene/runtime/objects/ObjectVisibilityTest.java b/core/runtime/src/test/java/org/apache/polygene/runtime/objects/ObjectVisibilityTest.java index 45691e8..be787ef 100644 --- a/core/runtime/src/test/java/org/apache/polygene/runtime/objects/ObjectVisibilityTest.java +++ b/core/runtime/src/test/java/org/apache/polygene/runtime/objects/ObjectVisibilityTest.java @@ -20,16 +20,11 @@ package org.apache.polygene.runtime.objects; -import org.apache.polygene.api.identity.Identity; -import org.apache.polygene.api.identity.StringIdentity; -import org.apache.polygene.api.unitofwork.UnitOfWorkFactory; -import org.apache.polygene.bootstrap.unitofwork.DefaultUnitOfWorkAssembler; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; import org.apache.polygene.api.common.Visibility; import org.apache.polygene.api.composite.TransientComposite; import org.apache.polygene.api.entity.EntityComposite; +import org.apache.polygene.api.identity.Identity; +import org.apache.polygene.api.identity.StringIdentity; import org.apache.polygene.api.injection.scope.Structure; import org.apache.polygene.api.mixin.Mixins; import org.apache.polygene.api.object.NoSuchObjectException; @@ -37,6 +32,7 @@ import org.apache.polygene.api.service.ServiceComposite; import org.apache.polygene.api.structure.Application; import org.apache.polygene.api.structure.Module; import org.apache.polygene.api.unitofwork.UnitOfWork; +import org.apache.polygene.api.unitofwork.UnitOfWorkFactory; import org.apache.polygene.api.value.ValueComposite; import org.apache.polygene.bootstrap.ApplicationAssemblerAdapter; import org.apache.polygene.bootstrap.Assembler; @@ -44,6 +40,9 @@ import org.apache.polygene.bootstrap.AssemblyException; import org.apache.polygene.bootstrap.Energy4Java; import org.apache.polygene.bootstrap.ModuleAssembly; import org.apache.polygene.test.EntityTestAssembler; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; public class ObjectVisibilityTest { @@ -667,8 +666,6 @@ public class ObjectVisibilityTest module.objects( ModuleApplicationVisible.class ).visibleIn( Visibility.application ); module.objects( ModuleLayerVisible.class ).visibleIn( Visibility.layer ); module.objects( ModuleModuleVisible.class ).visibleIn( Visibility.module ); - - new DefaultUnitOfWorkAssembler().assemble( module ); } } @@ -686,7 +683,6 @@ public class ObjectVisibilityTest module.objects( BelowModuleVisible.class ).visibleIn( Visibility.module ); new EntityTestAssembler().visibleIn( Visibility.application ).assemble( module ); - new DefaultUnitOfWorkAssembler().assemble( module ); } } @@ -702,8 +698,6 @@ public class ObjectVisibilityTest module.objects( AboveApplicationVisible.class ).visibleIn( Visibility.application ); module.objects( AboveLayerVisible.class ).visibleIn( Visibility.layer ); module.objects( AboveModuleVisible.class ).visibleIn( Visibility.module ); - - new DefaultUnitOfWorkAssembler().assemble( module ); } } @@ -718,8 +712,6 @@ public class ObjectVisibilityTest module.objects( BesideApplicationVisible.class ).visibleIn( Visibility.application ); module.objects( BesideLayerVisible.class ).visibleIn( Visibility.layer ); module.objects( BesideModuleVisible.class ).visibleIn( Visibility.module ); - - new DefaultUnitOfWorkAssembler().assemble( module ); } } http://git-wip-us.apache.org/repos/asf/polygene-java/blob/c41ebdb1/core/runtime/src/test/java/org/apache/polygene/runtime/query/IterableQuerySourceTest.java ---------------------------------------------------------------------- diff --git a/core/runtime/src/test/java/org/apache/polygene/runtime/query/IterableQuerySourceTest.java b/core/runtime/src/test/java/org/apache/polygene/runtime/query/IterableQuerySourceTest.java index 2df68f1..d14780b 100644 --- a/core/runtime/src/test/java/org/apache/polygene/runtime/query/IterableQuerySourceTest.java +++ b/core/runtime/src/test/java/org/apache/polygene/runtime/query/IterableQuerySourceTest.java @@ -22,12 +22,8 @@ package org.apache.polygene.runtime.query; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import org.apache.polygene.api.identity.StringIdentity; -import org.apache.polygene.bootstrap.unitofwork.DefaultUnitOfWorkAssembler; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; import org.apache.polygene.api.activation.ActivationException; +import org.apache.polygene.api.identity.StringIdentity; import org.apache.polygene.api.query.Query; import org.apache.polygene.api.query.QueryBuilder; import org.apache.polygene.api.query.QueryBuilderFactory; @@ -52,9 +48,10 @@ import org.apache.polygene.runtime.query.model.entities.PetEntity; import org.apache.polygene.runtime.query.model.values.ContactValue; import org.apache.polygene.runtime.query.model.values.ContactsValue; import org.apache.polygene.test.EntityTestAssembler; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; import static org.apache.polygene.api.query.QueryExpressions.eq; import static org.apache.polygene.api.query.QueryExpressions.ge; import static org.apache.polygene.api.query.QueryExpressions.gt; @@ -67,6 +64,8 @@ import static org.apache.polygene.api.query.QueryExpressions.or; import static org.apache.polygene.api.query.QueryExpressions.orderBy; import static org.apache.polygene.api.query.QueryExpressions.property; import static org.apache.polygene.api.query.QueryExpressions.templateFor; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; public class IterableQuerySourceTest { @@ -88,7 +87,6 @@ public class IterableQuerySourceTest module.values( ContactsValue.class, ContactValue.class ); new EntityTestAssembler().assemble( module ); - new DefaultUnitOfWorkAssembler().assemble( module ); } }; uow = assembler.module().unitOfWorkFactory().newUnitOfWork(); http://git-wip-us.apache.org/repos/asf/polygene-java/blob/c41ebdb1/core/runtime/src/test/java/org/apache/polygene/runtime/service/AvailableServiceTest.java ---------------------------------------------------------------------- diff --git a/core/runtime/src/test/java/org/apache/polygene/runtime/service/AvailableServiceTest.java b/core/runtime/src/test/java/org/apache/polygene/runtime/service/AvailableServiceTest.java index 8efa667..c5e4f3b 100644 --- a/core/runtime/src/test/java/org/apache/polygene/runtime/service/AvailableServiceTest.java +++ b/core/runtime/src/test/java/org/apache/polygene/runtime/service/AvailableServiceTest.java @@ -20,8 +20,6 @@ package org.apache.polygene.runtime.service; -import org.apache.polygene.bootstrap.unitofwork.DefaultUnitOfWorkAssembler; -import org.junit.Test; import org.apache.polygene.api.activation.ActivationException; import org.apache.polygene.api.common.Optional; import org.apache.polygene.api.configuration.Configuration; @@ -38,8 +36,11 @@ import org.apache.polygene.bootstrap.AssemblyException; import org.apache.polygene.bootstrap.ModuleAssembly; import org.apache.polygene.bootstrap.SingletonAssembler; import org.apache.polygene.test.EntityTestAssembler; +import org.junit.Test; -import static org.hamcrest.CoreMatchers.*; +import static org.hamcrest.CoreMatchers.equalTo; +import static org.hamcrest.CoreMatchers.notNullValue; +import static org.hamcrest.CoreMatchers.nullValue; import static org.junit.Assert.assertThat; /** @@ -57,7 +58,6 @@ public class AvailableServiceTest throws AssemblyException { module.services( TestServiceComposite1.class ); - new DefaultUnitOfWorkAssembler().assemble( module ); } }; @@ -80,7 +80,6 @@ public class AvailableServiceTest module.entities( TestServiceConfiguration.class ); new EntityTestAssembler().assemble( module ); - new DefaultUnitOfWorkAssembler().assemble( module ); } }; @@ -109,7 +108,6 @@ public class AvailableServiceTest module.entities( TestServiceConfiguration.class ); new EntityTestAssembler().assemble( module ); - new DefaultUnitOfWorkAssembler().assemble( module ); } }; http://git-wip-us.apache.org/repos/asf/polygene-java/blob/c41ebdb1/core/runtime/src/test/java/org/apache/polygene/runtime/service/ServiceVisibilityTest.java ---------------------------------------------------------------------- diff --git a/core/runtime/src/test/java/org/apache/polygene/runtime/service/ServiceVisibilityTest.java b/core/runtime/src/test/java/org/apache/polygene/runtime/service/ServiceVisibilityTest.java index d59b6ed..84b6f43 100644 --- a/core/runtime/src/test/java/org/apache/polygene/runtime/service/ServiceVisibilityTest.java +++ b/core/runtime/src/test/java/org/apache/polygene/runtime/service/ServiceVisibilityTest.java @@ -20,16 +20,11 @@ package org.apache.polygene.runtime.service; -import org.apache.polygene.api.identity.Identity; -import org.apache.polygene.api.identity.StringIdentity; -import org.apache.polygene.api.unitofwork.UnitOfWorkFactory; -import org.apache.polygene.bootstrap.unitofwork.DefaultUnitOfWorkAssembler; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; import org.apache.polygene.api.common.Visibility; import org.apache.polygene.api.composite.TransientComposite; import org.apache.polygene.api.entity.EntityComposite; +import org.apache.polygene.api.identity.Identity; +import org.apache.polygene.api.identity.StringIdentity; import org.apache.polygene.api.injection.scope.Structure; import org.apache.polygene.api.mixin.Mixins; import org.apache.polygene.api.service.NoSuchServiceException; @@ -37,6 +32,7 @@ import org.apache.polygene.api.service.ServiceComposite; import org.apache.polygene.api.structure.Application; import org.apache.polygene.api.structure.Module; import org.apache.polygene.api.unitofwork.UnitOfWork; +import org.apache.polygene.api.unitofwork.UnitOfWorkFactory; import org.apache.polygene.api.value.ValueComposite; import org.apache.polygene.bootstrap.ApplicationAssemblerAdapter; import org.apache.polygene.bootstrap.Assembler; @@ -44,6 +40,9 @@ import org.apache.polygene.bootstrap.AssemblyException; import org.apache.polygene.bootstrap.Energy4Java; import org.apache.polygene.bootstrap.ModuleAssembly; import org.apache.polygene.test.EntityTestAssembler; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; public class ServiceVisibilityTest { @@ -666,8 +665,6 @@ public class ServiceVisibilityTest module.services( ModuleApplicationVisible.class ).visibleIn( Visibility.application ); module.services( ModuleLayerVisible.class ).visibleIn( Visibility.layer ); module.services( ModuleModuleVisible.class ).visibleIn( Visibility.module ); - - new DefaultUnitOfWorkAssembler().assemble( module ); } } @@ -685,7 +682,6 @@ public class ServiceVisibilityTest module.services( BelowModuleVisible.class ).visibleIn( Visibility.module ); new EntityTestAssembler().visibleIn( Visibility.application ).assemble( module ); - new DefaultUnitOfWorkAssembler().assemble( module ); } } @@ -701,7 +697,6 @@ public class ServiceVisibilityTest module.services( AboveApplicationVisible.class ).visibleIn( Visibility.application ); module.services( AboveLayerVisible.class ).visibleIn( Visibility.layer ); module.services( AboveModuleVisible.class ).visibleIn( Visibility.module ); - new DefaultUnitOfWorkAssembler().assemble( module ); } } @@ -716,7 +711,6 @@ public class ServiceVisibilityTest module.services( BesideApplicationVisible.class ).visibleIn( Visibility.application ); module.services( BesideLayerVisible.class ).visibleIn( Visibility.layer ); module.services( BesideModuleVisible.class ).visibleIn( Visibility.module ); - new DefaultUnitOfWorkAssembler().assemble( module ); } } http://git-wip-us.apache.org/repos/asf/polygene-java/blob/c41ebdb1/core/runtime/src/test/java/org/apache/polygene/runtime/structure/TypeToCompositeLookupTest.java ---------------------------------------------------------------------- diff --git a/core/runtime/src/test/java/org/apache/polygene/runtime/structure/TypeToCompositeLookupTest.java b/core/runtime/src/test/java/org/apache/polygene/runtime/structure/TypeToCompositeLookupTest.java index c32e2ef..3df3b38 100644 --- a/core/runtime/src/test/java/org/apache/polygene/runtime/structure/TypeToCompositeLookupTest.java +++ b/core/runtime/src/test/java/org/apache/polygene/runtime/structure/TypeToCompositeLookupTest.java @@ -33,7 +33,6 @@ import org.apache.polygene.api.unitofwork.UnitOfWorkFactory; import org.apache.polygene.bootstrap.AssemblyException; import org.apache.polygene.bootstrap.ModuleAssembly; import org.apache.polygene.bootstrap.SingletonAssembler; -import org.apache.polygene.bootstrap.unitofwork.DefaultUnitOfWorkAssembler; import org.apache.polygene.test.EntityTestAssembler; import org.junit.Test; @@ -104,7 +103,6 @@ public class TypeToCompositeLookupTest throws AssemblyException { module.objects( SomeOtherFooImpl.class ); - new DefaultUnitOfWorkAssembler().assemble( module ); } }.module(); @@ -126,7 +124,6 @@ public class TypeToCompositeLookupTest throws AssemblyException { module.objects( SomeOtherFooImpl.class, BasicFooImpl.class ); - new DefaultUnitOfWorkAssembler().assemble( module ); } }.module(); @@ -156,7 +153,6 @@ public class TypeToCompositeLookupTest throws AssemblyException { module.transients( SomeOtherFoo.class ); - new DefaultUnitOfWorkAssembler().assemble( module ); } }.module(); @@ -178,7 +174,6 @@ public class TypeToCompositeLookupTest throws AssemblyException { module.transients( SomeOtherFoo.class, BasicFoo.class ); - new DefaultUnitOfWorkAssembler().assemble( module ); } }.module(); @@ -208,7 +203,6 @@ public class TypeToCompositeLookupTest throws AssemblyException { module.values( SomeOtherFoo.class ); - new DefaultUnitOfWorkAssembler().assemble( module ); } }.module(); @@ -230,7 +224,6 @@ public class TypeToCompositeLookupTest throws AssemblyException { module.values( SomeOtherFoo.class, BasicFoo.class ); - new DefaultUnitOfWorkAssembler().assemble( module ); } }.module(); @@ -261,7 +254,6 @@ public class TypeToCompositeLookupTest { new EntityTestAssembler().assemble( module ); module.entities( SomeOtherFoo.class ); - new DefaultUnitOfWorkAssembler().assemble( module ); } }.module().unitOfWorkFactory(); @@ -304,7 +296,6 @@ public class TypeToCompositeLookupTest { new EntityTestAssembler().assemble( module ); module.entities( SomeOtherFoo.class, BasicFoo.class ); - new DefaultUnitOfWorkAssembler().assemble( module ); } }.module().unitOfWorkFactory(); http://git-wip-us.apache.org/repos/asf/polygene-java/blob/c41ebdb1/core/runtime/src/test/java/org/apache/polygene/runtime/transients/TransientVisibilityTest.java ---------------------------------------------------------------------- diff --git a/core/runtime/src/test/java/org/apache/polygene/runtime/transients/TransientVisibilityTest.java b/core/runtime/src/test/java/org/apache/polygene/runtime/transients/TransientVisibilityTest.java index 19b91e2..1231e21 100644 --- a/core/runtime/src/test/java/org/apache/polygene/runtime/transients/TransientVisibilityTest.java +++ b/core/runtime/src/test/java/org/apache/polygene/runtime/transients/TransientVisibilityTest.java @@ -40,7 +40,6 @@ import org.apache.polygene.bootstrap.Assembler; import org.apache.polygene.bootstrap.AssemblyException; import org.apache.polygene.bootstrap.Energy4Java; import org.apache.polygene.bootstrap.ModuleAssembly; -import org.apache.polygene.bootstrap.unitofwork.DefaultUnitOfWorkAssembler; import org.apache.polygene.test.EntityTestAssembler; import org.junit.After; import org.junit.Before; @@ -666,8 +665,6 @@ public class TransientVisibilityTest module.transients( ModuleApplicationVisible.class ).visibleIn( Visibility.application ); module.transients( ModuleLayerVisible.class ).visibleIn( Visibility.layer ); module.transients( ModuleModuleVisible.class ).visibleIn( Visibility.module ); - - new DefaultUnitOfWorkAssembler().assemble( module ); } } @@ -685,8 +682,6 @@ public class TransientVisibilityTest module.transients( BelowModuleVisible.class ).visibleIn( Visibility.module ); new EntityTestAssembler().visibleIn( Visibility.application ).assemble( module ); - - new DefaultUnitOfWorkAssembler().assemble( module ); } } @@ -702,8 +697,6 @@ public class TransientVisibilityTest module.transients( AboveApplicationVisible.class ).visibleIn( Visibility.application ); module.transients( AboveLayerVisible.class ).visibleIn( Visibility.layer ); module.transients( AboveModuleVisible.class ).visibleIn( Visibility.module ); - - new DefaultUnitOfWorkAssembler().assemble( module ); } } @@ -718,8 +711,6 @@ public class TransientVisibilityTest module.transients( BesideApplicationVisible.class ).visibleIn( Visibility.application ); module.transients( BesideLayerVisible.class ).visibleIn( Visibility.layer ); module.transients( BesideModuleVisible.class ).visibleIn( Visibility.module ); - - new DefaultUnitOfWorkAssembler().assemble( module ); } } http://git-wip-us.apache.org/repos/asf/polygene-java/blob/c41ebdb1/core/runtime/src/test/java/org/apache/polygene/runtime/unitofwork/PrivateEntityUnitOfWorkTest.java ---------------------------------------------------------------------- diff --git a/core/runtime/src/test/java/org/apache/polygene/runtime/unitofwork/PrivateEntityUnitOfWorkTest.java b/core/runtime/src/test/java/org/apache/polygene/runtime/unitofwork/PrivateEntityUnitOfWorkTest.java index 69775b6..21fbe92 100644 --- a/core/runtime/src/test/java/org/apache/polygene/runtime/unitofwork/PrivateEntityUnitOfWorkTest.java +++ b/core/runtime/src/test/java/org/apache/polygene/runtime/unitofwork/PrivateEntityUnitOfWorkTest.java @@ -40,7 +40,6 @@ import org.apache.polygene.api.value.ValueBuilderFactory; import org.apache.polygene.api.value.ValueComposite; import org.apache.polygene.bootstrap.Assembler; import org.apache.polygene.bootstrap.Energy4Java; -import org.apache.polygene.bootstrap.unitofwork.DefaultUnitOfWorkAssembler; import org.apache.polygene.test.EntityTestAssembler; import org.junit.Test; @@ -71,7 +70,6 @@ public class PrivateEntityUnitOfWorkTest { module -> { module.objects( PrivateEntityUnitOfWorkTest.class ); - new DefaultUnitOfWorkAssembler().assemble( module ); } } }, @@ -82,7 +80,6 @@ public class PrivateEntityUnitOfWorkTest module.entities( ProductCatalogEntity.class ).visibleIn( application ); module.values( ProductInfo.class ); new EntityTestAssembler().assemble( module ); - new DefaultUnitOfWorkAssembler().assemble( module ); } } } http://git-wip-us.apache.org/repos/asf/polygene-java/blob/c41ebdb1/core/runtime/src/test/java/org/apache/polygene/runtime/value/ValueComposite2Test.java ---------------------------------------------------------------------- diff --git a/core/runtime/src/test/java/org/apache/polygene/runtime/value/ValueComposite2Test.java b/core/runtime/src/test/java/org/apache/polygene/runtime/value/ValueComposite2Test.java index 3dbe3d8..a0820fd 100644 --- a/core/runtime/src/test/java/org/apache/polygene/runtime/value/ValueComposite2Test.java +++ b/core/runtime/src/test/java/org/apache/polygene/runtime/value/ValueComposite2Test.java @@ -20,9 +20,6 @@ package org.apache.polygene.runtime.value; import java.security.Guard; -import org.apache.polygene.bootstrap.unitofwork.DefaultUnitOfWorkAssembler; -import org.junit.Assert; -import org.junit.Test; import org.apache.polygene.api.activation.ActivationException; import org.apache.polygene.api.injection.scope.Service; import org.apache.polygene.api.injection.scope.Structure; @@ -36,6 +33,8 @@ import org.apache.polygene.api.value.ValueComposite; import org.apache.polygene.bootstrap.AssemblyException; import org.apache.polygene.bootstrap.ModuleAssembly; import org.apache.polygene.bootstrap.SingletonAssembler; +import org.junit.Assert; +import org.junit.Test; public class ValueComposite2Test { @@ -50,7 +49,6 @@ public class ValueComposite2Test { module.values( SomeValue.class ); module.services( DummyService.class ); - new DefaultUnitOfWorkAssembler().assemble( module ); } }; ValueBuilder<Some> builder = app.module().newValueBuilder( Some.class ); http://git-wip-us.apache.org/repos/asf/polygene-java/blob/c41ebdb1/core/runtime/src/test/java/org/apache/polygene/runtime/value/ValueVisibilityTest.java ---------------------------------------------------------------------- diff --git a/core/runtime/src/test/java/org/apache/polygene/runtime/value/ValueVisibilityTest.java b/core/runtime/src/test/java/org/apache/polygene/runtime/value/ValueVisibilityTest.java index 4dff8ae..4c83a45 100644 --- a/core/runtime/src/test/java/org/apache/polygene/runtime/value/ValueVisibilityTest.java +++ b/core/runtime/src/test/java/org/apache/polygene/runtime/value/ValueVisibilityTest.java @@ -40,7 +40,6 @@ import org.apache.polygene.bootstrap.Assembler; import org.apache.polygene.bootstrap.AssemblyException; import org.apache.polygene.bootstrap.Energy4Java; import org.apache.polygene.bootstrap.ModuleAssembly; -import org.apache.polygene.bootstrap.unitofwork.DefaultUnitOfWorkAssembler; import org.apache.polygene.test.EntityTestAssembler; import org.junit.After; import org.junit.Before; @@ -667,8 +666,6 @@ public class ValueVisibilityTest module.values( ModuleApplicationVisible.class ).visibleIn( Visibility.application ); module.values( ModuleLayerVisible.class ).visibleIn( Visibility.layer ); module.values( ModuleModuleVisible.class ).visibleIn( Visibility.module ); - - new DefaultUnitOfWorkAssembler().assemble( module ); } } @@ -686,7 +683,6 @@ public class ValueVisibilityTest module.values( BelowModuleVisible.class ).visibleIn( Visibility.module ); new EntityTestAssembler().visibleIn( Visibility.application ).assemble( module ); - new DefaultUnitOfWorkAssembler().assemble( module ); } } @@ -702,8 +698,6 @@ public class ValueVisibilityTest module.values( AboveApplicationVisible.class ).visibleIn( Visibility.application ); module.values( AboveLayerVisible.class ).visibleIn( Visibility.layer ); module.values( AboveModuleVisible.class ).visibleIn( Visibility.module ); - - new DefaultUnitOfWorkAssembler().assemble( module ); } } @@ -718,8 +712,6 @@ public class ValueVisibilityTest module.values( BesideApplicationVisible.class ).visibleIn( Visibility.application ); module.values( BesideLayerVisible.class ).visibleIn( Visibility.layer ); module.values( BesideModuleVisible.class ).visibleIn( Visibility.module ); - - new DefaultUnitOfWorkAssembler().assemble( module ); } } http://git-wip-us.apache.org/repos/asf/polygene-java/blob/c41ebdb1/core/runtime/src/test/java/org/apache/polygene/runtime/visibility/VisibilityInUnitOfWorkTest.java ---------------------------------------------------------------------- diff --git a/core/runtime/src/test/java/org/apache/polygene/runtime/visibility/VisibilityInUnitOfWorkTest.java b/core/runtime/src/test/java/org/apache/polygene/runtime/visibility/VisibilityInUnitOfWorkTest.java index 66c4bc8..a43e689 100644 --- a/core/runtime/src/test/java/org/apache/polygene/runtime/visibility/VisibilityInUnitOfWorkTest.java +++ b/core/runtime/src/test/java/org/apache/polygene/runtime/visibility/VisibilityInUnitOfWorkTest.java @@ -35,7 +35,6 @@ import org.apache.polygene.bootstrap.AssemblyException; import org.apache.polygene.bootstrap.Energy4Java; import org.apache.polygene.bootstrap.LayerAssembly; import org.apache.polygene.bootstrap.ModuleAssembly; -import org.apache.polygene.bootstrap.unitofwork.DefaultUnitOfWorkAssembler; import org.apache.polygene.entitystore.memory.MemoryEntityStoreService; import org.junit.Test; @@ -148,12 +147,9 @@ public class VisibilityInUnitOfWorkTest ModuleAssembly infraModule = layer1.module( "Infra Module" ); myModule.services( MyService.class ); myModule.entities( MyEntity.class ); - new DefaultUnitOfWorkAssembler().assemble( myModule ); yourModule.entities( YourEntity.class ); yourModule.services( YourService.class ).visibleIn( Visibility.layer ); - new DefaultUnitOfWorkAssembler().assemble( yourModule ); infraModule.services( MemoryEntityStoreService.class ).visibleIn( Visibility.layer ); - new DefaultUnitOfWorkAssembler().assemble( infraModule ); return appAssembly; } ); } http://git-wip-us.apache.org/repos/asf/polygene-java/blob/c41ebdb1/core/testsupport/src/main/java/org/apache/polygene/test/AbstractPolygeneTest.java ---------------------------------------------------------------------- diff --git a/core/testsupport/src/main/java/org/apache/polygene/test/AbstractPolygeneTest.java b/core/testsupport/src/main/java/org/apache/polygene/test/AbstractPolygeneTest.java index db3c8d8..c6f6e29 100644 --- a/core/testsupport/src/main/java/org/apache/polygene/test/AbstractPolygeneTest.java +++ b/core/testsupport/src/main/java/org/apache/polygene/test/AbstractPolygeneTest.java @@ -35,7 +35,6 @@ import org.apache.polygene.bootstrap.Assembler; import org.apache.polygene.bootstrap.AssemblyException; import org.apache.polygene.bootstrap.LayerAssembly; import org.apache.polygene.bootstrap.ModuleAssembly; -import org.apache.polygene.bootstrap.unitofwork.DefaultUnitOfWorkAssembler; import org.junit.After; import org.junit.Before; @@ -86,7 +85,6 @@ public abstract class AbstractPolygeneTest extends AbstractPolygeneBaseTest { LayerAssembly layer = applicationAssembly.layer( "Layer 1" ); ModuleAssembly module = layer.module( "Module 1" ); - new DefaultUnitOfWorkAssembler().assemble( module ); module.objects( AbstractPolygeneTest.this.getClass() ); assemble( module ); } http://git-wip-us.apache.org/repos/asf/polygene-java/blob/c41ebdb1/extensions/indexing-elasticsearch/src/test/java/org/apache/polygene/index/elasticsearch/ElasticSearchQueryMultimoduleTest.java ---------------------------------------------------------------------- diff --git a/extensions/indexing-elasticsearch/src/test/java/org/apache/polygene/index/elasticsearch/ElasticSearchQueryMultimoduleTest.java b/extensions/indexing-elasticsearch/src/test/java/org/apache/polygene/index/elasticsearch/ElasticSearchQueryMultimoduleTest.java index a55ff31..9a6a816 100644 --- a/extensions/indexing-elasticsearch/src/test/java/org/apache/polygene/index/elasticsearch/ElasticSearchQueryMultimoduleTest.java +++ b/extensions/indexing-elasticsearch/src/test/java/org/apache/polygene/index/elasticsearch/ElasticSearchQueryMultimoduleTest.java @@ -23,7 +23,6 @@ import org.apache.polygene.api.common.Visibility; import org.apache.polygene.bootstrap.AssemblyException; import org.apache.polygene.bootstrap.LayerAssembly; import org.apache.polygene.bootstrap.ModuleAssembly; -import org.apache.polygene.bootstrap.unitofwork.DefaultUnitOfWorkAssembler; import org.apache.polygene.index.elasticsearch.assembly.ESClientIndexQueryAssembler; import org.apache.polygene.library.fileconfig.FileConfigurationAssembler; import org.apache.polygene.library.fileconfig.FileConfigurationOverride; @@ -40,7 +39,6 @@ public class ElasticSearchQueryMultimoduleTest extends ElasticSearchQueryTest module = module.layer().module( "module2" ); new EntityTestAssembler().visibleIn( Visibility.layer ).assemble( module ); - new DefaultUnitOfWorkAssembler().assemble( module ); // Config module LayerAssembly configLayer = module.layer().application().layer( "config" ); http://git-wip-us.apache.org/repos/asf/polygene-java/blob/c41ebdb1/extensions/indexing-rdf/src/test/java/org/apache/polygene/index/rdf/RdfNamedQueryMultimoduleTest.java ---------------------------------------------------------------------- diff --git a/extensions/indexing-rdf/src/test/java/org/apache/polygene/index/rdf/RdfNamedQueryMultimoduleTest.java b/extensions/indexing-rdf/src/test/java/org/apache/polygene/index/rdf/RdfNamedQueryMultimoduleTest.java index 23c8f13..6f93f36 100644 --- a/extensions/indexing-rdf/src/test/java/org/apache/polygene/index/rdf/RdfNamedQueryMultimoduleTest.java +++ b/extensions/indexing-rdf/src/test/java/org/apache/polygene/index/rdf/RdfNamedQueryMultimoduleTest.java @@ -24,7 +24,6 @@ import org.apache.polygene.api.common.Visibility; import org.apache.polygene.bootstrap.AssemblyException; import org.apache.polygene.bootstrap.LayerAssembly; import org.apache.polygene.bootstrap.ModuleAssembly; -import org.apache.polygene.bootstrap.unitofwork.DefaultUnitOfWorkAssembler; import org.apache.polygene.index.rdf.assembly.RdfMemoryStoreAssembler; import org.apache.polygene.test.EntityTestAssembler; @@ -40,12 +39,10 @@ public class RdfNamedQueryMultimoduleTest assembleValues( module, Visibility.module ); ModuleAssembly storeModule = layer.module( "store" ); - new DefaultUnitOfWorkAssembler().assemble( storeModule ); new EntityTestAssembler().visibleIn( Visibility.layer ).assemble( storeModule ); assembleValues( storeModule, Visibility.module ); ModuleAssembly indexModule = layer.module( "index" ); - new DefaultUnitOfWorkAssembler().assemble( indexModule ); new RdfMemoryStoreAssembler( Visibility.layer, Visibility.module ).assemble( indexModule ); } http://git-wip-us.apache.org/repos/asf/polygene-java/blob/c41ebdb1/extensions/indexing-rdf/src/test/java/org/apache/polygene/index/rdf/RdfQueryMultimoduleTest.java ---------------------------------------------------------------------- diff --git a/extensions/indexing-rdf/src/test/java/org/apache/polygene/index/rdf/RdfQueryMultimoduleTest.java b/extensions/indexing-rdf/src/test/java/org/apache/polygene/index/rdf/RdfQueryMultimoduleTest.java index 0ed4774..308182d 100644 --- a/extensions/indexing-rdf/src/test/java/org/apache/polygene/index/rdf/RdfQueryMultimoduleTest.java +++ b/extensions/indexing-rdf/src/test/java/org/apache/polygene/index/rdf/RdfQueryMultimoduleTest.java @@ -24,7 +24,6 @@ import org.apache.polygene.api.common.Visibility; import org.apache.polygene.bootstrap.AssemblyException; import org.apache.polygene.bootstrap.LayerAssembly; import org.apache.polygene.bootstrap.ModuleAssembly; -import org.apache.polygene.bootstrap.unitofwork.DefaultUnitOfWorkAssembler; import org.apache.polygene.index.rdf.assembly.RdfNativeSesameStoreAssembler; import org.apache.polygene.library.rdf.repository.NativeConfiguration; import org.apache.polygene.test.EntityTestAssembler; @@ -48,11 +47,9 @@ public class RdfQueryMultimoduleTest ModuleAssembly storeModule = layer.module( "store" ); new EntityTestAssembler().visibleIn( Visibility.layer ).assemble( storeModule ); assembleValues( storeModule, Visibility.module ); - new DefaultUnitOfWorkAssembler().assemble( storeModule ); ModuleAssembly indexModule = layer.module( "index" ); new RdfNativeSesameStoreAssembler( Visibility.layer, Visibility.module ).assemble( indexModule ); - new DefaultUnitOfWorkAssembler().assemble( indexModule ); LayerAssembly configLayer = module.layer().application().layer( "config" ); module.layer().uses( configLayer ); @@ -61,7 +58,6 @@ public class RdfQueryMultimoduleTest config.forMixin( NativeConfiguration.class ).declareDefaults() .dataDirectory().set( tmpDir.getRoot().getAbsolutePath() ); new EntityTestAssembler().assemble( config ); - new DefaultUnitOfWorkAssembler().assemble( config ); } } http://git-wip-us.apache.org/repos/asf/polygene-java/blob/c41ebdb1/extensions/indexing-rdf/src/test/java/org/apache/polygene/index/rdf/RdfQueryTest.java ---------------------------------------------------------------------- diff --git a/extensions/indexing-rdf/src/test/java/org/apache/polygene/index/rdf/RdfQueryTest.java b/extensions/indexing-rdf/src/test/java/org/apache/polygene/index/rdf/RdfQueryTest.java index ae49da8..da3c4d8 100644 --- a/extensions/indexing-rdf/src/test/java/org/apache/polygene/index/rdf/RdfQueryTest.java +++ b/extensions/indexing-rdf/src/test/java/org/apache/polygene/index/rdf/RdfQueryTest.java @@ -22,7 +22,6 @@ package org.apache.polygene.index.rdf; import org.apache.polygene.api.common.Visibility; import org.apache.polygene.bootstrap.AssemblyException; import org.apache.polygene.bootstrap.ModuleAssembly; -import org.apache.polygene.bootstrap.unitofwork.DefaultUnitOfWorkAssembler; import org.apache.polygene.index.rdf.assembly.RdfNativeSesameStoreAssembler; import org.apache.polygene.library.rdf.repository.NativeConfiguration; import org.apache.polygene.test.EntityTestAssembler; @@ -51,7 +50,6 @@ public class RdfQueryTest config.forMixin( NativeConfiguration.class ).declareDefaults() .dataDirectory().set( tmpDir.getRoot().getAbsolutePath() ); new EntityTestAssembler().assemble( config ); - new DefaultUnitOfWorkAssembler().assemble( config ); } @Test http://git-wip-us.apache.org/repos/asf/polygene-java/blob/c41ebdb1/extensions/migration/src/test/java/org/apache/polygene/migration/MigrationTest.java ---------------------------------------------------------------------- diff --git a/extensions/migration/src/test/java/org/apache/polygene/migration/MigrationTest.java b/extensions/migration/src/test/java/org/apache/polygene/migration/MigrationTest.java index 27fe187..53d80d8 100644 --- a/extensions/migration/src/test/java/org/apache/polygene/migration/MigrationTest.java +++ b/extensions/migration/src/test/java/org/apache/polygene/migration/MigrationTest.java @@ -31,7 +31,6 @@ import org.apache.polygene.api.unitofwork.UnitOfWorkCompletionException; import org.apache.polygene.bootstrap.AssemblyException; import org.apache.polygene.bootstrap.ModuleAssembly; import org.apache.polygene.bootstrap.SingletonAssembler; -import org.apache.polygene.bootstrap.unitofwork.DefaultUnitOfWorkAssembler; import org.apache.polygene.migration.assembly.EntityMigrationOperation; import org.apache.polygene.migration.assembly.MigrationBuilder; import org.apache.polygene.migration.assembly.MigrationContext; @@ -58,7 +57,6 @@ public class MigrationTest throws AssemblyException { new EntityTestAssembler().assemble( module ); - new DefaultUnitOfWorkAssembler().assemble( module ); module.objects( MigrationEventLogger.class ); module.importedServices( MigrationEventLogger.class ).importedBy( NewObjectImporter.class ); http://git-wip-us.apache.org/repos/asf/polygene-java/blob/c41ebdb1/libraries/jmx/src/test/java/org/apache/polygene/library/jmx/JMXTest.java ---------------------------------------------------------------------- diff --git a/libraries/jmx/src/test/java/org/apache/polygene/library/jmx/JMXTest.java b/libraries/jmx/src/test/java/org/apache/polygene/library/jmx/JMXTest.java index 92a79f1..0f0d041 100644 --- a/libraries/jmx/src/test/java/org/apache/polygene/library/jmx/JMXTest.java +++ b/libraries/jmx/src/test/java/org/apache/polygene/library/jmx/JMXTest.java @@ -34,7 +34,6 @@ import org.apache.polygene.api.value.ValueComposite; import org.apache.polygene.bootstrap.AssemblyException; import org.apache.polygene.bootstrap.ModuleAssembly; import org.apache.polygene.bootstrap.SingletonAssembler; -import org.apache.polygene.bootstrap.unitofwork.DefaultUnitOfWorkAssembler; import org.apache.polygene.test.AbstractPolygeneTest; import org.apache.polygene.test.EntityTestAssembler; import org.apache.polygene.test.util.JmxFixture; @@ -50,7 +49,6 @@ public class JMXTest extends AbstractPolygeneTest public void assemble(ModuleAssembly module) throws AssemblyException { new EntityTestAssembler().assemble( module ); - new DefaultUnitOfWorkAssembler().assemble( module ); module.services( TestService.class, TestService2.class, TestService3.class ).instantiateOnStartup(); module.entities( TestConfiguration.class ); http://git-wip-us.apache.org/repos/asf/polygene-java/blob/c41ebdb1/libraries/rest/src/test/java/org/apache/polygene/library/rest/admin/RestTest.java ---------------------------------------------------------------------- diff --git a/libraries/rest/src/test/java/org/apache/polygene/library/rest/admin/RestTest.java b/libraries/rest/src/test/java/org/apache/polygene/library/rest/admin/RestTest.java index f09e785..c9f5fa8 100644 --- a/libraries/rest/src/test/java/org/apache/polygene/library/rest/admin/RestTest.java +++ b/libraries/rest/src/test/java/org/apache/polygene/library/rest/admin/RestTest.java @@ -51,7 +51,6 @@ import org.apache.polygene.bootstrap.ApplicationAssemblerAdapter; import org.apache.polygene.bootstrap.Assembler; import org.apache.polygene.bootstrap.AssemblyException; import org.apache.polygene.bootstrap.ModuleAssembly; -import org.apache.polygene.bootstrap.unitofwork.DefaultUnitOfWorkAssembler; import org.apache.polygene.index.rdf.assembly.RdfMemoryStoreAssembler; import org.apache.polygene.test.AbstractPolygeneTest; import org.apache.polygene.test.EntityTestAssembler; @@ -80,8 +79,7 @@ public class RestTest extends AbstractPolygeneTest { RestTest.this, new RestAssembler(), - new RdfMemoryStoreAssembler(), - new DefaultUnitOfWorkAssembler() + new RdfMemoryStoreAssembler() } } } ) http://git-wip-us.apache.org/repos/asf/polygene-java/blob/c41ebdb1/libraries/sql/src/test/java/org/apache/polygene/library/sql/jmx/DataSourceConfigurationManagerServiceTest.java ---------------------------------------------------------------------- diff --git a/libraries/sql/src/test/java/org/apache/polygene/library/sql/jmx/DataSourceConfigurationManagerServiceTest.java b/libraries/sql/src/test/java/org/apache/polygene/library/sql/jmx/DataSourceConfigurationManagerServiceTest.java index 882df7a..9bfc975 100644 --- a/libraries/sql/src/test/java/org/apache/polygene/library/sql/jmx/DataSourceConfigurationManagerServiceTest.java +++ b/libraries/sql/src/test/java/org/apache/polygene/library/sql/jmx/DataSourceConfigurationManagerServiceTest.java @@ -24,7 +24,6 @@ import org.apache.polygene.api.common.Visibility; import org.apache.polygene.bootstrap.AssemblyException; import org.apache.polygene.bootstrap.ModuleAssembly; import org.apache.polygene.bootstrap.SingletonAssembler; -import org.apache.polygene.bootstrap.unitofwork.DefaultUnitOfWorkAssembler; import org.apache.polygene.library.jmx.JMXAssembler; import org.apache.polygene.library.sql.assembly.DataSourceAssembler; import org.apache.polygene.library.sql.assembly.DataSourceJMXAssembler; @@ -77,8 +76,6 @@ public class DataSourceConfigurationManagerServiceTest // Create in-memory store for configurations new EntityTestAssembler().visibleIn( Visibility.layer ).assemble( module ); - new DefaultUnitOfWorkAssembler().assemble( module ); - // Set up DataSource service that will manage the connection pools new DBCPDataSourceServiceAssembler().identifiedBy( "datasource-service" ) .visibleIn( Visibility.layer )
