This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch 3409-mixin.eventtypes
in repository https://gitbox.apache.org/repos/asf/causeway.git
The following commit(s) were added to refs/heads/3409-mixin.eventtypes by this
push:
new e41217e7ce CAUSEWAY-3409: cleanup some FacetFactory tests (3)
e41217e7ce is described below
commit e41217e7cecaf449d4fa6a3149068bba8a7af4e8
Author: Andi Huber <[email protected]>
AuthorDate: Tue Apr 18 12:10:24 2023 +0200
CAUSEWAY-3409: cleanup some FacetFactory tests (3)
---
.../metamodel/facets/FacetFactoryTestAbstract.java | 41 ++++++++--------------
.../action/ActionAnnotationFacetFactoryTest.java | 18 +++-------
...ctionAnnotationFacetFactoryTest_Invocation.java | 4 +--
.../ActionLayoutAnnotationFacetFactoryTest.java | 2 +-
...MenuFacetFromDomainServiceFacetFactoryTest.java | 2 +-
.../CollectionAnnotationFacetFactoryTest.java | 2 +-
.../DomainObjectAnnotationFacetFactoryTest.java | 13 +++----
.../DomainObjectLayoutFactoryTest.java | 2 +-
.../title/TitleAnnotationFacetFactoryTest.java | 16 ++++-----
.../ParameterAnnotationFacetFactoryTest.java | 2 +-
.../PropertyAnnotationFacetFactoryTest.java | 7 ++--
11 files changed, 44 insertions(+), 65 deletions(-)
diff --git
a/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/FacetFactoryTestAbstract.java
b/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/FacetFactoryTestAbstract.java
index 7f74bd3be2..cd40468da1 100644
---
a/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/FacetFactoryTestAbstract.java
+++
b/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/FacetFactoryTestAbstract.java
@@ -41,10 +41,6 @@ import
org.apache.causeway.core.metamodel.facetapi.MethodRemover;
import
org.apache.causeway.core.metamodel.facets.FacetFactory.ProcessClassContext;
import
org.apache.causeway.core.metamodel.facets.FacetFactory.ProcessMethodContext;
import
org.apache.causeway.core.metamodel.facets.FacetFactory.ProcessParameterContext;
-import org.apache.causeway.core.metamodel.spec.ObjectSpecification;
-import org.apache.causeway.core.metamodel.spec.feature.OneToManyAssociation;
-import org.apache.causeway.core.metamodel.spec.feature.OneToOneActionParameter;
-import org.apache.causeway.core.metamodel.spec.feature.OneToOneAssociation;
import org.apache.causeway.core.metamodel.valuesemantics.IntValueSemantics;
import lombok.Getter;
@@ -55,16 +51,7 @@ import lombok.experimental.Accessors;
public abstract class FacetFactoryTestAbstract
implements HasMetaModelContext {
- @Getter(onMethod_ = {@Override})
- protected MetaModelContext metaModelContext;
-
- private MethodRemover mockMethodRemover;
-
- protected ObjectSpecification mockOnType;
- protected ObjectSpecification mockObjSpec;
- protected OneToOneAssociation mockOneToOneAssociation;
- protected OneToManyAssociation mockOneToManyAssociation;
- protected OneToOneActionParameter mockOneToOneActionParameter;
+ // -- SCENARIO HELPER
@lombok.Value
@Getter @Accessors(fluent=true)
@@ -113,23 +100,25 @@ implements HasMetaModelContext {
}
- protected void setUpMmc() {
- metaModelContext = MetaModelContext_forTesting.builder()
- .valueSemantic(new IntValueSemantics())
- .build();
+ // --
+
+ @Getter(onMethod_ = {@Override})
+ private MetaModelContext metaModelContext;
+ private MethodRemover mockMethodRemover;
+
+ /**
+ * Override, if a custom {@link MetaModelContext_forTesting} is required
for certain tests.
+ */
+ protected MetaModelContext_forTesting setUpMmc(
+ final
MetaModelContext_forTesting.MetaModelContext_forTestingBuilder builder) {
+ return builder.build();
}
@BeforeEach
protected void setUpAll() throws Exception {
-
- setUpMmc();
-
+ metaModelContext = setUpMmc(MetaModelContext_forTesting.builder()
+ .valueSemantic(new IntValueSemantics()));
mockMethodRemover = Mockito.mock(MethodRemover.class);
- mockOnType = Mockito.mock(ObjectSpecification.class);
- mockObjSpec = Mockito.mock(ObjectSpecification.class);
- mockOneToOneAssociation = Mockito.mock(OneToOneAssociation.class);
- mockOneToManyAssociation = Mockito.mock(OneToManyAssociation.class);
- mockOneToOneActionParameter =
Mockito.mock(OneToOneActionParameter.class);
}
diff --git
a/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest.java
b/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest.java
index 22b3aaffff..41a4744619 100644
---
a/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest.java
+++
b/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest.java
@@ -30,23 +30,19 @@ import
org.apache.causeway.core.metamodel.facets.FacetFactoryTestAbstract;
import
org.apache.causeway.core.metamodel.facets.object.domainobject.domainevents.ActionDomainEventDefaultFacetForDomainObjectAnnotation;
import org.apache.causeway.core.metamodel.spec.ObjectSpecification;
-import lombok.val;
-
class ActionAnnotationFacetFactoryTest
extends FacetFactoryTestAbstract {
ActionAnnotationFacetFactory facetFactory;
- ObjectSpecification mockTypeSpec;
- ObjectSpecification mockReturnTypeSpec;
+ private ObjectSpecification mockTypeSpec;
@BeforeEach
public void setUp() throws Exception {
mockTypeSpec = Mockito.mock(ObjectSpecification.class);
- mockReturnTypeSpec = Mockito.mock(ObjectSpecification.class);
- facetFactory = new ActionAnnotationFacetFactory(metaModelContext);
+ facetFactory = new ActionAnnotationFacetFactory(getMetaModelContext());
Mockito.when(mockTypeSpec.getFacet(ActionDomainEventDefaultFacetForDomainObjectAnnotation.class))
.thenReturn(null);
@@ -59,14 +55,11 @@ extends FacetFactoryTestAbstract {
}
class Customer {
- public void someAction() {
- }
+ public void someAction() {}
}
class SomeHasInteractionId implements HasInteractionId {
- public void someAction() {
- }
-
+ public void someAction() {}
@Override
public UUID getInteractionId() {
return null;
@@ -74,8 +67,7 @@ extends FacetFactoryTestAbstract {
}
void allowingPublishingConfigurationToReturn(final
ActionConfigOptions.PublishingPolicy value) {
- val config = metaModelContext.getConfiguration();
-
config.getApplib().getAnnotation().getAction().setExecutionPublishing(value);
+
getConfiguration().getApplib().getAnnotation().getAction().setExecutionPublishing(value);
}
}
diff --git
a/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_Invocation.java
b/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_Invocation.java
index 5c259d5cb6..062af84b24 100644
---
a/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_Invocation.java
+++
b/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_Invocation.java
@@ -57,7 +57,7 @@ extends ActionAnnotationFacetFactoryTest {
}
// given
- super.metaModelContext.getConfiguration()
+ getConfiguration()
.getApplib().getAnnotation().getAction().getDomainEvent().setPostForDefault(true);
actionScenario(Customer.class, "someAction", (processMethodContext,
facetHolder, facetedMethod, facetedMethodParameter)->{
@@ -161,7 +161,7 @@ extends ActionAnnotationFacetFactoryTest {
}
// given
- super.metaModelContext.getConfiguration()
+ getConfiguration()
.getApplib().getAnnotation().getAction().getDomainEvent().setPostForDefault(true);
actionScenario(Customer.class, "someAction", (processMethodContext,
facetHolder, facetedMethod, facetedMethodParameter)->{
diff --git
a/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/actions/layout/ActionLayoutAnnotationFacetFactoryTest.java
b/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/actions/layout/ActionLayoutAnnotationFacetFactoryTest.java
index 8781ea3c3a..2f2e2ed6ce 100644
---
a/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/actions/layout/ActionLayoutAnnotationFacetFactoryTest.java
+++
b/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/actions/layout/ActionLayoutAnnotationFacetFactoryTest.java
@@ -47,7 +47,7 @@ extends FacetFactoryTestAbstract {
@BeforeEach
void setUp() throws Exception {
- facetFactory = new ActionLayoutFacetFactory(metaModelContext);
+ facetFactory = new ActionLayoutFacetFactory(getMetaModelContext());
}
@Test
diff --git
a/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/actions/notinservicemenu/derived/NotInServiceMenuFacetFromDomainServiceFacetFactoryTest.java
b/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/actions/notinservicemenu/derived/NotInServiceMenuFacetFromDomainServiceFacetFactoryTest.java
index 16d470e772..ff7878a389 100644
---
a/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/actions/notinservicemenu/derived/NotInServiceMenuFacetFromDomainServiceFacetFactoryTest.java
+++
b/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/actions/notinservicemenu/derived/NotInServiceMenuFacetFromDomainServiceFacetFactoryTest.java
@@ -40,7 +40,7 @@ extends FacetFactoryTestAbstract {
@BeforeEach
public void setUp() throws Exception {
- facetFactory = new
NotInServiceMenuFacetFromDomainServiceFacetFactory(metaModelContext);
+ facetFactory = new
NotInServiceMenuFacetFromDomainServiceFacetFactory(getMetaModelContext());
}
@Test
diff --git
a/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/collections/collection/CollectionAnnotationFacetFactoryTest.java
b/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/collections/collection/CollectionAnnotationFacetFactoryTest.java
index 7e8e89ec4a..a6a7b2988e 100644
---
a/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/collections/collection/CollectionAnnotationFacetFactoryTest.java
+++
b/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/collections/collection/CollectionAnnotationFacetFactoryTest.java
@@ -70,7 +70,7 @@ extends FacetFactoryTestAbstract {
@BeforeEach
public void setUp() throws Exception {
- facetFactory = new CollectionAnnotationFacetFactory(metaModelContext);
+ facetFactory = new
CollectionAnnotationFacetFactory(getMetaModelContext());
}
@AfterEach
diff --git
a/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactoryTest.java
b/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactoryTest.java
index 8486db98e9..c390b0649c 100644
---
a/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactoryTest.java
+++
b/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactoryTest.java
@@ -38,7 +38,6 @@ import org.apache.causeway.applib.annotation.Bounding;
import org.apache.causeway.applib.annotation.DomainObject;
import org.apache.causeway.applib.id.LogicalType;
import org.apache.causeway.applib.mixins.system.HasInteractionId;
-import org.apache.causeway.core.config.CausewayConfiguration;
import
org.apache.causeway.core.config.metamodel.facets.DomainObjectConfigOptions;
import org.apache.causeway.core.metamodel.facetapi.Facet;
import org.apache.causeway.core.metamodel.facets.FacetFactoryTestAbstract;
@@ -58,8 +57,6 @@ import
org.apache.causeway.core.metamodel.facets.object.viewmodel.ViewModelFacet
import
org.apache.causeway.core.metamodel.facets.object.viewmodel.ViewModelFacetForDomainObjectAnnotation;
import
org.apache.causeway.core.metamodel.facets.objectvalue.choices.ChoicesFacet;
-import lombok.val;
-
class DomainObjectAnnotationFacetFactoryTest
extends FacetFactoryTestAbstract {
@@ -67,7 +64,7 @@ extends FacetFactoryTestAbstract {
@BeforeEach
void setUp() throws Exception {
- facetFactory = new
DomainObjectAnnotationFacetFactory(metaModelContext);
+ facetFactory = new
DomainObjectAnnotationFacetFactory(getMetaModelContext());
}
@AfterEach
@@ -89,15 +86,15 @@ extends FacetFactoryTestAbstract {
void allowingEntityChangePublishingToReturn(final
DomainObjectConfigOptions.EntityChangePublishingPolicy value) {
if(value!=null) {
- val config = super.metaModelContext.getConfiguration();
-
config.getApplib().getAnnotation().getDomainObject().setEntityChangePublishing(value);
+ getConfiguration()
+
.getApplib().getAnnotation().getDomainObject().setEntityChangePublishing(value);
}
}
void allowingObjectsEditingToReturn(final
DomainObjectConfigOptions.EditingObjectsConfiguration value) {
if(value!=null) {
- final CausewayConfiguration config =
super.metaModelContext.getConfiguration();
-
config.getApplib().getAnnotation().getDomainObject().setEditing(value);
+ getConfiguration()
+
.getApplib().getAnnotation().getDomainObject().setEditing(value);
}
}
diff --git
a/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/object/domainobjectlayout/DomainObjectLayoutFactoryTest.java
b/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/object/domainobjectlayout/DomainObjectLayoutFactoryTest.java
index e61418c9fb..936c6ef937 100644
---
a/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/object/domainobjectlayout/DomainObjectLayoutFactoryTest.java
+++
b/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/object/domainobjectlayout/DomainObjectLayoutFactoryTest.java
@@ -58,7 +58,7 @@ extends FacetFactoryTestAbstract {
@BeforeEach
public void setUp() throws Exception {
- facetFactory = new DomainObjectLayoutFacetFactory(metaModelContext);
+ facetFactory = new
DomainObjectLayoutFacetFactory(getMetaModelContext());
}
@AfterEach
diff --git
a/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/object/ident/title/TitleAnnotationFacetFactoryTest.java
b/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/object/ident/title/TitleAnnotationFacetFactoryTest.java
index dcd4a44625..e46253e6c4 100644
---
a/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/object/ident/title/TitleAnnotationFacetFactoryTest.java
+++
b/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/object/ident/title/TitleAnnotationFacetFactoryTest.java
@@ -46,7 +46,6 @@ import
org.apache.causeway.core.metamodel.facets.object.title.TitleFacet;
import
org.apache.causeway.core.metamodel.facets.object.title.annotation.TitleAnnotationFacetFactory;
import
org.apache.causeway.core.metamodel.facets.object.title.annotation.TitleFacetViaTitleAnnotation;
import org.apache.causeway.core.metamodel.object.ManagedObject;
-import org.apache.causeway.core.metamodel.valuesemantics.IntValueSemantics;
import lombok.val;
@@ -55,19 +54,18 @@ extends FacetFactoryTestAbstract {
private TitleAnnotationFacetFactory facetFactory;
- @BeforeEach
- public void setUp() throws Exception {
-
+ @Override
+ protected MetaModelContext_forTesting setUpMmc(final
MetaModelContext_forTesting.MetaModelContext_forTestingBuilder builder) {
val mockInteractionService = Mockito.mock(InteractionService.class);
-
- metaModelContext = MetaModelContext_forTesting.builder()
+ return builder
.interactionService(mockInteractionService)
- .valueSemantic(new IntValueSemantics())
.build();
+ }
-
+ @BeforeEach
+ public void setUp() throws Exception {
assertNotNull(getInteractionService());
- facetFactory = new TitleAnnotationFacetFactory(metaModelContext);
+ facetFactory = new TitleAnnotationFacetFactory(getMetaModelContext());
}
@AfterEach
diff --git
a/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/param/parameter/ParameterAnnotationFacetFactoryTest.java
b/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/param/parameter/ParameterAnnotationFacetFactoryTest.java
index 875ee89c53..8c669ae0ce 100644
---
a/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/param/parameter/ParameterAnnotationFacetFactoryTest.java
+++
b/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/param/parameter/ParameterAnnotationFacetFactoryTest.java
@@ -53,7 +53,7 @@ extends FacetFactoryTestAbstract {
@BeforeEach
public void setUp() throws Exception {
- facetFactory = new ParameterAnnotationFacetFactory(metaModelContext);
+ facetFactory = new
ParameterAnnotationFacetFactory(getMetaModelContext());
}
@AfterEach
diff --git
a/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactoryTest.java
b/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactoryTest.java
index 6f303b426a..75aa35e1ce 100644
---
a/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactoryTest.java
+++
b/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactoryTest.java
@@ -24,6 +24,7 @@ import org.hamcrest.MatcherAssert;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
@@ -73,6 +74,7 @@ import
org.apache.causeway.core.metamodel.facets.properties.update.clear.Propert
import
org.apache.causeway.core.metamodel.facets.properties.update.modify.PropertySetterFacet;
import
org.apache.causeway.core.metamodel.facets.properties.update.modify.PropertySetterFacetAbstract;
import org.apache.causeway.core.metamodel.object.ManagedObject;
+import org.apache.causeway.core.metamodel.spec.ObjectSpecification;
import org.apache.causeway.core.metamodel.spec.feature.OneToOneAssociation;
import lombok.Getter;
@@ -140,7 +142,7 @@ class PropertyAnnotationFacetFactoryTest extends
FacetFactoryTestAbstract {
@BeforeEach
public void setUp() throws Exception {
- facetFactory = new PropertyAnnotationFacetFactory(metaModelContext);
+ facetFactory = new
PropertyAnnotationFacetFactory(getMetaModelContext());
}
@AfterEach
@@ -151,6 +153,7 @@ class PropertyAnnotationFacetFactoryTest extends
FacetFactoryTestAbstract {
public static class Modify extends PropertyAnnotationFacetFactoryTest {
private void addGetterFacet(final FacetHolder holder) {
+ val mockOnType = Mockito.mock(ObjectSpecification.class);
FacetUtil.addFacet(new
PropertyOrCollectionAccessorFacetAbstract(mockOnType, holder) {
@Override
public Object getProperty(
@@ -330,7 +333,7 @@ class PropertyAnnotationFacetFactoryTest extends
FacetFactoryTestAbstract {
}
// given
- assertTrue(metaModelContext.getConfiguration()
+ assertTrue(getConfiguration()
.getApplib().getAnnotation().getDomainObject().getCreatedLifecycleEvent().isPostForDefault());
propertyScenario(Customer.class, "name", (processMethodContext,
facetHolder, facetedMethod, facetedMethodParameter)->{
