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 eb33e0b3cb ISIS-3049: prepare new reg. test
eb33e0b3cb is described below
commit eb33e0b3cb081a2e00a300ab4f0a50d94df78446
Author: Andi Huber <[email protected]>
AuthorDate: Mon Jul 11 11:11:37 2022 +0200
ISIS-3049: prepare new reg. test
- testing annotation provided 'choicesFrom' fallback, if no explicit
choices member-support is given
---
.../domainmodel/MetaModelRegressionTest.java | 2 +-
.../src/test/resources/metamodel.xml.zip | Bin 89706 -> 90721 bytes
.../testdomain/model/good/ProperMemberSupport.java | 43 ++++++++++++++++++++-
.../model/good/ProperMemberSupport_action1.java | 3 ++
.../model/good/ProperMemberSupport_action2.java | 3 ++
.../model/good/ProperMemberSupport_action3.java | 3 ++
.../model/good/ProperMemberSupport_action4.java | 23 ++++++-----
.../model/good/ProperMemberSupport_action5.java | 3 ++
...tion5.java => ProperMemberSupport_action6.java} | 24 +++++-------
.../good/ProperMemberSupport_collection1.java | 3 ++
.../good/ProperMemberSupport_collection2.java | 3 ++
.../good/ProperMemberSupport_collection3.java | 3 ++
.../model/good/ProperMemberSupport_property1.java | 5 ++-
.../model/good/ProperMemberSupport_property2.java | 5 ++-
.../model/good/ProperMemberSupport_property3.java | 3 ++
15 files changed, 97 insertions(+), 29 deletions(-)
diff --git
a/regressiontests/stable-domainmodel/src/test/java/org/apache/isis/testdomain/domainmodel/MetaModelRegressionTest.java
b/regressiontests/stable-domainmodel/src/test/java/org/apache/isis/testdomain/domainmodel/MetaModelRegressionTest.java
index 2478a7b0b5..0421f4d6b3 100644
---
a/regressiontests/stable-domainmodel/src/test/java/org/apache/isis/testdomain/domainmodel/MetaModelRegressionTest.java
+++
b/regressiontests/stable-domainmodel/src/test/java/org/apache/isis/testdomain/domainmodel/MetaModelRegressionTest.java
@@ -83,7 +83,7 @@ class MetaModelRegressionTest {
}
//for maintenance
- //createReferenceMetaModelFile(new
File("d:/tmp/_scratch/metamodel.xml.zip"));
+ createReferenceMetaModelFile(new
File("d:/tmp/_scratch/metamodel.xml.zip"));
}
@Test
diff --git
a/regressiontests/stable-domainmodel/src/test/resources/metamodel.xml.zip
b/regressiontests/stable-domainmodel/src/test/resources/metamodel.xml.zip
index 59b75137e3..5044160038 100644
Binary files
a/regressiontests/stable-domainmodel/src/test/resources/metamodel.xml.zip and
b/regressiontests/stable-domainmodel/src/test/resources/metamodel.xml.zip differ
diff --git
a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/good/ProperMemberSupport.java
b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/good/ProperMemberSupport.java
index b04cc76064..4a021a3304 100644
---
a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/good/ProperMemberSupport.java
+++
b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/good/ProperMemberSupport.java
@@ -49,7 +49,48 @@ import lombok.Setter;
* named x x x
* validate x x x
* </pre>
- *
+ * <p>
+ * Mixins
+ * <table><tr>
+ * <td><b>action1</b></td><td>
+ * testing whether member-support methods are picked up when prefixed by
param-index,
+ * also testing proper mixed-in member-id, also friendly name and description
from annotation
+ * </td></tr><tr>
+ * <td><b>action2</b></td><td>
+ * testing whether has PublishedActionFacet
+ * </td></tr><tr>
+ * <td><b>action3</b></td><td>
+ * testing whether member-support methods are picked up when prefixed by
param-index,
+ * (variant of action1, with non-scalar action parameters)
+ * </td></tr><tr>
+ * <td><b>action4</b></td><td>
+ * testing whether member-support methods are picked up when prefixed by
param-name
+ * </td></tr><tr>
+ * <td><b>action5</b></td><td>
+ * testing imperative naming and describing
+ * </td></tr><tr>
+ * <td><b>action6</b></td><td>
+ * testing annotation provided 'choicesFrom' fallback,
+ * if no explicit choices member-support is given
+ * </td></tr><tr>
+ * <td><b>property1</b></td><td>
+ * analog to action1
+ * </td></tr><tr>
+ * <td><b>property2</b></td><td>
+ * analog to action2
+ * </td></tr><tr>
+ * <td><b>property3</b></td><td>
+ * testing imperative naming and describing
+ * </td></tr><tr>
+ * <td><b>collection1</b></td><td>
+ * analog to action1
+ * </td></tr><tr>
+ * <td><b>collection2</b></td><td>
+ * analog to action2
+ * </td></tr><tr>
+ * <td><b>collection3</b></td><td>
+ * testing imperative naming and describing
+ * </td></tr></table>
*/
@DomainObject(nature = Nature.VIEW_MODEL)
public class ProperMemberSupport {
diff --git
a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/good/ProperMemberSupport_action1.java
b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/good/ProperMemberSupport_action1.java
index 49e225399a..4ea7a371a9 100644
---
a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/good/ProperMemberSupport_action1.java
+++
b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/good/ProperMemberSupport_action1.java
@@ -28,6 +28,9 @@ import org.apache.isis.applib.annotation.Publishing;
import lombok.RequiredArgsConstructor;
+/**
+ * For (test) mixin descriptions see {@link ProperMemberSupport}.
+ */
@Action(executionPublishing = Publishing.ENABLED)
@ActionLayout(named = "foo", describedAs = "bar")
@RequiredArgsConstructor
diff --git
a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/good/ProperMemberSupport_action2.java
b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/good/ProperMemberSupport_action2.java
index 7f56665d5b..97c85cda3b 100644
---
a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/good/ProperMemberSupport_action2.java
+++
b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/good/ProperMemberSupport_action2.java
@@ -27,6 +27,9 @@ import org.apache.isis.applib.annotation.Publishing;
import lombok.RequiredArgsConstructor;
+/**
+ * For (test) mixin descriptions see {@link ProperMemberSupport}.
+ */
@Action(executionPublishing = Publishing.ENABLED)
@RequiredArgsConstructor
public class ProperMemberSupport_action2 {
diff --git
a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/good/ProperMemberSupport_action3.java
b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/good/ProperMemberSupport_action3.java
index 6e5994e5e1..615fe419d3 100644
---
a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/good/ProperMemberSupport_action3.java
+++
b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/good/ProperMemberSupport_action3.java
@@ -28,6 +28,9 @@ import org.apache.isis.applib.annotation.Publishing;
import lombok.RequiredArgsConstructor;
+/**
+ * For (test) mixin descriptions see {@link ProperMemberSupport}.
+ */
@Action(executionPublishing = Publishing.ENABLED)
@RequiredArgsConstructor
public class ProperMemberSupport_action3 {
diff --git
a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/good/ProperMemberSupport_action4.java
b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/good/ProperMemberSupport_action4.java
index 497569c795..9529e3c1fa 100644
---
a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/good/ProperMemberSupport_action4.java
+++
b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/good/ProperMemberSupport_action4.java
@@ -30,6 +30,9 @@ import lombok.RequiredArgsConstructor;
import lombok.Value;
import lombok.experimental.Accessors;
+/**
+ * For (test) mixin descriptions see {@link ProperMemberSupport}.
+ */
@Action(executionPublishing = Publishing.ENABLED)
@RequiredArgsConstructor
public class ProperMemberSupport_action4 {
@@ -44,7 +47,7 @@ public class ProperMemberSupport_action4 {
// proper mix-in action
- public ProperMemberSupport act(List<String> a, List<String> b) {
+ public ProperMemberSupport act(final List<String> a, final List<String> b)
{
return holder;
}
@@ -56,39 +59,39 @@ public class ProperMemberSupport_action4 {
return false;
}
- @MemberSupport public String validateAct(Parameter params) {
+ @MemberSupport public String validateAct(final Parameter params) {
return null;
}
- @MemberSupport public Set<String> autoCompleteA(Parameter params,
@MinLength(3) String search) {
+ @MemberSupport public Set<String> autoCompleteA(final Parameter params,
@MinLength(3) final String search) {
return null;
}
- @MemberSupport public Set<String> autoCompleteB(Parameter params,
@MinLength(3) String search) {
+ @MemberSupport public Set<String> autoCompleteB(final Parameter params,
@MinLength(3) final String search) {
return null;
}
- @MemberSupport public Set<String> choicesA(Parameter params) {
+ @MemberSupport public Set<String> choicesA(final Parameter params) {
return null;
}
- @MemberSupport public Set<String> choicesB(Parameter params) {
+ @MemberSupport public Set<String> choicesB(final Parameter params) {
return null;
}
- @MemberSupport public List<String> defaultA(Parameter params) {
+ @MemberSupport public List<String> defaultA(final Parameter params) {
return null;
}
- @MemberSupport public List<String> defaultB(Parameter params) {
+ @MemberSupport public List<String> defaultB(final Parameter params) {
return null;
}
- @MemberSupport public String validateA(Parameter params) {
+ @MemberSupport public String validateA(final Parameter params) {
return null;
}
- @MemberSupport public String validateB(Parameter params) {
+ @MemberSupport public String validateB(final Parameter params) {
return null;
}
diff --git
a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/good/ProperMemberSupport_action5.java
b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/good/ProperMemberSupport_action5.java
index 925c15291e..4f0a9da3c0 100644
---
a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/good/ProperMemberSupport_action5.java
+++
b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/good/ProperMemberSupport_action5.java
@@ -24,6 +24,9 @@ import org.apache.isis.applib.annotation.Publishing;
import lombok.RequiredArgsConstructor;
+/**
+ * For (test) mixin descriptions see {@link ProperMemberSupport}.
+ */
@Action(executionPublishing = Publishing.ENABLED)
@RequiredArgsConstructor
public class ProperMemberSupport_action5 {
diff --git
a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/good/ProperMemberSupport_action5.java
b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/good/ProperMemberSupport_action6.java
similarity index 71%
copy from
regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/good/ProperMemberSupport_action5.java
copy to
regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/good/ProperMemberSupport_action6.java
index 925c15291e..bea2d14aec 100644
---
a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/good/ProperMemberSupport_action5.java
+++
b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/good/ProperMemberSupport_action6.java
@@ -20,29 +20,23 @@ package org.apache.isis.testdomain.model.good;
import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.annotation.MemberSupport;
-import org.apache.isis.applib.annotation.Publishing;
import lombok.RequiredArgsConstructor;
-@Action(executionPublishing = Publishing.ENABLED)
+/**
+ * Testing annotation provided 'choicesFrom' fallback,
+ * if no explicit choices member-support is given.
+ * <p>
+ * For (test) mixin descriptions see {@link ProperMemberSupport}.
+ */
+@Action(choicesFrom = "myColl")
@RequiredArgsConstructor
-public class ProperMemberSupport_action5 {
+public class ProperMemberSupport_action6 {
private final ProperMemberSupport mixee;
- @MemberSupport public ProperMemberSupport act() {
+ @MemberSupport public ProperMemberSupport act(final String p0) {
return mixee;
}
- // -- IMPERATIVE NAMING AND DESCRIBING
-
- @MemberSupport public String namedAct() {
- return "named-imperative[action5]";
- }
-
- @MemberSupport public String describedAct() {
- return "described-imperative[action5]";
- }
-
-
}
diff --git
a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/good/ProperMemberSupport_collection1.java
b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/good/ProperMemberSupport_collection1.java
index 083bbd3371..d59a3ca26f 100644
---
a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/good/ProperMemberSupport_collection1.java
+++
b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/good/ProperMemberSupport_collection1.java
@@ -27,6 +27,9 @@ import org.apache.isis.applib.annotation.MemberSupport;
import lombok.RequiredArgsConstructor;
+/**
+ * For (test) mixin descriptions see {@link ProperMemberSupport}.
+ */
@Collection
@CollectionLayout(named = "foo", describedAs = "bar")
@RequiredArgsConstructor
diff --git
a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/good/ProperMemberSupport_collection2.java
b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/good/ProperMemberSupport_collection2.java
index 44e7080df6..2e59c1af44 100644
---
a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/good/ProperMemberSupport_collection2.java
+++
b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/good/ProperMemberSupport_collection2.java
@@ -27,6 +27,9 @@ import org.apache.isis.applib.annotation.MemberSupport;
import lombok.RequiredArgsConstructor;
+/**
+ * For (test) mixin descriptions see {@link ProperMemberSupport}.
+ */
@Collection
@CollectionLayout(named = "foo", describedAs = "bar")
@RequiredArgsConstructor
diff --git
a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/good/ProperMemberSupport_collection3.java
b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/good/ProperMemberSupport_collection3.java
index 09f3991391..87ceb0beaf 100644
---
a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/good/ProperMemberSupport_collection3.java
+++
b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/good/ProperMemberSupport_collection3.java
@@ -27,6 +27,9 @@ import org.apache.isis.applib.annotation.MemberSupport;
import lombok.RequiredArgsConstructor;
+/**
+ * For (test) mixin descriptions see {@link ProperMemberSupport}.
+ */
@Collection
@CollectionLayout(named = "foo", describedAs = "bar") // <-- overruled by
imperative naming
@RequiredArgsConstructor
diff --git
a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/good/ProperMemberSupport_property1.java
b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/good/ProperMemberSupport_property1.java
index 0a5c315365..da4b46479c 100644
---
a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/good/ProperMemberSupport_property1.java
+++
b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/good/ProperMemberSupport_property1.java
@@ -27,6 +27,9 @@ import org.apache.isis.applib.annotation.PropertyLayout;
import lombok.RequiredArgsConstructor;
+/**
+ * For (test) mixin descriptions see {@link ProperMemberSupport}.
+ */
@Property
@PropertyLayout(named = "foo", describedAs = "bar")
@RequiredArgsConstructor
@@ -42,7 +45,7 @@ public class ProperMemberSupport_property1 {
// -- PROPERLY DECLARED SUPPORTING METHODS
- @MemberSupport public Set<String> autoCompleteProp(@MinLength(3) String
search) {
+ @MemberSupport public Set<String> autoCompleteProp(@MinLength(3) final
String search) {
return null;
}
diff --git
a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/good/ProperMemberSupport_property2.java
b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/good/ProperMemberSupport_property2.java
index 2e3c180ac1..68a2adf813 100644
---
a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/good/ProperMemberSupport_property2.java
+++
b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/good/ProperMemberSupport_property2.java
@@ -27,6 +27,9 @@ import org.apache.isis.applib.annotation.PropertyLayout;
import lombok.RequiredArgsConstructor;
+/**
+ * For (test) mixin descriptions see {@link ProperMemberSupport}.
+ */
@Property
@PropertyLayout(named= "foo", describedAs = "bar")
@RequiredArgsConstructor
@@ -43,7 +46,7 @@ public class ProperMemberSupport_property2 {
// -- PROPERLY DECLARED SUPPORTING METHODS
- @MemberSupport public Set<String> autoCompleteProp(@MinLength(3) String
search) {
+ @MemberSupport public Set<String> autoCompleteProp(@MinLength(3) final
String search) {
return null;
}
diff --git
a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/good/ProperMemberSupport_property3.java
b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/good/ProperMemberSupport_property3.java
index ca0cd82fb2..d0ada7c6ed 100644
---
a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/good/ProperMemberSupport_property3.java
+++
b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/good/ProperMemberSupport_property3.java
@@ -24,6 +24,9 @@ import org.apache.isis.applib.annotation.PropertyLayout;
import lombok.RequiredArgsConstructor;
+/**
+ * For (test) mixin descriptions see {@link ProperMemberSupport}.
+ */
@Property
@PropertyLayout(named= "foo", describedAs = "bar") // <-- overruled by
imperative naming, but used for column naming and describing
@RequiredArgsConstructor
