This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new 90e1992166 ISIS-3209: metamodel test fixes (3)
90e1992166 is described below
commit 90e1992166c0a76501c3fffab4d253292dd28c3c
Author: Andi Huber <[email protected]>
AuthorDate: Tue Sep 13 12:25:50 2022 +0200
ISIS-3209: metamodel test fixes (3)
---
...ctionAnnotationFacetFactoryTest_Invocation.java | 27 ++---
.../DomainObjectLayoutFactoryTest.java | 20 +---
.../services/menubars/BSMenuBarsTest.java | 3 -
...ionParameterAbstractTest_getId_and_getName.java | 126 ++++-----------------
4 files changed, 37 insertions(+), 139 deletions(-)
diff --git
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_Invocation.java
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_Invocation.java
index 0ed67fee0b..8bc49ee254 100644
---
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_Invocation.java
+++
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_Invocation.java
@@ -19,7 +19,6 @@
package org.apache.isis.core.metamodel.facets.actions.action;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -41,8 +40,6 @@ import static
org.apache.isis.core.metamodel.commons.matchers.IsisMatchers.class
import lombok.val;
-//FIXME[ISIS-3207]
-@DisabledIfSystemProperty(named = "isRunningWithSurefire", matches = "true")
class ActionAnnotationFacetFactoryTest_Invocation
extends ActionAnnotationFacetFactoryTest {
@@ -68,9 +65,6 @@ extends ActionAnnotationFacetFactoryTest {
final Class<?> cls = Customer.class;
actionMethod = findMethod(cls, "someAction");
- // expect
- expectRemoveMethod(actionMethod);
-
super.metaModelContext.getConfiguration()
.getApplib().getAnnotation().getAction().getDomainEvent().setPostForDefault(true);
@@ -79,6 +73,9 @@ extends ActionAnnotationFacetFactoryTest {
.forTesting(cls, null, actionMethod, mockMethodRemover,
facetedMethod);
processInvocation(facetFactory, processMethodContext);
+ // expect
+ expectRemoveMethod(actionMethod);
+
// then
final ActionDomainEventFacet domainEventFacet =
facetedMethod.getFacet(ActionDomainEventFacet.class);
assertNotNull(domainEventFacet);
@@ -109,14 +106,14 @@ extends ActionAnnotationFacetFactoryTest {
final Class<?> cls = Customer.class;
actionMethod = findMethod(cls, "someAction");
- // expect
- expectRemoveMethod(actionMethod);
-
// when
final ProcessMethodContext processMethodContext = ProcessMethodContext
.forTesting(cls, null, actionMethod, mockMethodRemover,
facetedMethod);
processInvocation(facetFactory, processMethodContext);
+ // expect
+ expectRemoveMethod(actionMethod);
+
// then
final Facet domainEventFacet =
facetedMethod.getFacet(ActionDomainEventFacet.class);
assertNotNull(domainEventFacet);
@@ -150,14 +147,14 @@ extends ActionAnnotationFacetFactoryTest {
final Class<?> cls = Customer.class;
actionMethod = findMethod(cls, "someAction");
- // expect
- expectRemoveMethod(actionMethod);
-
// when
final ProcessMethodContext processMethodContext = ProcessMethodContext
.forTesting(cls, null, actionMethod, mockMethodRemover,
facetedMethod);
processInvocation(facetFactory, processMethodContext);
+ // expect
+ expectRemoveMethod(actionMethod);
+
// then
final Facet domainEventFacet =
facetedMethod.getFacet(ActionDomainEventFacet.class);
assertNotNull(domainEventFacet);
@@ -185,9 +182,6 @@ extends ActionAnnotationFacetFactoryTest {
final Class<?> cls = Customer.class;
actionMethod = findMethod(cls, "someAction");
- // expect
- expectRemoveMethod(actionMethod);
-
super.metaModelContext.getConfiguration()
.getApplib().getAnnotation().getAction().getDomainEvent().setPostForDefault(true);
@@ -196,6 +190,9 @@ extends ActionAnnotationFacetFactoryTest {
.forTesting(cls, null, actionMethod, mockMethodRemover,
facetedMethod);
processInvocation(facetFactory, processMethodContext);
+ // expect
+ expectRemoveMethod(actionMethod);
+
// then
final Facet domainEventFacet =
facetedMethod.getFacet(ActionDomainEventFacet.class);
assertNotNull(domainEventFacet);
diff --git
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/DomainObjectLayoutFactoryTest.java
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/DomainObjectLayoutFactoryTest.java
index fd37e0f4c7..ff532464ce 100644
---
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/DomainObjectLayoutFactoryTest.java
+++
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/DomainObjectLayoutFactoryTest.java
@@ -21,7 +21,6 @@ package
org.apache.isis.core.metamodel.facets.object.domainobjectlayout;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;
@@ -136,14 +135,10 @@ extends AbstractFacetFactoryJupiterTestCase {
}
// --
- //FIXME[ISIS-3207]
- @DisabledIfSystemProperty(named = "isRunningWithSurefire", matches =
"true")
public static class CssClass extends DomainObjectLayoutFactoryTest {
@Mock ManagedObject mockAdapter;
- //FIXME[ISIS-3207]
- @DisabledIfSystemProperty(named = "isRunningWithSurefire", matches =
"true")
public static class ForDomainObjectLayout extends CssClass {
@Override
@@ -190,8 +185,7 @@ extends AbstractFacetFactoryJupiterTestCase {
public static class CssClassFa extends DomainObjectLayoutFactoryTest {
- @Mock
- ManagedObject mockAdapter;
+ @Mock ManagedObject mockAdapter;
public static class ForDomainObjectLayout extends CssClassFa {
@@ -239,8 +233,7 @@ extends AbstractFacetFactoryJupiterTestCase {
public static class DescribedAs extends DomainObjectLayoutFactoryTest {
- @Mock
- ManagedObject mockAdapter;
+ @Mock ManagedObject mockAdapter;
public static class ForDomainObjectLayout extends DescribedAs {
@@ -286,8 +279,7 @@ extends AbstractFacetFactoryJupiterTestCase {
public static class Named extends DomainObjectLayoutFactoryTest {
- @Mock
- ManagedObject mockAdapter;
+ @Mock ManagedObject mockAdapter;
public static class ForDomainObjectLayout extends Named {
@@ -332,8 +324,7 @@ extends AbstractFacetFactoryJupiterTestCase {
public static class Paged extends DomainObjectLayoutFactoryTest {
- @Mock
- ManagedObject mockAdapter;
+ @Mock ManagedObject mockAdapter;
public static class ForDomainObjectLayout extends Paged {
@@ -378,8 +369,7 @@ extends AbstractFacetFactoryJupiterTestCase {
public static class Plural extends DomainObjectLayoutFactoryTest {
- @Mock
- ManagedObject mockAdapter;
+ @Mock ManagedObject mockAdapter;
public static class ForDomainObjectLayout extends Plural {
diff --git
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/menubars/BSMenuBarsTest.java
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/menubars/BSMenuBarsTest.java
index e6268ea300..f1ddea9369 100644
---
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/menubars/BSMenuBarsTest.java
+++
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/menubars/BSMenuBarsTest.java
@@ -24,7 +24,6 @@ import java.util.Map;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
import org.apache.isis.applib.layout.menubars.bootstrap.BSMenuBars;
import org.apache.isis.applib.services.jaxb.IsisSchemas;
@@ -32,8 +31,6 @@ import org.apache.isis.applib.services.jaxb.JaxbService;
import org.apache.isis.applib.services.jaxb.JaxbService.Simple;
import org.apache.isis.commons.internal.resources._Resources;
-//FIXME[ISIS-3207]
-@DisabledIfSystemProperty(named = "isRunningWithSurefire", matches = "true")
class BSMenuBarsTest {
private JaxbService jaxbService;
diff --git
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstractTest_getId_and_getName.java
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstractTest_getId_and_getName.java
index 82875f47c5..a2e2604a12 100644
---
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstractTest_getId_and_getName.java
+++
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstractTest_getId_and_getName.java
@@ -20,126 +20,40 @@ package org.apache.isis.core.metamodel.specloader.specimpl;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
-import org.mockito.Mock;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-import org.apache.isis.commons.collections.Can;
-import org.apache.isis.core.metamodel.consent.Consent;
-import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
-import org.apache.isis.core.metamodel.facetapi.FeatureType;
-import org.apache.isis.core.metamodel.facets.FacetedMethod;
-import org.apache.isis.core.metamodel.facets.TypedHolder;
-import org.apache.isis.core.metamodel.facets.all.named.ParamNamedFacet;
-import org.apache.isis.core.metamodel.interactions.InteractionHead;
-import org.apache.isis.core.metamodel.object.ManagedObject;
-import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.core.metamodel.spec.feature.ObjectActionParameter;
+import org.apache.isis.applib.annotation.Action;
+import org.apache.isis.applib.annotation.DomainObject;
+import org.apache.isis.applib.annotation.Nature;
+import org.apache.isis.core.metamodel._testing.MetaModelContext_forTesting;
+import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
-//FIXME[ISIS-3207]
-@DisabledIfSystemProperty(named = "isRunningWithSurefire", matches = "true")
-class ObjectActionParameterAbstractTest_getId_and_getName {
-
- @Mock ObjectActionDefault parentAction;
- @Mock TypedHolder actionParamPeer;
- @Mock ParamNamedFacet namedFacet;
- @Mock FacetedMethod mockFacetedMethod;
-
- @Mock ObjectSpecification stubSpecForString;
- @Mock ObjectActionParameter stubObjectActionParameterString;
- @Mock ObjectActionParameter stubObjectActionParameterString2;
-
- private static final class ObjectActionParameterAbstractToTest
- extends ObjectActionParameterAbstract {
- private ObjectActionParameterAbstractToTest(
- final int number,
- final ObjectActionDefault objectAction,
- final TypedHolder peer) {
- super(FeatureType.ACTION_PARAMETER_SCALAR, number, null,
objectAction);
- }
-
- private ObjectSpecification elementSpec;
-
- @Override
- public ManagedObject get(final ManagedObject owner, final
InteractionInitiatedBy interactionInitiatedBy) {
- return null;
- }
-
- @Override
- public FeatureType getFeatureType() {
- return null;
- }
-
- @Override
- public Consent isValid(final InteractionHead head, final
Can<ManagedObject> pendingArgs,
- final InteractionInitiatedBy interactionInitiatedBy) {
- return null;
- }
-
- @Override
- public ObjectSpecification getElementType() {
- return elementSpec;
- }
-
- public void setSpecification(final ObjectSpecification elementSpec) {
- this.elementSpec = elementSpec;
- }
-
- }
+import lombok.val;
- private ObjectActionParameterAbstractToTest objectActionParameter;
+class ObjectActionParameterAbstractTest_getId_and_getName {
- @SuppressWarnings("unused")
+ @DomainObject(nature = Nature.VIEW_MODEL)
private static class Customer {
- public void aMethod(final Object someParameterName, final Object arg1,
final Object arg2) {}
- }
-
- @BeforeEach
- public void setUp() throws Exception {
-
-//FIXME
-//
Mockito.when(stubSpecForString.getSingularName()).thenReturn("string");
-//
Mockito.when(stubObjectActionParameterString.getElementType()).thenReturn(stubSpecForString);
-//
Mockito.when(stubObjectActionParameterString2.getElementType()).thenReturn(stubSpecForString);
-//
Mockito.when(parentAction.getFacetedMethod()).thenReturn(mockFacetedMethod);
-// Mockito.when(mockFacetedMethod.getParameters())
-// .thenReturn(Can.<FacetedMethodParameter>of(
-// (FacetedMethodParameter)stubObjectActionParameterString,
-// (FacetedMethodParameter)objectActionParameter,
-// (FacetedMethodParameter)stubObjectActionParameterString2));
-// Mockito.when(mockFacetedMethod.getMethod())
-// .thenReturn(Customer.class.getMethod("aMethod", new Class[]
{Object.class, Object.class, Object.class}));
+ @Action
+ public void aMethod(final Object someParameterName, final Object arg1)
{}
}
- @Test
- public void getId_whenNamedFacetPresent() throws Exception {
-
- objectActionParameter = new ObjectActionParameterAbstractToTest(0,
parentAction, actionParamPeer);
+ private ObjectAction action;
- assertThat(objectActionParameter.getId(), is("someParameterName"));
+ @BeforeEach
+ public void setUp() {
+ val mmc = MetaModelContext_forTesting.buildDefault();
+ val spec =
mmc.getSpecificationLoader().loadSpecification(Customer.class);
+ action = spec.getAction("aMethod").orElseThrow();
}
@Test
- public void getName_whenNamedFacetPresent() throws Exception {
-
- objectActionParameter = new ObjectActionParameterAbstractToTest(0,
parentAction, actionParamPeer);
-
-//FIXME
-// context.checking(new Expectations() {
-// {
-//
-//
oneOf(stubObjectActionParameterString).getFacet(ParamNamedFacet.class);
-// will(returnValue(namedFacet));
-//
-// atLeast(1).of(namedFacet).translated();
-// will(returnValue("Some parameter name"));
-// }
-// });
-
- assertThat(objectActionParameter.getStaticFriendlyName().get(),
is("Some parameter name"));
+ public void shouldProperlyDetectParamIdAndName() {
+ val param0 = action.getParameters().getElseFail(0);
+ assertThat(param0.getId(), is("someParameterName"));
+ assertThat(param0.getStaticFriendlyName().get(), is("Some Parameter
Name"));
}
-
}
