[causeway] branch spring6 updated: CAUSEWAY-3348: adds tests for the new PAT using a java record type

[ah...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

ahuber pushed a commit to branch spring6
in repository https://gitbox.apache.org/repos/asf/causeway.git


The following commit(s) were added to refs/heads/spring6 by this push:
     new e468402234 CAUSEWAY-3348: adds tests for the new PAT using a java record type
e468402234 is described below

commit e468402234c4b541320bc7510473a3a75e30a34d
Author: Andi Huber <ah...@apache.org>
AuthorDate: Sun Feb 5 23:48:23 2023 +0100

    CAUSEWAY-3348: adds tests for the new PAT using a java record type
---
 .../testdomain/interact/NewParameterModelTest.java |  6 +--
 .../InteractionNpmDemo_patRecordEnabled.java       | 63 ++++++++++++++++++++++
 2 files changed, 66 insertions(+), 3 deletions(-)

diff --git a/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/NewParameterModelTest.java b/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/NewParameterModelTest.java
index ad4e5241c6..ef192a8c22 100644
--- a/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/NewParameterModelTest.java
+++ b/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/NewParameterModelTest.java
@@ -72,7 +72,7 @@ class NewParameterModelTest extends InteractionTestAbstract {
     }
 
     @ParameterizedTest
-    @ValueSource(strings = {"biArgEnabled", "patEnabled"})
+    @ValueSource(strings = {"biArgEnabled", "patEnabled", "patRecordEnabled"})
     void paramAnnotations_whenNpm_shouldBeRecognized(final String mixinName) {
 
         val param0Metamodel = startActionInteractionOn(InteractionNpmDemo.class, mixinName, Where.OBJECT_FORMS)
@@ -167,7 +167,7 @@ class NewParameterModelTest extends InteractionTestAbstract {
     }
 
     @ParameterizedTest
-    @ValueSource(strings = {"biArgEnabled", "patEnabled"})
+    @ValueSource(strings = {"biArgEnabled", "patEnabled", "patRecordEnabled"})
     void actionInteraction_shouldProvideChoices(final String mixinName) {
 
         val actionInteraction = startActionInteractionOn(InteractionNpmDemo.class, mixinName, Where.OBJECT_FORMS)
@@ -188,7 +188,7 @@ class NewParameterModelTest extends InteractionTestAbstract {
         val actualChoices = param1Choices.getValue();
 
         assertComponentWiseUnwrappedEquals(expectedChoices, actualChoices);
-        
+
     }
 
 
diff --git a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/model/interaction/InteractionNpmDemo_patRecordEnabled.java b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/model/interaction/InteractionNpmDemo_patRecordEnabled.java
new file mode 100644
index 0000000000..7a6d0e840a
--- /dev/null
+++ b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/model/interaction/InteractionNpmDemo_patRecordEnabled.java
@@ -0,0 +1,63 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+package org.apache.causeway.testdomain.model.interaction;
+
+import org.apache.causeway.applib.annotation.Action;
+import org.apache.causeway.applib.annotation.MemberSupport;
+import org.apache.causeway.applib.annotation.Parameter;
+import org.apache.causeway.applib.annotation.ParameterAsTuple;
+import org.apache.causeway.applib.annotation.ParameterLayout;
+
+import lombok.RequiredArgsConstructor;
+
+@Action
+@RequiredArgsConstructor
+public class InteractionNpmDemo_patRecordEnabled {
+
+    @SuppressWarnings("unused")
+    private final InteractionNpmDemo holder;
+
+    /**
+     * Parameters as Tuple (PAT) example.
+     */
+    public static record Params(
+            @Parameter(maxLength = 2) // setup so we can test for this facet
+            @ParameterLayout(describedAs = "first") // setup so we can test for this facet
+            int a,
+            int b) {
+    }
+
+    @MemberSupport public int act(final @ParameterAsTuple Params p) {
+        return p.a + p.b;
+    }
+
+    // -- PARAM 0
+
+    // [CAUSEWAY-2362] parameter supporting methods, to be referenced by param name
+    @MemberSupport public int defaultA(final Params params) {
+        return 5;
+    }
+
+    // -- PARAM 1
+
+    // [CAUSEWAY-2362] parameter supporting methods, to be referenced by param name
+    @MemberSupport public int[] choicesB(final Params params) {
+        return new int[] {1, 2, 3, 4};
+    }
+}