Merge pull request #68 from RHEAGROUP/development

1.3.0

Author: Smiechowski Nathanael

DEHPMatlab.Tests/Behaviors/TreeListSortingBehaviorTestFixture.cs

@@ -0,0 +1,67 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="TreeListSortingBehaviorTestFixture.cs" company="RHEA System S.A.">
+// Copyright (c) 2020-2022 RHEA System S.A.
+// 
+// Author: Sam Gerené, Alex Vorobiev, Alexander van Delft, Nathanael Smiechowski, Antoine Théate.
+// 
+// This file is part of DEHPMatlab
+// 
+// The DEHPMatlab is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 3 of the License, or (at your option) any later version.
+// 
+// The DEHPMatlab is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+// 
+// You should have received a copy of the GNU Lesser General Public License
+// along with this program; if not, write to the Free Software Foundation,
+// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+// </copyright>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace DEHPMatlab.Tests.Behaviors
+{
+    using DEHPMatlab.Behaviors;
+
+    using DevExpress.Xpf.Grid;
+    using DevExpress.Xpf.Grid.TreeList;
+
+    using NUnit.Framework;
+
+    public class TreeListSortingBehaviorTestFixture
+    {
+        private TreeListSortingBehavior sortingBehavior;
+        private TreeListCustomColumnSortEventArgs argsNullsValue;
+        private TreeListCustomColumnSortEventArgs argsNullValue1;
+        private TreeListCustomColumnSortEventArgs argsNullValue2;
+        private TreeListCustomColumnSortEventArgs argsSameType;
+        private TreeListCustomColumnSortEventArgs argsNotSameType;
+        private TreeListCustomColumnSortEventArgs argsTwoDecimalTypes;
+
+        [SetUp]
+        public void Setup()
+        {
+            this.sortingBehavior = new TreeListSortingBehavior();
+            this.argsNullsValue = new TreeListCustomColumnSortEventArgs(new GridColumn(), new TreeListNode(), new TreeListNode(), null, null);
+            this.argsNullValue1 = new TreeListCustomColumnSortEventArgs(new GridColumn(), new TreeListNode(), new TreeListNode(), 2, null);
+            this.argsNullValue2 = new TreeListCustomColumnSortEventArgs(new GridColumn(), new TreeListNode(), new TreeListNode(), null, 2);
+            this.argsSameType = new TreeListCustomColumnSortEventArgs(new GridColumn(), new TreeListNode(), new TreeListNode(), 0.2, 0.3);
+            this.argsNotSameType = new TreeListCustomColumnSortEventArgs(new GridColumn(), new TreeListNode(), new TreeListNode(), "4E-05", (int)1);
+            this.argsTwoDecimalTypes = new TreeListCustomColumnSortEventArgs(new GridColumn(), new TreeListNode(), new TreeListNode(), 0.2, (int)1);
+        }
+
+        [Test]
+        public void VerifyTwoObjectComparision()
+        {
+            Assert.DoesNotThrow(() => this.sortingBehavior.AssociatedObject_CustomColumnSort(null, this.argsNullsValue));
+            Assert.DoesNotThrow(() => this.sortingBehavior.AssociatedObject_CustomColumnSort(null, this.argsNullValue1));
+            Assert.DoesNotThrow(() => this.sortingBehavior.AssociatedObject_CustomColumnSort(null, this.argsNullValue2));
+            Assert.DoesNotThrow(() => this.sortingBehavior.AssociatedObject_CustomColumnSort(null, this.argsSameType));
+            Assert.DoesNotThrow(() => this.sortingBehavior.AssociatedObject_CustomColumnSort(null, this.argsNotSameType));
+            Assert.DoesNotThrow(() => this.sortingBehavior.AssociatedObject_CustomColumnSort(null, this.argsTwoDecimalTypes));
+        }
+    }
+}

DEHPMatlab.Tests/DstController/DstControllerTestFixture.cs

