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 2022/01/24 10:02:53 UTC
[isis] branch master updated: ISIS-2944: enables test ProperMemberSupportDiscovery.WhenAnnotationOptional
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 2090862 ISIS-2944: enables test ProperMemberSupportDiscovery.WhenAnnotationOptional
2090862 is described below
commit 209086254c04798d17ad57eced39df1705474f5e
Author: andi-huber <ah...@apache.org>
AuthorDate: Mon Jan 24 11:01:43 2022 +0100
ISIS-2944: enables test
ProperMemberSupportDiscovery.WhenAnnotationOptional
---
.../domainmodel/DomainModelTest_usingGoodDomain.java | 16 ++++++++--------
.../model/good/ProperMemberSupportDiscovery.java | 3 ++-
2 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/regressiontests/stable-domainmodel/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingGoodDomain.java b/regressiontests/stable-domainmodel/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingGoodDomain.java
index bc7ecee..168c8f0 100644
--- a/regressiontests/stable-domainmodel/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingGoodDomain.java
+++ b/regressiontests/stable-domainmodel/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingGoodDomain.java
@@ -32,13 +32,6 @@ import org.junit.jupiter.params.provider.ValueSource;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.TestPropertySource;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assertions.fail;
-
import org.apache.isis.applib.annotation.Introspection.EncapsulationPolicy;
import org.apache.isis.applib.annotation.Introspection.MemberAnnotationPolicy;
import org.apache.isis.applib.services.jaxb.JaxbService;
@@ -87,6 +80,13 @@ import org.apache.isis.testdomain.model.good.ViewModelWithEncapsulatedMembers;
import org.apache.isis.testdomain.util.interaction.DomainObjectTesterFactory;
import org.apache.isis.testing.integtestsupport.applib.validate.DomainModelValidator;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+
import lombok.val;
@SpringBootTest(
@@ -582,7 +582,7 @@ class DomainModelTest_usingGoodDomain {
@ValueSource(classes = {
ProperMemberSupportDiscovery.WhenEncapsulationEnabled.class,
ProperMemberSupportDiscovery.WhenAnnotationRequired.class,
- //FIXME ProperMemberSupportDiscovery.WhenAnnotationOptional.class
+ ProperMemberSupportDiscovery.WhenAnnotationOptional.class
})
void properMemberSupportDiscovery(final Class<?> classUnderTest) {
diff --git a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/good/ProperMemberSupportDiscovery.java b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/good/ProperMemberSupportDiscovery.java
index 863518b..f8d437e 100644
--- a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/good/ProperMemberSupportDiscovery.java
+++ b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/good/ProperMemberSupportDiscovery.java
@@ -142,7 +142,8 @@ public class ProperMemberSupportDiscovery {
@DomainObject(
nature = Nature.VIEW_MODEL,
introspection = Introspection.ANNOTATION_OPTIONAL)
- public static class WhenAnnotationOptional {
+ public static class WhenAnnotationOptional
+ extends PublicBase {
// no annotation required, should be picked up as action
public void placeOrder(final String x, final String y) {