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 500c934cc5 CAUSEWAY-3409: cleanup some FacetFactory tests (2)
500c934cc5 is described below
commit 500c934cc592c9ca6b2925f265c8f9690a164a64
Author: Andi Huber <[email protected]>
AuthorDate: Tue Apr 18 11:51:49 2023 +0200
CAUSEWAY-3409: cleanup some FacetFactory tests (2)
---
.../metamodel/facets/FacetFactoryTestAbstract.java | 22 ++++++++++++++++------
.../action/ActionAnnotationFacetFactoryTest.java | 7 -------
...ctionAnnotationFacetFactoryTest_Invocation.java | 8 ++++----
.../CollectionAnnotationFacetFactoryTest.java | 19 -------------------
.../ident/title/TitleFacetViaMethodTest.java | 4 +++-
.../NavigableParentAnnotationFacetFactoryTest.java | 19 ++-----------------
.../facets/param/name/ParameterNameFacetTest.java | 13 ++-----------
.../ParameterAnnotationFacetFactoryTest.java | 14 --------------
.../PropertyAnnotationFacetFactoryTest.java | 13 -------------
9 files changed, 27 insertions(+), 92 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 92c5212bc1..7f74bd3be2 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
@@ -24,6 +24,8 @@ import java.util.function.BiConsumer;
import org.junit.jupiter.api.BeforeEach;
import org.mockito.Mockito;
+import static org.mockito.Mockito.calls;
+
import org.apache.causeway.applib.Identifier;
import org.apache.causeway.applib.annotation.Introspection.IntrospectionPolicy;
import org.apache.causeway.applib.id.LogicalType;
@@ -56,8 +58,8 @@ implements HasMetaModelContext {
@Getter(onMethod_ = {@Override})
protected MetaModelContext metaModelContext;
- protected MethodRemover mockMethodRemover;
- protected FacetHolder mockFacetHolder;
+ private MethodRemover mockMethodRemover;
+
protected ObjectSpecification mockOnType;
protected ObjectSpecification mockObjSpec;
protected OneToOneAssociation mockOneToOneAssociation;
@@ -118,19 +120,16 @@ implements HasMetaModelContext {
}
@BeforeEach
- protected void setUpFacetedMethodAndParameter() throws Exception {
+ protected void setUpAll() throws Exception {
setUpMmc();
mockMethodRemover = Mockito.mock(MethodRemover.class);
- mockFacetHolder = Mockito.mock(FacetHolder.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);
-
- //scenario = Scenario.prop(getMetaModelContext(),
AbstractFacetFactoryTest.Customer.class, "firstName");
}
@@ -229,8 +228,19 @@ implements HasMetaModelContext {
return _Utils.findMethodExactOrFail(type, methodName);
}
+ // -- EXPECTATIONS
+
protected void expectNoMethodsRemoved() {
Mockito.verifyNoInteractions(mockMethodRemover);
}
+ protected void expectRemoveMethodAtLeastOnce(final Method actionMethod) {
+ Mockito.verify(mockMethodRemover,
Mockito.atLeastOnce()).removeMethod(actionMethod);
+ }
+
+ protected void expectRemoveMethodOnce(final Method actionMethod) {
+ Mockito.verify(mockMethodRemover, calls(1)).removeMethod(actionMethod);
+ }
+
+
}
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 e8828c86a6..22b3aaffff 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
@@ -18,7 +18,6 @@
*/
package org.apache.causeway.core.metamodel.facets.actions.action;
-import java.lang.reflect.Method;
import java.util.UUID;
import org.junit.jupiter.api.AfterEach;
@@ -41,10 +40,6 @@ extends FacetFactoryTestAbstract {
ObjectSpecification mockTypeSpec;
ObjectSpecification mockReturnTypeSpec;
- void expectRemoveMethod(final Method actionMethod) {
- Mockito.verify(mockMethodRemover,
Mockito.atLeastOnce()).removeMethod(actionMethod);
- }
-
@BeforeEach
public void setUp() throws Exception {
@@ -76,8 +71,6 @@ extends FacetFactoryTestAbstract {
public UUID getInteractionId() {
return null;
}
-
-
}
void allowingPublishingConfigurationToReturn(final
ActionConfigOptions.PublishingPolicy 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 cbc955e508..5c259d5cb6 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
@@ -65,7 +65,7 @@ extends ActionAnnotationFacetFactoryTest {
processInvocation(facetFactory, processMethodContext);
// expect
- expectRemoveMethod(findMethod(Customer.class, "someAction"));
+ expectRemoveMethodAtLeastOnce(findMethod(Customer.class,
"someAction"));
// then
final ActionDomainEventFacet domainEventFacet =
facetedMethod.getFacet(ActionDomainEventFacet.class);
@@ -98,7 +98,7 @@ extends ActionAnnotationFacetFactoryTest {
processInvocation(facetFactory, processMethodContext);
// expect
- expectRemoveMethod(findMethod(Customer.class, "someAction"));
+ expectRemoveMethodAtLeastOnce(findMethod(Customer.class,
"someAction"));
// then
final Facet domainEventFacet =
facetedMethod.getFacet(ActionDomainEventFacet.class);
@@ -133,7 +133,7 @@ extends ActionAnnotationFacetFactoryTest {
processInvocation(facetFactory, processMethodContext);
// expect
- expectRemoveMethod(findMethod(Customer.class, "someAction"));
+ expectRemoveMethodAtLeastOnce(findMethod(Customer.class,
"someAction"));
// then
final Facet domainEventFacet =
facetedMethod.getFacet(ActionDomainEventFacet.class);
@@ -169,7 +169,7 @@ extends ActionAnnotationFacetFactoryTest {
processInvocation(facetFactory, processMethodContext);
// expect
- expectRemoveMethod(findMethod(Customer.class, "someAction"));
+ expectRemoveMethodAtLeastOnce(findMethod(Customer.class,
"someAction"));
// then
final Facet domainEventFacet =
facetedMethod.getFacet(ActionDomainEventFacet.class);
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 e7e3fb5961..7e8e89ec4a 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
@@ -16,7 +16,6 @@
* under the License. */
package org.apache.causeway.core.metamodel.facets.collections.collection;
-import java.lang.reflect.Method;
import java.util.List;
import java.util.Optional;
@@ -24,13 +23,11 @@ import org.hamcrest.Matchers;
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;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.Mockito.calls;
import org.apache.causeway.applib.annotation.Collection;
import org.apache.causeway.applib.annotation.Where;
@@ -44,7 +41,6 @@ import
org.apache.causeway.core.metamodel.facets.actcoll.typeof.TypeOfFacetFromF
import org.apache.causeway.core.metamodel.facets.all.hide.HiddenFacet;
import
org.apache.causeway.core.metamodel.facets.collections.collection.hidden.HiddenFacetForCollectionAnnotation;
import
org.apache.causeway.core.metamodel.facets.collections.collection.typeof.TypeOfFacetForCollectionAnnotation;
-import org.apache.causeway.core.metamodel.spec.ObjectSpecification;
import lombok.val;
@@ -53,18 +49,6 @@ class CollectionAnnotationFacetFactoryTest
extends FacetFactoryTestAbstract {
CollectionAnnotationFacetFactory facetFactory;
- Method collectionMethod;
-
- ObjectSpecification mockTypeSpec;
- ObjectSpecification mockReturnTypeSpec;
-
- void expectRemoveMethod(final Method actionMethod) {
-
- mockTypeSpec = Mockito.mock(ObjectSpecification.class);
- mockReturnTypeSpec = Mockito.mock(ObjectSpecification.class);
-
- Mockito.verify(mockMethodRemover, calls(1)).removeMethod(actionMethod);
- }
private static void processModify(
final CollectionAnnotationFacetFactory facetFactory, final
FacetFactory.ProcessMethodContext processMethodContext) {
@@ -78,14 +62,12 @@ extends FacetFactoryTestAbstract {
facetFactory.processHidden(processMethodContext, collectionIfAny);
}
-
private static void processTypeOf(
final CollectionAnnotationFacetFactory facetFactory, final
FacetFactory.ProcessMethodContext processMethodContext) {
val collectionIfAny =
processMethodContext.synthesizeOnMethod(Collection.class);
facetFactory.processTypeOf(processMethodContext, collectionIfAny);
}
-
@BeforeEach
public void setUp() throws Exception {
facetFactory = new CollectionAnnotationFacetFactory(metaModelContext);
@@ -96,7 +78,6 @@ extends FacetFactoryTestAbstract {
facetFactory = null;
}
-
@Deprecated(forRemoval = true, since = "2.0.0-RC2")
static class Hidden extends CollectionAnnotationFacetFactoryTest {
diff --git
a/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/object/ident/title/TitleFacetViaMethodTest.java
b/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/object/ident/title/TitleFacetViaMethodTest.java
index a83dd3c546..6b2c50846f 100644
---
a/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/object/ident/title/TitleFacetViaMethodTest.java
+++
b/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/object/ident/title/TitleFacetViaMethodTest.java
@@ -34,6 +34,8 @@ import
org.apache.causeway.core.metamodel.facets.FacetFactoryTestAbstract;
import
org.apache.causeway.core.metamodel.facets.object.title.methods.TitleFacetViaTitleMethod;
import org.apache.causeway.core.metamodel.object.ManagedObject;
+import lombok.val;
+
class TitleFacetViaMethodTest
extends FacetFactoryTestAbstract {
@@ -55,7 +57,7 @@ extends FacetFactoryTestAbstract {
metaModelContext = MetaModelContext_forTesting.builder()
.build();
- mockFacetHolder = Mockito.mock(FacetHolder.class);
+ val mockFacetHolder = Mockito.mock(FacetHolder.class);
Mockito.when(mockFacetHolder.getMetaModelContext()).thenReturn(metaModelContext);
pojo = new DomainObjectWithProblemInItsTitleMethod();
diff --git
a/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/object/navparent/annotation/NavigableParentAnnotationFacetFactoryTest.java
b/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/object/navparent/annotation/NavigableParentAnnotationFacetFactoryTest.java
index 88339de481..a5c54b4b79 100644
---
a/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/object/navparent/annotation/NavigableParentAnnotationFacetFactoryTest.java
+++
b/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/object/navparent/annotation/NavigableParentAnnotationFacetFactoryTest.java
@@ -21,8 +21,6 @@ package
org.apache.causeway.core.metamodel.facets.object.navparent.annotation;
import java.lang.reflect.Method;
import java.util.stream.Stream;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;
@@ -34,8 +32,8 @@ import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
import org.apache.causeway.commons.internal._Constants;
-import org.apache.causeway.core.metamodel.facets.FacetFactoryTestAbstract;
import
org.apache.causeway.core.metamodel.facets.FacetFactory.ProcessClassContext;
+import org.apache.causeway.core.metamodel.facets.FacetFactoryTestAbstract;
import
org.apache.causeway.core.metamodel.facets.object.navparent.NavigableParentFacet;
import
org.apache.causeway.core.metamodel.facets.object.navparent.annotation.NavigableParentTestSamples.DomainObjectInvalidParentAnnot;
import
org.apache.causeway.core.metamodel.facets.object.navparent.annotation.NavigableParentTestSamples.DomainObjectProperAnnot;
@@ -46,19 +44,6 @@ import lombok.val;
class NavigableParentAnnotationFacetFactoryTest
extends FacetFactoryTestAbstract {
- private NavigableParentAnnotationFacetFactory facetFactory;
-
- @BeforeEach
- void setUp() throws Exception {
- super.setUpMmc();
- super.setUpFacetedMethodAndParameter();
- }
-
- @AfterEach
- protected void tearDown() throws Exception {
- facetFactory = null;
- }
-
static Stream<Arguments> navigableTypeArgs() {
return Stream.of(
Arguments.of(new DomainObjectProperAnnot(), "root", null),
@@ -76,7 +61,7 @@ extends FacetFactoryTestAbstract {
val domainClass = domainObject.getClass();
val facetedMethod = facetedAction(domainClass, parentMethodName);
- facetFactory = new
NavigableParentAnnotationFacetFactory(getMetaModelContext());
+ val facetFactory = new
NavigableParentAnnotationFacetFactory(getMetaModelContext());
facetFactory.process(ProcessClassContext
.forTesting(domainClass, defaultMethodRemover(),
facetedMethod));
diff --git
a/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/param/name/ParameterNameFacetTest.java
b/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/param/name/ParameterNameFacetTest.java
index ff503ef44c..8a755a0667 100644
---
a/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/param/name/ParameterNameFacetTest.java
+++
b/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/param/name/ParameterNameFacetTest.java
@@ -18,8 +18,6 @@
*/
package org.apache.causeway.core.metamodel.facets.param.name;
-import java.lang.reflect.Method;
-
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -42,18 +40,11 @@ import lombok.val;
class ParameterNameFacetTest
extends FacetFactoryTestAbstract {
- ProgrammingModel programmingModel;
- Method actionMethod;
+ protected ProgrammingModel programmingModel;
@BeforeEach
public void setUp() throws Exception {
-
- val metaModelContext = MetaModelContext_forTesting.builder()
- .build();
-
- super.setUpFacetedMethodAndParameter();
-
- programmingModel = metaModelContext.getProgrammingModel();
+ programmingModel =
((MetaModelContext_forTesting)getMetaModelContext()).getProgrammingModel();
}
@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 171eb37e46..875ee89c53 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
@@ -18,21 +18,17 @@
*/
package org.apache.causeway.core.metamodel.facets.param.parameter;
-import java.lang.reflect.Method;
import java.util.regex.Pattern;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import org.mockito.Mock;
-import org.mockito.Mockito;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.Mockito.calls;
import org.apache.causeway.applib.annotation.Optionality;
import org.apache.causeway.applib.annotation.Parameter;
@@ -46,7 +42,6 @@ import
org.apache.causeway.core.metamodel.facets.param.parameter.mandatory.Manda
import
org.apache.causeway.core.metamodel.facets.param.parameter.maxlen.MaxLengthFacetForParameterAnnotation;
import
org.apache.causeway.core.metamodel.facets.param.parameter.mustsatisfy.MustSatisfySpecificationFacetForParameterAnnotation;
import
org.apache.causeway.core.metamodel.facets.param.parameter.regex.RegExFacetForParameterAnnotation;
-import org.apache.causeway.core.metamodel.spec.ObjectSpecification;
import lombok.val;
@@ -55,15 +50,6 @@ class ParameterAnnotationFacetFactoryTest
extends FacetFactoryTestAbstract {
ParameterAnnotationFacetFactory facetFactory;
- @Deprecated
- Method actionMethod;
-
- @Mock ObjectSpecification mockTypeSpec;
- @Mock ObjectSpecification mockReturnTypeSpec;
-
- void expectRemoveMethod(final Method actionMethod) {
- Mockito.verify(mockMethodRemover, calls(1)).removeMethod(actionMethod);
- }
@BeforeEach
public void setUp() throws Exception {
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 02c91c5a2d..6f303b426a 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
@@ -18,15 +18,12 @@
*/
package org.apache.causeway.core.metamodel.facets.properties.property;
-import java.lang.reflect.Method;
import java.util.regex.Pattern;
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.Mock;
-import org.mockito.Mockito;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
@@ -35,7 +32,6 @@ import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.Mockito.calls;
import org.apache.causeway.applib.annotation.Optionality;
import org.apache.causeway.applib.annotation.Property;
@@ -77,7 +73,6 @@ 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;
@@ -87,14 +82,6 @@ import lombok.val;
class PropertyAnnotationFacetFactoryTest extends FacetFactoryTestAbstract {
PropertyAnnotationFacetFactory facetFactory;
- Method propertyMethod;
-
- @Mock ObjectSpecification mockTypeSpec;
- @Mock ObjectSpecification mockReturnTypeSpec;
-
- void expectRemoveMethod(final Method actionMethod) {
- Mockito.verify(mockMethodRemover, calls(1)).removeMethod(actionMethod);
- }
private static void processModify(
final PropertyAnnotationFacetFactory facetFactory, final
FacetFactory.ProcessMethodContext processMethodContext) {