@@ -54,7 +54,9 @@ namespace DEHPMatlab.Tests.DstController
     using DEHPMatlab.Services.MappingConfiguration;
     using DEHPMatlab.Services.MatlabConnector;
     using DEHPMatlab.Services.MatlabParser;
+    using DEHPMatlab.ViewModel.Dialogs;
     using DEHPMatlab.ViewModel.Row;
+    using DEHPMatlab.Views.Dialogs;
 
     using Moq;
 
@@ -130,6 +132,10 @@ public void Setup()
             this.hubController.Setup(x => x.Write(It.IsAny<ThingTransaction>())).Returns(Task.CompletedTask);
 
             this.navigationService = new Mock<INavigationService>();
+            
+            this.navigationService.Setup(x => 
+                x.ShowDxDialog<DuplicatedInputsWarningDialog, DuplicatedInputsWarningDialogViewModel>(It.IsAny<DuplicatedInputsWarningDialogViewModel>()))
+                .Returns(true);
 
             this.exchangeHistory = new Mock<IExchangeHistoryService>();
 
@@ -308,7 +314,7 @@ public void VerifyTransferMappedThingsToHub()
                 }
             };
 
-            this.dstController.SelectedDstMapResultToTransfer.Add(elementDefinition);
+            this.dstController.SelectedDstMapResultToTransfer.Add(parameter);
 
             var parameterOverride = new ParameterOverride(Guid.NewGuid(), null, null)
             {
@@ -320,37 +326,47 @@ public void VerifyTransferMappedThingsToHub()
                         Computed = new ValueArray<string>(new[] { "654321" }),
                         ValueSwitch = ParameterSwitchKind.COMPUTED
                     }
-                }
+                },
+                Container = new ElementUsage()
             };
 
-            this.dstController.SelectedDstMapResultToTransfer.Add(new ElementUsage
-            {
-                ElementDefinition = elementDefinition,
-                ParameterOverride =
-                {
-                    parameterOverride
-                }
-            });
+            this.dstController.SelectedDstMapResultToTransfer.Add(parameterOverride);
 
             var param = new Parameter()
             {
-                ParameterType = new BooleanParameterType()
+                ParameterType = new BooleanParameterType(),
+                Container = new ElementDefinition()
             };
 
             var variable = new MatlabWorkspaceRowViewModel("a", 0)
             {
-                SelectedParameter = param,
-                SelectedParameterType = param.ParameterType
+                SelectedParameter = parameter,
+                SelectedParameterType = parameter.ParameterType,
+                SelectedCoordinateSystem = param
             };
 
-            this.dstController.ParameterVariable.Add(param, variable);
+            this.dstController.ParameterVariable.Add(parameterOverride, variable);
+            this.dstController.ParameterVariable.Add(parameter, variable);
 
             this.hubController.Setup(x =>
                 x.GetThingById(It.IsAny<Guid>(), It.IsAny<Iteration>(), out parameter));
 
             this.hubController.Setup(x =>
                 x.GetThingById(parameterOverride.Iid, It.IsAny<Iteration>(), out parameterOverride));
 
+            var paramAsThing = (Thing) param;
+            var parameterAsThing = (Thing) parameter;
+            var parameterOverrideAsThing = (Thing) parameterOverride;
+
+            this.hubController.Setup(x =>
+                  x.GetThingById(paramAsThing.Iid, It.IsAny<Iteration>(), out paramAsThing));
+
+            this.hubController.Setup(x =>
+                x.GetThingById(parameterAsThing.Iid, It.IsAny<Iteration>(), out parameterAsThing));
+
+            this.hubController.Setup(x =>
+                x.GetThingById(parameterOverrideAsThing.Iid, It.IsAny<Iteration>(), out parameterOverrideAsThing));
+
             Assert.DoesNotThrowAsync(async () => await this.dstController.TransferMappedThingsToHub());
 
             this.navigationService.Setup(
@@ -386,10 +402,27 @@ public void VerifyTransferMappedThingsToHub()
                 x => x.Refresh(), Times.Exactly(1));
 
             this.exchangeHistory.Verify(x =>
-                x.Append(It.IsAny<Thing>(), It.IsAny<ChangeKind>()), Times.Exactly(3));
+                x.Append(It.IsAny<Thing>(), It.IsAny<ChangeKind>()), Times.Exactly(5));
 
             this.exchangeHistory.Verify(x =>
                 x.Append(It.IsAny<ParameterValueSetBase>(), It.IsAny<IValueSet>()), Times.Exactly(2));
