Repository: zest-qi4j Updated Branches: refs/heads/develop 2088779a2 -> 44a287228
Bug in AbstractValueCompositeSerializationTest, which invoked the EntityAssembler, which had a default ValueSerialization service in it, bypassing the one of interest. There should have been an AmbiguousTypeException as a result, but there weren't, so additional testing needed. Project: http://git-wip-us.apache.org/repos/asf/zest-qi4j/repo Commit: http://git-wip-us.apache.org/repos/asf/zest-qi4j/commit/0c5845af Tree: http://git-wip-us.apache.org/repos/asf/zest-qi4j/tree/0c5845af Diff: http://git-wip-us.apache.org/repos/asf/zest-qi4j/diff/0c5845af Branch: refs/heads/develop Commit: 0c5845afcff64a77a88145e3925acbccabb5205d Parents: 4076eae Author: Niclas Hedhman <[email protected]> Authored: Fri Jul 10 16:42:18 2015 +0300 Committer: Niclas Hedhman <[email protected]> Committed: Fri Jul 10 16:42:18 2015 +0300 ---------------------------------------------------------------------- .../main/java/org/qi4j/spi/value/ValueSerializerAdapter.java | 2 +- .../test/value/AbstractValueCompositeSerializationTest.java | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/0c5845af/core/spi/src/main/java/org/qi4j/spi/value/ValueSerializerAdapter.java ---------------------------------------------------------------------- diff --git a/core/spi/src/main/java/org/qi4j/spi/value/ValueSerializerAdapter.java b/core/spi/src/main/java/org/qi4j/spi/value/ValueSerializerAdapter.java index 1a12a8a..004745a 100644 --- a/core/spi/src/main/java/org/qi4j/spi/value/ValueSerializerAdapter.java +++ b/core/spi/src/main/java/org/qi4j/spi/value/ValueSerializerAdapter.java @@ -1,6 +1,6 @@ /* * Copyright (c) 2007, Rickard Ãberg. All Rights Reserved. - * Copyright (c) 2010, Niclas Hehdman. All Rights Reserved. + * Copyright (c) 2010, Niclas Hednman. All Rights Reserved. * Copyright (c) 2012-2014, Paul Merlin. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/0c5845af/core/testsupport/src/main/java/org/qi4j/test/value/AbstractValueCompositeSerializationTest.java ---------------------------------------------------------------------- diff --git a/core/testsupport/src/main/java/org/qi4j/test/value/AbstractValueCompositeSerializationTest.java b/core/testsupport/src/main/java/org/qi4j/test/value/AbstractValueCompositeSerializationTest.java index ce4b45c..b3615af 100644 --- a/core/testsupport/src/main/java/org/qi4j/test/value/AbstractValueCompositeSerializationTest.java +++ b/core/testsupport/src/main/java/org/qi4j/test/value/AbstractValueCompositeSerializationTest.java @@ -47,6 +47,9 @@ import org.qi4j.api.value.ValueComposite; import org.qi4j.api.value.ValueSerialization; import org.qi4j.bootstrap.AssemblyException; import org.qi4j.bootstrap.ModuleAssembly; +import org.qi4j.bootstrap.ServiceDeclaration; +import org.qi4j.entitystore.memory.MemoryEntityStoreService; +import org.qi4j.spi.uuid.UuidIdentityGeneratorService; import org.qi4j.test.AbstractQi4jTest; import org.qi4j.test.EntityTestAssembler; @@ -74,7 +77,8 @@ public abstract class AbstractValueCompositeSerializationTest { module.values( SomeValue.class, AnotherValue.class, FooValue.class, CustomFooValue.class, SpecificCollection.class /*, SpecificValue.class, GenericValue.class */ ); - new EntityTestAssembler().assemble( module ); + ServiceDeclaration service = module.services( MemoryEntityStoreService.class ); + module.services( UuidIdentityGeneratorService.class ); module.entities( BarEntity.class ); }
