You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2021/09/03 10:03:20 UTC
[isis] branch master updated: ISIS-2774: re-instate
testTitleAnnotatedMethodsPickedUpOnClass
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 71d548c ISIS-2774: re-instate testTitleAnnotatedMethodsPickedUpOnClass
71d548c is described below
commit 71d548c233e8fa473ebebc44344d43d68b40061b
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri Sep 3 12:03:09 2021 +0200
ISIS-2774: re-instate testTitleAnnotatedMethodsPickedUpOnClass
---
.../annotation/TitleFacetViaTitleAnnotation.java | 3 ++-
.../specloader/SpecificationLoaderDefault.java | 2 +-
.../action/ActionAnnotationFacetFactoryTest.java | 5 ++--
.../TitleAnnotationFacetFactoryTest.java | 28 ++++++++++++++++------
4 files changed, 27 insertions(+), 11 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/title/annotation/TitleFacetViaTitleAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/title/annotation/TitleFacetViaTitleAnnotation.java
index f54e30a..02a3497 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/title/annotation/TitleFacetViaTitleAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/title/annotation/TitleFacetViaTitleAnnotation.java
@@ -133,7 +133,8 @@ implements ImperativeFacet {
}
// ignore context, if provided
val titlePartAdapter = objectManager.adapt(titlePart);
- if(skipTitlePartEvaluator != null && skipTitlePartEvaluator.test(titlePartAdapter)) {
+ if(skipTitlePartEvaluator != null
+ && skipTitlePartEvaluator.test(titlePartAdapter)) {
continue;
}
String title = titleOf(titlePartAdapter);
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderDefault.java
index 4d9125f..2052501 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderDefault.java
@@ -30,7 +30,6 @@ import java.util.function.Function;
import java.util.stream.Collectors;
import java.util.stream.Stream;
-import org.springframework.lang.Nullable;
import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
import javax.annotation.Priority;
@@ -38,6 +37,7 @@ import javax.inject.Inject;
import javax.inject.Named;
import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.lang.Nullable;
import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.PriorityPrecedence;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest.java
index f5aac63..06a164a 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest.java
@@ -35,7 +35,8 @@ import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import lombok.val;
-public class ActionAnnotationFacetFactoryTest extends AbstractFacetFactoryJUnit4TestCase {
+public class ActionAnnotationFacetFactoryTest
+extends AbstractFacetFactoryJUnit4TestCase {
ActionAnnotationFacetFactory facetFactory;
Method actionMethod;
@@ -100,7 +101,7 @@ public class ActionAnnotationFacetFactoryTest extends AbstractFacetFactoryJUnit4
}
- void allowingPublishingConfigurationToReturn(PublishingPolicies.ActionPublishingPolicy value) {
+ void allowingPublishingConfigurationToReturn(final PublishingPolicies.ActionPublishingPolicy value) {
val config = metaModelContext.getConfiguration();
config.getApplib().getAnnotation().getAction().setExecutionPublishing(value);
}
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/title/annotation/TitleAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/title/annotation/TitleAnnotationFacetFactoryTest.java
index 6af1bed..810bf40 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/title/annotation/TitleAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/title/annotation/TitleAnnotationFacetFactoryTest.java
@@ -21,6 +21,7 @@ package org.apache.isis.core.metamodel.facets.object.ident.title.annotation;
import java.lang.reflect.Method;
import java.util.Arrays;
import java.util.List;
+import java.util.Optional;
import org.jmock.Expectations;
import org.jmock.auto.Mock;
@@ -42,6 +43,7 @@ import org.apache.isis.core.metamodel.facets.object.title.TitleFacet;
import org.apache.isis.core.metamodel.facets.object.title.annotation.TitleAnnotationFacetFactory;
import org.apache.isis.core.metamodel.facets.object.title.annotation.TitleFacetViaTitleAnnotation;
import org.apache.isis.core.metamodel.spec.ManagedObject;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
public class TitleAnnotationFacetFactoryTest
extends AbstractFacetFactoryJUnit4TestCase {
@@ -49,6 +51,7 @@ extends AbstractFacetFactoryJUnit4TestCase {
private TitleAnnotationFacetFactory facetFactory;
@Mock private ManagedObject mockObjectAdapter;
+ @Mock private ObjectSpecification mockStringSpec;
@Before
public void setUp() throws Exception {
@@ -114,7 +117,6 @@ extends AbstractFacetFactoryJUnit4TestCase {
}
- @Ignore //FIXME[ISI-2774] to re-instate
@Test
public void testTitleAnnotatedMethodsPickedUpOnClass() throws Exception {
@@ -140,12 +142,24 @@ extends AbstractFacetFactoryJUnit4TestCase {
final Customer2 customer = new Customer2();
- context.checking(new Expectations() {
- {
- allowing(mockObjectAdapter).getPojo();
- will(returnValue(customer));
- }
- });
+ context.checking(new Expectations() {{
+
+ allowing(mockSpecificationLoader).specForType(String.class);
+ will(returnValue(Optional.of(mockStringSpec)));
+
+ allowing(mockObjectAdapter).getPojo();
+ will(returnValue(customer));
+
+ allowing(mockStringSpec).getCorrespondingClass();
+ will(returnValue(String.class));
+
+ allowing(mockStringSpec).isParentedOrFreeCollection();
+ will(returnValue(false));
+
+ ignoring(mockStringSpec).assertPojoCompatible("titleElement1");
+ ignoring(mockStringSpec).assertPojoCompatible("titleElement2");
+ ignoring(mockStringSpec).assertPojoCompatible("titleElement3");
+ }});
final String title = titleFacetViaTitleAnnotation.title(mockObjectAdapter);
assertThat(title, is("titleElement1. titleElement3,titleElement2"));
}