Improve testing and do some cleanup

ivarne · ivarne · commit 568e35afa5c0 · 2026-06-10T15:03:14.000+02:00
diff --git a/src/Altinn.App.Core/Features/DataProcessing/DataModelFieldCalculator.cs b/src/Altinn.App.Core/Features/DataProcessing/DataModelFieldCalculator.cs
@@ -66,26 +66,27 @@ string rawCalculationConfig
 
         foreach (var (baseField, calculation) in dataModelFieldCalculations)
         {
-            var resolvedFields = await dataAccessor
-                .GetLayoutEvaluatorState()
-                .GetResolvedKeys(
-                    new DataReference() { Field = baseField, DataElementIdentifier = dataElementIdentifier }
-                );
+            var resolvedFields = formDataWrapper.GetResolvedKeys(baseField);
             foreach (var resolvedField in resolvedFields)
             {
+                var resolvedFieldReference = new DataReference()
+                {
+                    Field = resolvedField,
+                    DataElementIdentifier = dataElementIdentifier,
+                };
                 var context = new ComponentContext(
                     dataAccessor,
                     component: null,
-                    rowIndices: ExpressionHelper.GetRowIndices(resolvedField.Field),
-                    dataElementIdentifier: resolvedField.DataElementIdentifier
+                    rowIndices: ExpressionHelper.GetRowIndices(resolvedField),
+                    dataElementIdentifier: dataElementIdentifier
                 );
-                var positionalArguments = new ExpressionValue[] { resolvedField.Field };
+                var positionalArguments = new ExpressionValue[] { resolvedFieldReference.Field };
 
                 await RunCalculation(
                     dataAccessor,
                     context,
                     formDataWrapper,
-                    resolvedField,
+                    resolvedFieldReference,
                     positionalArguments,
                     calculation
                 );
diff --git a/src/Altinn.App.Core/Internal/Data/IFormDataWrapper.cs b/src/Altinn.App.Core/Internal/Data/IFormDataWrapper.cs
@@ -3,7 +3,6 @@
 using Altinn.App.Core.Helpers;
 using Altinn.App.Core.Helpers.DataModel;
 using Altinn.App.Core.Internal.Expressions;
-using Altinn.App.Core.Models.Layout;
 using Altinn.Platform.Storage.Interface.Models;
 
 namespace Altinn.App.Core.Internal.Data;
@@ -287,26 +286,22 @@ private static int InvokeReturnIntOrError(MethodInfo info, object instance)
     }
 
     /// <summary>
-    /// Get a list of all possible keys for the given data model
+    /// Get a list of all possible keys for the given data model at the path
     /// </summary>
     /// <example>
-    /// intro.fnr
-    /// group[0].name
-    /// group[0].age
-    /// group[1].name
-    /// group[1].age
+    /// group.name -> ["group[0].name", "group[1].name"]
+    /// group.age -> ["group[0].age", "group[1].age"]
     /// </example>
-    public static DataReference[] GetResolvedKeys(this IFormDataWrapper formDataWrapper, DataReference reference)
+    public static string[] GetResolvedKeys(this IFormDataWrapper formDataWrapper, string path)
     {
         //TODO: write more efficient code that uses the formDataWrapper to resolve keys instead of reflection in DataModelWrapper
+        // The current implementation also does not throw exceptions when the path ends in an enumerable.
+        // When resolving "group" it is not clear if the result should be "group[0]", "group[1]", or just "group"."
         var data = formDataWrapper.BackingData<object>();
 #pragma warning disable CS0618 // Type or member is obsolete
         var dataModelWrapper = new DataModelWrapper(data);
 #pragma warning restore CS0618 // Type or member is obsolete
-        return dataModelWrapper
-            .GetResolvedKeys(reference.Field)
-            .Select(resolvedField => reference with { Field = resolvedField })
-            .ToArray();
+        return dataModelWrapper.GetResolvedKeys(path);
     }
 
     private static int GetMaxBufferLength(ReadOnlySpan<char> path, ReadOnlySpan<int> rowIndexes)
diff --git a/src/Altinn.App.Core/Internal/Expressions/LayoutEvaluatorState.cs b/src/Altinn.App.Core/Internal/Expressions/LayoutEvaluatorState.cs
@@ -235,7 +235,9 @@ private static bool RowIndexMatch(int[]? searchRowIndexes, int[]? componentRowIn
     public async Task<DataReference[]> GetResolvedKeys(DataReference reference)
     {
         var data = await DataAccessor.GetFormDataWrapper(reference.DataElementIdentifier);
-        return data.GetResolvedKeys(reference);
+        return data.GetResolvedKeys(reference.Field)
+            .Select(resolvedField => reference with { Field = resolvedField })
+            .ToArray();
     }
 
     /// <summary>
diff --git a/test/Altinn.App.Core.Tests/Features/DataProcessing/DataModelFieldCalculatorTests.cs b/test/Altinn.App.Core.Tests/Features/DataProcessing/DataModelFieldCalculatorTests.cs
@@ -11,6 +11,7 @@
 using Altinn.App.Core.Tests.LayoutExpressions.TestUtilities;
 using Altinn.App.Core.Tests.TestUtils;
 using Altinn.Platform.Storage.Interface.Models;
+using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Testing;
 using Microsoft.Extensions.Options;
 using Moq;
@@ -133,6 +134,7 @@ public async Task RunDataModelFieldCalculationTests(string fileName, string fold
             if (expected.Result.HasValue)
             {
                 Assert.Equal(expected.Result.Value.ToObject(), result.Get(expected.Field));
+                Assert.Empty(_logger.Collector.GetSnapshot());
             }
             else
             {
@@ -185,13 +187,6 @@ private void Setup(DataModelFieldCalculatorTestModel testCase)
             _dataElement
         );
 
-        var evaluatorState = new LayoutEvaluatorState(
-            _instanceDataAccessor,
-            componentModel,
-            translationService,
-            _frontendSettings.Value
-        );
-
         _appResources
             .Setup(ar => ar.GetTexts("org", "app", "nb"))
             .ReturnsAsync(
diff --git a/test/Altinn.App.Core.Tests/Features/DataProcessing/data-field-value-calculator-tests/calculate-in-group.json b/test/Altinn.App.Core.Tests/Features/DataProcessing/data-field-value-calculator-tests/calculate-in-group.json
@@ -0,0 +1,54 @@
+{
+    "name": "Should set multiple values when in a group",
+    "expects": [
+        {
+            "field": "form.children[0].total",
+            "result": 200
+        },
+        {
+            "field": "form.children[1].total",
+            "result": 220
+        }
+    ],
+    "calculationConfig": {
+        "$schema": "https://altinncdn.no/toolkits/altinn-app-frontend/4/schemas/json/calculation/calculation.schema.v1.json",
+        "calculations": {
+            "form.children.total": {
+                "expression": ["multiply", ["dataModel", "form.children.price"], ["dataModel", "form.children.quantity"]]
+            }
+        }
+    },
+    "formData": {
+        "form": {
+            "children": [
+                {
+                    "price": 100,
+                    "quantity": 2,
+                    "total": 0
+                },
+                {
+                    "price": 5,
+                    "quantity": 44,
+                    "total": 0
+                }
+            ]
+        }
+    },
+    "layouts": {
+        "Page": {
+            "$schema": "https://altinncdn.no/toolkits/altinn-app-frontend/4/schemas/json/layout/layout.schema.v1.json",
+            "data": {
+                "layout": [
+                    {
+                        "id": "name-input",
+                        "type": "Input",
+                        "dataModelBindings": {
+                            "simpleBinding": "form.name"
+                        },
+                        "hidden": true
+                    }
+                ]
+            }
+        }
+    }
+}
diff --git a/test/Altinn.App.Core.Tests/Features/DataProcessing/data-field-value-calculator-tests/component-lookup-hidden.json b/test/Altinn.App.Core.Tests/Features/DataProcessing/data-field-value-calculator-tests/component-lookup-hidden.json
@@ -1,16 +1,16 @@
 {
-    "name": "Should not set field when looking up hidden component",
+    "name": "Should set field when looking up hidden component",
     "expects": [
         {
             "field": "form.name",
-            "result": "feil"
+            "result": "nyVerdi"
         }
     ],
     "calculationConfig": {
         "$schema": "https://altinncdn.no/toolkits/altinn-app-frontend/4/schemas/json/calculation/calculation.schema.v1.json",
         "calculations": {
             "form.name": {
-                "expression": ["equals", ["dataModel", ["argv", 0]], "feil"]
+                "expression": "nyVerdi"
             }
         }
     },
diff --git a/test/Altinn.App.Core.Tests/Features/DataProcessing/data-field-value-calculator-tests/hidden-field.json b/test/Altinn.App.Core.Tests/Features/DataProcessing/data-field-value-calculator-tests/hidden-field.json
@@ -1,16 +1,16 @@
 {
-    "name": "Should not set field when component is hidden",
+    "name": "Should set field when component is hidden",
     "expects": [
         {
             "field": "form.name",
-            "result": "feil"
+            "result": "nyVerdi"
         }
     ],
     "calculationConfig": {
         "$schema": "https://altinncdn.no/toolkits/altinn-app-frontend/4/schemas/json/calculation/calculation.schema.v1.json",
         "calculations": {
             "form.name": {
-                "expression": ["equals", ["dataModel", ["argv", 0]], "feil"]
+                "expression": "nyVerdi"
             }
         }
     },
diff --git a/test/Altinn.App.Core.Tests/Features/DataProcessing/data-field-value-calculator-tests/hidden-page.json b/test/Altinn.App.Core.Tests/Features/DataProcessing/data-field-value-calculator-tests/hidden-page.json
@@ -1,16 +1,16 @@
 {
-    "name": "Should not set field if field is on hidden page",
+    "name": "Should set field if field is on hidden page",
     "expects": [
         {
             "field": "form.name",
-            "result": "none"
+            "result": "newValue"
         }
     ],
     "calculationConfig": {
         "$schema": "https://altinncdn.no/toolkits/altinn-app-frontend/4/schemas/json/calculation/calculation.schema.v1.json",
         "calculations": {
             "form.name": {
-                "expression": ["equals", ["dataModel", ["argv", 0]], "none"]
+                "expression": "newValue"
             }
         }
     },
diff --git a/test/Altinn.App.SourceGenerator.Integration.Tests/UnitTest/TestGetResolvedKeys.cs b/test/Altinn.App.SourceGenerator.Integration.Tests/UnitTest/TestGetResolvedKeys.cs
@@ -119,10 +119,7 @@ public void TestResolvedKeys(string field, string[] expectedKeys)
 
         // Test formDataWrapper
         var dataWrapper = FormDataWrapperFactory.Create(_skjema, _dataType, _dataElement);
-        var resolvedKeys = dataWrapper
-            .GetResolvedKeys(new DataReference() { Field = field, DataElementIdentifier = _dataElement })
-            .Select(k => k.Field)
-            .ToArray();
+        var resolvedKeys = dataWrapper.GetResolvedKeys(field);
         Assert.Equal(expectedKeys, resolvedKeys);
     }
 
@@ -136,11 +133,7 @@ private void TestResolvedKeys_ErrorConditions(string field)
         Assert.Contains("ResolveKeys", exception.Message);
 
         var dataWrapper = FormDataWrapperFactory.Create(_skjema, _dataType, _dataElement);
-        var dataException = Assert.Throws<ArgumentException>(() =>
-            dataWrapper
-                .GetResolvedKeys(new DataReference() { Field = field, DataElementIdentifier = _dataElement })
-                .ToArray()
-        );
+        var dataException = Assert.Throws<ArgumentException>(() => dataWrapper.GetResolvedKeys(field));
         Assert.Contains("ResolveKeys", dataException.Message);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -235,7 +235,9 @@ private static bool RowIndexMatch(int[]? searchRowIndexes, int[]? componentRowIn`
`235`	`235`	`public async Task<DataReference[]> GetResolvedKeys(DataReference reference)`
`236`	`236`	`{`
`237`	`237`	`var data = await DataAccessor.GetFormDataWrapper(reference.DataElementIdentifier);`
`238`		`- return data.GetResolvedKeys(reference);`
	`238`	`+ return data.GetResolvedKeys(reference.Field)`
	`239`	`+ .Select(resolvedField => reference with { Field = resolvedField })`
	`240`	`+ .ToArray();`
`239`	`241`	`}`
`240`	`242`
`241`	`243`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -1,16 +1,16 @@`
`1`	`1`	`{`
`2`		`- "name": "Should not set field when looking up hidden component",`
	`2`	`+ "name": "Should set field when looking up hidden component",`
`3`	`3`	`"expects": [`
`4`	`4`	`{`
`5`	`5`	`"field": "form.name",`
`6`		`- "result": "feil"`
	`6`	`+ "result": "nyVerdi"`
`7`	`7`	`}`
`8`	`8`	`],`
`9`	`9`	`"calculationConfig": {`
`10`	`10`	`"$schema": "https://altinncdn.no/toolkits/altinn-app-frontend/4/schemas/json/calculation/calculation.schema.v1.json",`
`11`	`11`	`"calculations": {`
`12`	`12`	`"form.name": {`
`13`		`- "expression": ["equals", ["dataModel", ["argv", 0]], "feil"]`
	`13`	`+ "expression": "nyVerdi"`
`14`	`14`	`}`
`15`	`15`	`}`
`16`	`16`	`},`
Original file line number	Diff line number	Diff line change
`@@ -1,16 +1,16 @@`
`1`	`1`	`{`
`2`		`- "name": "Should not set field when component is hidden",`
	`2`	`+ "name": "Should set field when component is hidden",`
`3`	`3`	`"expects": [`
`4`	`4`	`{`
`5`	`5`	`"field": "form.name",`
`6`		`- "result": "feil"`
	`6`	`+ "result": "nyVerdi"`
`7`	`7`	`}`
`8`	`8`	`],`
`9`	`9`	`"calculationConfig": {`
`10`	`10`	`"$schema": "https://altinncdn.no/toolkits/altinn-app-frontend/4/schemas/json/calculation/calculation.schema.v1.json",`
`11`	`11`	`"calculations": {`
`12`	`12`	`"form.name": {`
`13`		`- "expression": ["equals", ["dataModel", ["argv", 0]], "feil"]`
	`13`	`+ "expression": "nyVerdi"`
`14`	`14`	`}`
`15`	`15`	`}`
`16`	`16`	`},`
Original file line number	Diff line number	Diff line change
`@@ -1,16 +1,16 @@`
`1`	`1`	`{`
`2`		`- "name": "Should not set field if field is on hidden page",`
	`2`	`+ "name": "Should set field if field is on hidden page",`
`3`	`3`	`"expects": [`
`4`	`4`	`{`
`5`	`5`	`"field": "form.name",`
`6`		`- "result": "none"`
	`6`	`+ "result": "newValue"`
`7`	`7`	`}`
`8`	`8`	`],`
`9`	`9`	`"calculationConfig": {`
`10`	`10`	`"$schema": "https://altinncdn.no/toolkits/altinn-app-frontend/4/schemas/json/calculation/calculation.schema.v1.json",`
`11`	`11`	`"calculations": {`
`12`	`12`	`"form.name": {`
`13`		`- "expression": ["equals", ["dataModel", ["argv", 0]], "none"]`
	`13`	`+ "expression": "newValue"`
`14`	`14`	`}`
`15`	`15`	`}`
`16`	`16`	`},`