+
+            this.iteration.Relationship.Add(new BinaryRelationship()
+            {
+                Iid = new Guid(),
+                Owner = this.hubController.Object.CurrentDomainOfExpertise,
+                Target = parameterOverrideAsThing,
+                Source = parameterAsThing,
+                Name = "CoordinateSystemReference"
+            });
+
+            this.dstController.ParameterVariable.Add(parameter, variable);
+            this.dstController.SelectedDstMapResultToTransfer.Add(parameter);
+
+            Assert.DoesNotThrowAsync(async () => await this.dstController.TransferMappedThingsToHub());
+            
+            this.exchangeHistory.Verify(x =>
+                x.Append(It.IsAny<Thing>(), It.IsAny<ChangeKind>()), Times.Exactly(8));
         }
 
         [Test]
@@ -488,6 +521,8 @@ public void VerifyLoadMapping()
                 }
             });
 
+            this.dstController.MatlabAllWorkspaceRowViewModels.Add(variableRowViewModels.Last());
+
             Assert.DoesNotThrow(() => this.dstController.LoadMapping());
         }
 
@@ -554,9 +589,17 @@ public void VerifySampledFunctionTransferToDst()
 
             this.dstController.MatlabWorkspaceInputRowViewModels.AddRange(variable.UnwrapVariableRowViewModels());
             variable = this.dstController.MatlabWorkspaceInputRowViewModels.First(x => x.Name == "anArrayVariable");
+            variable.SampledFunctionParameterParameterAssignementToDstRows.Clear();
+            
+            variable.SampledFunctionParameterParameterAssignementToDstRows.Add(new SampledFunctionParameterParameterAssignementRowViewModel("0")
+            {
+                SelectedParameterTypeAssignment = sampledFunction.IndependentParameterType[0]
+            });
 
