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 2020/07/19 07:31:07 UTC
[isis] branch master updated: ISIS-2362: convert interaction tests
to new supporting m. notation
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 cadfb92 ISIS-2362: convert interaction tests to new supporting m. notation
cadfb92 is described below
commit cadfb92b4c3fa26b9fe5b3ad6905046d2707b6d6
Author: Andi Huber <ah...@apache.org>
AuthorDate: Sun Jul 19 09:30:46 2020 +0200
ISIS-2362: convert interaction tests to new supporting m. notation
---
.../interaction/InteractionDemo_biArgDisabled.java | 2 +-
.../interaction/InteractionDemo_biArgEnabled.java | 4 ++--
.../interaction/InteractionDemo_multiEnum.java | 12 +++++-----
.../interaction/InteractionDemo_multiInt.java | 18 +++++++-------
.../interaction/InteractionDemo_noArgDisabled.java | 2 +-
.../model/interaction/InteractionNpmDemo.java | 10 --------
.../testdomain/model/interaction/Parameters.java | 28 ++++++++++++++++++++++
.../isis/testdomain/interact/InteractionTest.java | 28 +++++++++++-----------
.../testdomain/interact/NewParameterModelTest.java | 2 +-
9 files changed, 62 insertions(+), 44 deletions(-)
diff --git a/examples/smoketests/stable/src/main/java/org/apache/isis/testdomain/model/interaction/InteractionDemo_biArgDisabled.java b/examples/smoketests/stable/src/main/java/org/apache/isis/testdomain/model/interaction/InteractionDemo_biArgDisabled.java
index 4adb9ee..0ad03b9 100644
--- a/examples/smoketests/stable/src/main/java/org/apache/isis/testdomain/model/interaction/InteractionDemo_biArgDisabled.java
+++ b/examples/smoketests/stable/src/main/java/org/apache/isis/testdomain/model/interaction/InteractionDemo_biArgDisabled.java
@@ -36,7 +36,7 @@ public class InteractionDemo_biArgDisabled {
}
@Model
- public String disableAct() {
+ public String disable() {
return "Disabled for demonstration.";
}
}
diff --git a/examples/smoketests/stable/src/main/java/org/apache/isis/testdomain/model/interaction/InteractionDemo_biArgEnabled.java b/examples/smoketests/stable/src/main/java/org/apache/isis/testdomain/model/interaction/InteractionDemo_biArgEnabled.java
index 1daac7b..daec17d 100644
--- a/examples/smoketests/stable/src/main/java/org/apache/isis/testdomain/model/interaction/InteractionDemo_biArgEnabled.java
+++ b/examples/smoketests/stable/src/main/java/org/apache/isis/testdomain/model/interaction/InteractionDemo_biArgEnabled.java
@@ -36,12 +36,12 @@ public class InteractionDemo_biArgEnabled {
}
@Model
- public int default0Act() {
+ public int defaultA(Parameters.BiInt p) {
return 5;
}
@Model
- public int[] choices1Act() {
+ public int[] choicesB(Parameters.BiInt p) {
return new int[] {1, 2, 3, 4};
}
}
diff --git a/examples/smoketests/stable/src/main/java/org/apache/isis/testdomain/model/interaction/InteractionDemo_multiEnum.java b/examples/smoketests/stable/src/main/java/org/apache/isis/testdomain/model/interaction/InteractionDemo_multiEnum.java
index 213a686..e2362a2 100644
--- a/examples/smoketests/stable/src/main/java/org/apache/isis/testdomain/model/interaction/InteractionDemo_multiEnum.java
+++ b/examples/smoketests/stable/src/main/java/org/apache/isis/testdomain/model/interaction/InteractionDemo_multiEnum.java
@@ -35,24 +35,24 @@ public class InteractionDemo_multiEnum {
return a.ordinal() * (b.ordinal() + c.ordinal());
}
- // -- PARAM 0
+ // -- PARAM A
@Model
- public DemoEnum default0Act() {
+ public DemoEnum defaultA(Parameters.TriEnum p) {
return DemoEnum.values()[1];
}
- // -- PARAM 1
+ // -- PARAM B
@Model
- public DemoEnum default1Act() {
+ public DemoEnum defaultB(Parameters.TriEnum p) {
return DemoEnum.values()[2];
}
- // -- PARAM 2
+ // -- PARAM C
@Model
- public DemoEnum default2Act() {
+ public DemoEnum defaultC(Parameters.TriEnum p) {
return DemoEnum.values()[3];
}
}
diff --git a/examples/smoketests/stable/src/main/java/org/apache/isis/testdomain/model/interaction/InteractionDemo_multiInt.java b/examples/smoketests/stable/src/main/java/org/apache/isis/testdomain/model/interaction/InteractionDemo_multiInt.java
index 8fc94bd..42d49e3 100644
--- a/examples/smoketests/stable/src/main/java/org/apache/isis/testdomain/model/interaction/InteractionDemo_multiInt.java
+++ b/examples/smoketests/stable/src/main/java/org/apache/isis/testdomain/model/interaction/InteractionDemo_multiInt.java
@@ -35,39 +35,39 @@ public class InteractionDemo_multiInt {
return a * (b + c);
}
- // -- PARAM 0
+ // -- PARAM A
@Model
- public int default0Act() {
+ public int defaultA(Parameters.TriInt p) {
return 2;
}
@Model
- public int[] choices0Act() {
+ public int[] choicesA(Parameters.TriInt p) {
return new int[] {1, 2, 3, 4};
}
- // -- PARAM 1
+ // -- PARAM B
@Model
- public int default1Act() {
+ public int defaultB(Parameters.TriInt p) {
return 3;
}
@Model
- public int[] choices1Act() {
+ public int[] choicesB(Parameters.TriInt p) {
return new int[] {1, 2, 3, 4};
}
- // -- PARAM 2
+ // -- PARAM C
@Model
- public int default2Act() {
+ public int defaultC(Parameters.TriInt p) {
return 4;
}
@Model
- public int[] choices2Act() {
+ public int[] choicesC(Parameters.TriInt p) {
return new int[] {1, 2, 3, 4};
}
}
diff --git a/examples/smoketests/stable/src/main/java/org/apache/isis/testdomain/model/interaction/InteractionDemo_noArgDisabled.java b/examples/smoketests/stable/src/main/java/org/apache/isis/testdomain/model/interaction/InteractionDemo_noArgDisabled.java
index beac8a8..2a048a4 100644
--- a/examples/smoketests/stable/src/main/java/org/apache/isis/testdomain/model/interaction/InteractionDemo_noArgDisabled.java
+++ b/examples/smoketests/stable/src/main/java/org/apache/isis/testdomain/model/interaction/InteractionDemo_noArgDisabled.java
@@ -36,7 +36,7 @@ public class InteractionDemo_noArgDisabled {
}
@Model
- public String disableAct() {
+ public String disable() {
return "Disabled for demonstration.";
}
diff --git a/examples/smoketests/stable/src/main/java/org/apache/isis/testdomain/model/interaction/InteractionNpmDemo.java b/examples/smoketests/stable/src/main/java/org/apache/isis/testdomain/model/interaction/InteractionNpmDemo.java
index 569fe2b..51b5a13 100644
--- a/examples/smoketests/stable/src/main/java/org/apache/isis/testdomain/model/interaction/InteractionNpmDemo.java
+++ b/examples/smoketests/stable/src/main/java/org/apache/isis/testdomain/model/interaction/InteractionNpmDemo.java
@@ -20,18 +20,12 @@ package org.apache.isis.testdomain.model.interaction;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.Nature;
-import org.apache.isis.applib.annotation.Property;
-import org.apache.isis.applib.annotation.PropertyLayout;
-
-import lombok.Getter;
-import lombok.Setter;
/**
* NPM ... New Parameter Model (a Programming Model introduced in v2)
@@ -42,9 +36,5 @@ import lombok.Setter;
@XmlAccessorType(XmlAccessType.FIELD)
@DomainObject(nature=Nature.VIEW_MODEL, objectType="smoketests.InteractionNpmDemo", editing=Editing.ENABLED)
public class InteractionNpmDemo {
-
- @Property
- @PropertyLayout(multiLine=3)
- @XmlElement @Getter @Setter private String stringMultiline; // not used yet for any tests
}
diff --git a/examples/smoketests/stable/src/main/java/org/apache/isis/testdomain/model/interaction/Parameters.java b/examples/smoketests/stable/src/main/java/org/apache/isis/testdomain/model/interaction/Parameters.java
new file mode 100644
index 0000000..74b6853
--- /dev/null
+++ b/examples/smoketests/stable/src/main/java/org/apache/isis/testdomain/model/interaction/Parameters.java
@@ -0,0 +1,28 @@
+package org.apache.isis.testdomain.model.interaction;
+
+import lombok.Value;
+import lombok.experimental.Accessors;
+
+final class Parameters {
+
+ @Value @Accessors(fluent = true)
+ public static class BiInt {
+ int a;
+ int b;
+ }
+
+ @Value @Accessors(fluent = true)
+ public static class TriInt {
+ int a;
+ int b;
+ int c;
+ }
+
+ @Value @Accessors(fluent = true)
+ public static class TriEnum {
+ DemoEnum a;
+ DemoEnum b;
+ DemoEnum c;
+ }
+
+}
diff --git a/examples/smoketests/stable/src/test/java/org/apache/isis/testdomain/interact/InteractionTest.java b/examples/smoketests/stable/src/test/java/org/apache/isis/testdomain/interact/InteractionTest.java
index e2ff27c..4424e59 100644
--- a/examples/smoketests/stable/src/test/java/org/apache/isis/testdomain/interact/InteractionTest.java
+++ b/examples/smoketests/stable/src/test/java/org/apache/isis/testdomain/interact/InteractionTest.java
@@ -225,7 +225,7 @@ class InteractionTest extends InteractionTestAbstract {
val pendingArgs = managedAction.getInteractionHead().defaults();
val expectedDefaults = Can.of(
- new InteractionDemo_biArgEnabled(null).default0Act(),
+ new InteractionDemo_biArgEnabled(null).defaultA(null),
0);
val actualDefaults = pendingArgs.getParamValues();
@@ -245,9 +245,9 @@ class InteractionTest extends InteractionTestAbstract {
val mixin = new InteractionDemo_multiInt(null);
val expectedDefaults = Can.<Integer>of(
- mixin.default0Act(),
- mixin.default1Act(),
- mixin.default2Act());
+ mixin.defaultA(null),
+ mixin.defaultB(null),
+ mixin.defaultC(null));
assertComponentWiseUnwrappedEquals(expectedDefaults, pendingArgs.getParamValues());
@@ -261,9 +261,9 @@ class InteractionTest extends InteractionTestAbstract {
uiParam.simulateChoiceSelect(3); // select 4th choice
val expectedParamsAfter = Can.<Integer>of(
- mixin.choices0Act()[3],
- mixin.default1Act(),
- mixin.default2Act());
+ mixin.choicesA(null)[3],
+ mixin.defaultB(null),
+ mixin.defaultC(null));
assertComponentWiseUnwrappedEquals(expectedParamsAfter, pendingArgs.getParamValues());
@@ -281,9 +281,9 @@ class InteractionTest extends InteractionTestAbstract {
val mixin = new InteractionDemo_multiEnum(null);
val expectedDefaults = Can.<DemoEnum>of(
- mixin.default0Act(),
- mixin.default1Act(),
- mixin.default2Act());
+ mixin.defaultA(null),
+ mixin.defaultB(null),
+ mixin.defaultC(null));
assertComponentWiseUnwrappedEquals(expectedDefaults, pendingArgs.getParamValues());
@@ -298,8 +298,8 @@ class InteractionTest extends InteractionTestAbstract {
val expectedParamsAfter = Can.<DemoEnum>of(
DemoEnum.values()[3],
- mixin.default1Act(),
- mixin.default2Act());
+ mixin.defaultB(null),
+ mixin.defaultC(null));
assertComponentWiseUnwrappedEquals(expectedParamsAfter, pendingArgs.getParamValues());
}
@@ -322,7 +322,7 @@ class InteractionTest extends InteractionTestAbstract {
assertTrue(param0Choices.getValue().isEmpty());
- val expectedChoices = new InteractionDemo_biArgEnabled(null).choices1Act();
+ val expectedChoices = new InteractionDemo_biArgEnabled(null).choicesB(null);
val actualChoices = param1Choices.getValue();
assertComponentWiseUnwrappedEquals(expectedChoices, actualChoices);
@@ -347,7 +347,7 @@ class InteractionTest extends InteractionTestAbstract {
uiParam1.bind(pendingArgs, choiceParamNr); // bind to param that has choices
uiParam1.simulateChoiceSelect(2); // select 3rd choice
- val expectedChoices = new InteractionDemo_biArgEnabled(null).choices1Act();
+ val expectedChoices = new InteractionDemo_biArgEnabled(null).choicesB(null);
val expectedChoice = expectedChoices[2]; // actual 3rd choice
Object actualChoiceAsSeenByBackend = pendingArgs.getParamValue(choiceParamNr).getPojo();
diff --git a/examples/smoketests/stable/src/test/java/org/apache/isis/testdomain/interact/NewParameterModelTest.java b/examples/smoketests/stable/src/test/java/org/apache/isis/testdomain/interact/NewParameterModelTest.java
index bfbf846..f27432e 100644
--- a/examples/smoketests/stable/src/test/java/org/apache/isis/testdomain/interact/NewParameterModelTest.java
+++ b/examples/smoketests/stable/src/test/java/org/apache/isis/testdomain/interact/NewParameterModelTest.java
@@ -156,7 +156,7 @@ class NewParameterModelTest extends InteractionTestAbstract {
val pendingArgs = managedAction.getInteractionHead().defaults();
val expectedDefaults = Can.of(
- new InteractionDemo_biArgEnabled(null).default0Act(),
+ new InteractionDemo_biArgEnabled(null).defaultA(null),
0);
val actualDefaults = pendingArgs.getParamValues().stream()
.map(ManagedObject::getPojo)