-            variable.SampledFunctionParameterParameterAssignementRows[0].SelectedParameterTypeAssignment = sampledFunction.IndependentParameterType[0];
-            variable.SampledFunctionParameterParameterAssignementRows[1].SelectedParameterTypeAssignment = sampledFunction.DependentParameterType[0];
+            variable.SampledFunctionParameterParameterAssignementToDstRows.Add(new SampledFunctionParameterParameterAssignementRowViewModel("1")
+            {
+                SelectedParameterTypeAssignment = sampledFunction.DependentParameterType[0]
+            });
 
             var mappedElement = new ParameterToMatlabVariableMappingRowViewModel(parameter.ValueSet.First(), 0, ParameterSwitchKind.COMPUTED)
             {
@@ -572,9 +615,18 @@ public void VerifySampledFunctionTransferToDst()
             var array = (Array) variableAfterTransfer.ArrayValue;
             Assert.AreEqual(3, array.GetLength(0));
 
-            variable.RowColumnSelection = RowColumnSelection.Row;
-            variable.SampledFunctionParameterParameterAssignementRows[0].SelectedParameterTypeAssignment = sampledFunction.IndependentParameterType[0];
-            variable.SampledFunctionParameterParameterAssignementRows[1].SelectedParameterTypeAssignment = sampledFunction.DependentParameterType[0];
+            variable.RowColumnSelectionToDst = RowColumnSelection.Row;
+            variable.SampledFunctionParameterParameterAssignementToDstRows.Clear();
+
+            variable.SampledFunctionParameterParameterAssignementToDstRows.Add(new SampledFunctionParameterParameterAssignementRowViewModel("0")
+            {
+                SelectedParameterTypeAssignment = sampledFunction.IndependentParameterType[0]
+            });
+
+            variable.SampledFunctionParameterParameterAssignementToDstRows.Add(new SampledFunctionParameterParameterAssignementRowViewModel("1")
+            {
+                SelectedParameterTypeAssignment = sampledFunction.DependentParameterType[0]
+            });
 
             this.dstController.SelectedHubMapResultToTransfer.Add(mappedElement);
 

DEHPMatlab.Tests/MappingRules/ElementDefinitionToMatlabVariableRuleTestFixture.cs

@@ -57,7 +57,7 @@ public void Setup()
 
             this.elements = new List<ParameterToMatlabVariableMappingRowViewModel>()
             {
-                new ParameterToMatlabVariableMappingRowViewModel()
+                new ()
                 {
                     SelectedMatlabVariable = new MatlabWorkspaceRowViewModel("a", 0.5d),
                     SelectedParameter = new Parameter()
@@ -74,7 +74,7 @@ public void Setup()
                     },
                     SelectedValue = new ValueSetValueRowViewModel(new ParameterValueSet(), "5", null)
                 },
-                new ParameterToMatlabVariableMappingRowViewModel()
+                new ()
                 {
                     SelectedMatlabVariable = new MatlabWorkspaceRowViewModel("c", "-45"),
                     SelectedParameter = new Parameter()
@@ -104,7 +104,7 @@ public void Setup()
                     },
                     SelectedValue = new ValueSetValueRowViewModel(new ParameterValueSet(), "15", null)
                 },
-                new ParameterToMatlabVariableMappingRowViewModel()
+                new ()
                 {
                     SelectedMatlabVariable = new MatlabWorkspaceRowViewModel("b", "-45"),
                     SelectedOption =  this.option1,

DEHPMatlab.Tests/MappingRules/MatlabVariableToElementDefinitionRuleTestFixture.cs

@@ -40,6 +40,7 @@ namespace DEHPMatlab.Tests.MappingRules
     using DEHPCommon;
     using DEHPCommon.HubController.Interfaces;
 
+    using DEHPMatlab.Enumerator;
     using DEHPMatlab.MappingRules;
     using DEHPMatlab.Services.MappingConfiguration;
     using DEHPMatlab.ViewModel.Row;
@@ -117,7 +118,7 @@ public void Setup()
 
             this.variables = new List<MatlabWorkspaceRowViewModel>()
             {
-                new MatlabWorkspaceRowViewModel("mass", 500)
+                new ("mass", 500)
                 {
                     SelectedParameterType = this.scalarParameterType,
                     SelectedScale = this.scale
@@ -391,7 +392,7 @@ public void VerifyUpdateValueSetSFPT()
                 }
             };
 
-            var arrayValue = new object[2, 3];
+            var arrayValue = new double[2, 3];
 
             for (var i = 0; i < arrayValue.GetLength(0); i++)
             {
@@ -401,7 +402,13 @@ public void VerifyUpdateValueSetSFPT()
                 }
             }
 
-            var variable = new MatlabWorkspaceRowViewModel("a", arrayValue);
+            var variable = new MatlabWorkspaceRowViewModel("a", arrayValue)
+            {
+                SelectedTimeStep = 0.1
+            };
+
+            variable.ApplyTimeStep();
+            variable.SelectedTimeStep = 0;
 
             var parameter = new Parameter()
             {
@@ -414,10 +421,87 @@ public void VerifyUpdateValueSetSFPT()
             Assert.DoesNotThrow(() => this.rule.UpdateValueSet(variable, parameter));
 
             variable.UnwrapVariableRowViewModels();
-            variable.SampledFunctionParameterParameterAssignementRows.First().IsDependantParameter = true;
-            variable.SampledFunctionParameterParameterAssignementRows.Last().IsDependantParameter = false;
+            variable.RowColumnSelectionToHub = RowColumnSelection.Row;
+            variable.SampledFunctionParameterParameterAssignementToHubRows.Clear();
+            
+            variable.SampledFunctionParameterParameterAssignementToHubRows.Add(new SampledFunctionParameterParameterAssignementRowViewModel("1")
+            {
+                SelectedParameterTypeAssignment = sfpt.IndependentParameterType.First()
+            });
+
+            variable.SampledFunctionParameterParameterAssignementToHubRows.Add(new SampledFunctionParameterParameterAssignementRowViewModel("0")
+            {
+                SelectedParameterTypeAssignment = sfpt.DependentParameterType.First()
+            });
+
+            Assert.DoesNotThrow(() => this.rule.UpdateValueSet(variable, parameter));
+            Assert.AreEqual("2", parameter.ValueSet.First().Computed.First());
+
+            variable.SampledFunctionParameterParameterAssignementToHubRows.Clear();
+            
+            variable.SampledFunctionParameterParameterAssignementToHubRows.AddRange(new []
+            {
+                new SampledFunctionParameterParameterAssignementRowViewModel("1")
+                {
+                    SelectedParameterTypeAssignment = sfpt.IndependentParameterType.First(),
+                    IsTimeTaggedParameter = true
+                },
+                new SampledFunctionParameterParameterAssignementRowViewModel("0")
+                {
+                    SelectedParameterTypeAssignment = sfpt.DependentParameterType.First()
+                }
+            });
+
+            variable.GetTimeDependentValues();
+            Assert.IsNotEmpty(variable.TimeTaggedValues);
+            Assert.AreEqual(0, variable.SelectedTimeStep);
+            variable.SelectedTimeStep = 2;
+            variable.ApplyTimeStep();
+
             Assert.DoesNotThrow(() => this.rule.UpdateValueSet(variable, parameter));
             Assert.AreEqual("2", parameter.ValueSet.First().Computed.First());
+
+            variable.IsAveraged = true;
+            variable.ApplyTimeStep();
+
+            Assert.DoesNotThrow(() => this.rule.UpdateValueSet(variable, parameter));
+            Assert.AreEqual("2", parameter.ValueSet.First().Computed.First());
+
+            variable.RowColumnSelectionToHub = RowColumnSelection.Column;
+
+            sfpt.IndependentParameterType.Add(new IndependentParameterTypeAssignment()
+            {
+                ParameterType = new SimpleQuantityKind()
+                {
+                    Name = "IndependentText"
+                },
+                MeasurementScale = this.scale
+            });
+
+            variable.SampledFunctionParameterParameterAssignementToHubRows.Clear();
+
+            variable.SampledFunctionParameterParameterAssignementToHubRows.AddRange(new[]
+            {
+                new SampledFunctionParameterParameterAssignementRowViewModel("2")
+                {
+                    SelectedParameterTypeAssignment = sfpt.IndependentParameterType.Last(),
+                },
+                new SampledFunctionParameterParameterAssignementRowViewModel("1")
+                {
+                    SelectedParameterTypeAssignment = sfpt.IndependentParameterType.First(),
+                    IsTimeTaggedParameter = true
+                },
+                new SampledFunctionParameterParameterAssignementRowViewModel("0")
+                {
+                    SelectedParameterTypeAssignment = sfpt.DependentParameterType.First()
+                }
+            });
+
+            variable.IsAveraged = true;
+            variable.SelectedTimeStep = 2;
+            variable.ApplyTimeStep();
+
+            Assert.DoesNotThrow(() => this.rule.UpdateValueSet(variable, parameter));
         }
 
         [Test]