Merge pull request #52 from RHEAGROUP/development

1.1.0

Author: Smiechowski Nathanael

DEHPMatlab.Tests/DstController/DstControllerTestFixture.cs

@@ -50,6 +50,7 @@ namespace DEHPMatlab.Tests.DstController
     using DEHPCommon.UserInterfaces.Views;
 
     using DEHPMatlab.DstController;
+    using DEHPMatlab.Services.MappingConfiguration;
     using DEHPMatlab.Services.MatlabConnector;
     using DEHPMatlab.Services.MatlabParser;
     using DEHPMatlab.ViewModel.Row;
@@ -70,6 +71,7 @@ public class DstControllerTestFixture
         private Mock<IHubController> hubController;
         private Mock<INavigationService> navigationService;
         private Mock<IExchangeHistoryService> exchangeHistory;
+        private Mock<IMappingConfigurationService> mappingConfigurationService;
         private IMatlabParser matlabParser;
         private Iteration iteration;
 
@@ -130,8 +132,10 @@ public void Setup()
 
             this.exchangeHistory = new Mock<IExchangeHistoryService>();
 
+            this.mappingConfigurationService = new Mock<IMappingConfigurationService>();
+
             this.dstController = new DstController(this.matlabConnector.Object, this.matlabParser, this.statusBar.Object, this.mappingEngine.Object,
-                this.hubController.Object, this.navigationService.Object, this.exchangeHistory.Object);
+                this.hubController.Object, this.navigationService.Object, this.exchangeHistory.Object, this.mappingConfigurationService.Object);
         }
 
         [Test]
@@ -265,9 +269,9 @@ public void VerifyTransferMappedThingsToHub()
             this.navigationService.Setup(
                 x => x.ShowDxDialog<CreateLogEntryDialog, CreateLogEntryDialogViewModel>(
                     It.IsAny<CreateLogEntryDialogViewModel>())).Returns(true);
-            
+
             Assert.DoesNotThrowAsync(async () => await this.dstController.TransferMappedThingsToHub());
-            
+
             var parameter = new Parameter
             {
                 ParameterType = new SimpleQuantityKind(),
@@ -352,8 +356,6 @@ public void VerifyTransferMappedThingsToHub()
 
             Assert.DoesNotThrowAsync(async () => await this.dstController.TransferMappedThingsToHub());
 
-            Assert.IsNull(variable.SelectedParameter);
-            Assert.IsNull(variable.SelectedElementDefinition);
             Assert.IsEmpty(this.dstController.ParameterVariable);
 
             this.navigationService.Verify(
@@ -409,5 +411,69 @@ public void VerifyTransferFromHubToDst()
             Assert.DoesNotThrowAsync(async () => await this.dstController.TransferMappedThingsToDst());
             Assert.AreEqual("35", this.dstController.MatlabWorkspaceInputRowViewModels.First(x => x.Name == mappedElement.SelectedMatlabVariable.Name).ActualValue);
         }
+
+        [Test]
+        public void VerifyLoadMapping()
+        {
+            this.mappingConfigurationService.Setup(
+                    x => x.LoadMappingFromHubToDst(It.IsAny<ReactiveList<MatlabWorkspaceRowViewModel>>()))
+                .Returns(default(List<ParameterToMatlabVariableMappingRowViewModel>));
+
+            this.mappingConfigurationService.Setup(
+                    x => x.LoadMappingFromDstToHub(It.IsAny<ReactiveList<MatlabWorkspaceRowViewModel>>()))
+                .Returns(default(List<MatlabWorkspaceRowViewModel>));
+
+            Assert.DoesNotThrow(() => this.dstController.LoadMapping());
+
+            var mappedElementDefinitionRowViewModels = new List<ParameterToMatlabVariableMappingRowViewModel>();
+            var variableRowViewModels = new List<MatlabWorkspaceRowViewModel>();
+
+            this.mappingConfigurationService.Setup(
+                    x => x.LoadMappingFromHubToDst(It.IsAny<ReactiveList<MatlabWorkspaceRowViewModel>>()))
+                .Returns(mappedElementDefinitionRowViewModels);
+
+            this.mappingConfigurationService.Setup(
+                    x => x.LoadMappingFromDstToHub(It.IsAny<ReactiveList<MatlabWorkspaceRowViewModel>>()))
+                .Returns(variableRowViewModels);
+
+            Assert.DoesNotThrow(() => this.dstController.LoadMapping());
+
+            mappedElementDefinitionRowViewModels.AddRange(new List<ParameterToMatlabVariableMappingRowViewModel>()
+            {
+                new (),
+                new ()
+            });
+
+            MeasurementScale scale = new RatioScale() { Name = "scale", NumberSet = NumberSetKind.REAL_NUMBER_SET };
+
+            variableRowViewModels.AddRange(new List<MatlabWorkspaceRowViewModel>()
+            {
+                new ("b", 45)
+                {
+                    Identifier = "b-a",
+                }
+            });
+
+            Assert.DoesNotThrow(() => this.dstController.LoadMapping());
+
+            variableRowViewModels.AddRange(new List<MatlabWorkspaceRowViewModel>()
+            {
+                new ("a", 45)
+                {
+                    Identifier = "a-a",
+                    SelectedParameter = new Parameter(),
+                    SelectedElementDefinition = new ElementDefinition(),
+                    SelectedScale = scale,
+                    SelectedParameterType = new SimpleQuantityKind()
+                    {
+                        DefaultScale = scale,
+                        PossibleScale = { scale },
+                        Name = "SimpleQuantityKind"
+                    }
+                }
+            });
+
+            Assert.DoesNotThrow(() => this.dstController.LoadMapping());
+        }
     }
 }

DEHPMatlab.Tests/MappingRules/MatlabVariableToElementDefinitionRuleTestFixture.cs

@@ -41,6 +41,7 @@ namespace DEHPMatlab.Tests.MappingRules
     using DEHPCommon.HubController.Interfaces;
 
     using DEHPMatlab.MappingRules;
+    using DEHPMatlab.Services.MappingConfiguration;
     using DEHPMatlab.ViewModel.Row;
 
     using Moq;
@@ -64,6 +65,7 @@ public class MatlabVariableToElementDefinitionRuleTestFixture
         private RatioScale scale;
         private SampledFunctionParameterType scalarParameterType;
         private SampledFunctionParameterType dateTimeParameterType;
+        private Mock<IMappingConfigurationService> mappingConfigurationService;
 
         [SetUp]
         public void Setup()
@@ -93,8 +95,11 @@ public void Setup()
             this.hubController.Setup(x => x.OpenIteration).Returns(this.iteration);
             this.hubController.Setup(x => x.GetSiteDirectory()).Returns(new SiteDirectory());
 
+            this.mappingConfigurationService = new Mock<IMappingConfigurationService>();
+
             var containerBuilder = new ContainerBuilder();
             containerBuilder.RegisterInstance(this.hubController.Object).As<IHubController>();
+            containerBuilder.RegisterInstance(this.mappingConfigurationService.Object).As<IMappingConfigurationService>();
             AppContainer.Container = containerBuilder.Build();
 
             this.actualFiniteStates = new ActualFiniteStateList()
@@ -319,8 +324,13 @@ public void VerifyUpdateParameter()
                 }
             };
 
+            var state = new ActualFiniteState();
+            var option = new Option();
+
             var parameter2 = new Parameter()
             {
+                IsOptionDependent = true,
+                StateDependence = new ActualFiniteStateList() {ActualState = { state } },
                 ParameterType = new TextParameterType(),
                 ValueSet =
                 {
@@ -330,7 +340,9 @@ public void VerifyUpdateParameter()
                         Formula = new ValueArray<string>(new[] { "-", "-" }),
                         Manual = new ValueArray<string>(new[] { "-", "-" }),
                         Reference = new ValueArray<string>(new[] { "-", "-" }),
-                        Published = new ValueArray<string>(new[] { "-", "-" })
+                        Published = new ValueArray<string>(new[] { "-", "-" }),
+                        ActualState = state,
+                        ActualOption = option
                     }
                 }
             };
@@ -340,8 +352,125 @@ public void VerifyUpdateParameter()
 
             Assert.DoesNotThrow(() => this.rule.UpdateValueSet(variableRowViewModel, parameter0));
             Assert.DoesNotThrow(() => this.rule.UpdateValueSet(variableRowViewModel, parameter1));
+            variableRowViewModel.SelectedOption = option;
+            variableRowViewModel.SelectedActualFiniteState = state;
             Assert.DoesNotThrow(() => this.rule.UpdateValueSet(variableRowViewModel, parameter2));
             Assert.Throws<NullReferenceException>(() => this.rule.UpdateValueSet(null, null));
         }
+
+        [Test]
+        public void VerifyUpdateValueSetSFPT()
+        {
+            var sfpt = new SampledFunctionParameterType()
+            {
+                Name = "TextXQuantity",
+                IndependentParameterType =
+                {
+                    new IndependentParameterTypeAssignment()
+                    {
+                        ParameterType = new SimpleQuantityKind()
+                        {
+                            Name = "IndependentText"
+                        }, 
+                        MeasurementScale = this.scale
+                    }
+                },
+
+                DependentParameterType =
+                {
+                    new DependentParameterTypeAssignment()
+                    {
+                        ParameterType = new SimpleQuantityKind()
+                        {
+                            Name = "DependentQuantityKing",
+                            DefaultScale = this.scale,
+                            PossibleScale = { this.scale }
+                        },
+                        MeasurementScale = this.scale
+                    }
+                }
+            };
+
+            var arrayValue = new object[2, 3];
+
+            for (var i = 0; i < arrayValue.GetLength(0); i++)
+            {
+                for (var j = 0; j < arrayValue.GetLength(1); j++)
+                {
+                    arrayValue.SetValue(i + j + 1, i, j);
+                }
+            }
+
+            var variable = new MatlabWorkspaceRowViewModel("a", arrayValue);
+
+            var parameter = new Parameter()
+            {
+                Iid = new Guid(),
+                ParameterType = sfpt, 
+                Container = new ElementDefinition(new Guid(), null, null), 
+                ValueSet = { new ParameterValueSet() }
+            };
+
+            Assert.DoesNotThrow(() => this.rule.UpdateValueSet(variable, parameter));
+            
+            variable.UnwrapVariableRowViewModels();
+            variable.SampledFunctionParameterParameterAssignementRows.First().IsDependantParameter = true;
+            variable.SampledFunctionParameterParameterAssignementRows.Last().IsDependantParameter = false;
+            Assert.DoesNotThrow(() => this.rule.UpdateValueSet(variable, parameter));
+            Assert.AreEqual("2", parameter.ValueSet.First().Computed.First());
+        }
+
+        [Test]
+        public void VerifyMappingArrayParameterType()
+        {
+            var arrayParameter = new ArrayParameterType()
+            {
+                Name = "Array3x2",
+                ShortName = "array3x2",
+            };
+
+            arrayParameter.Dimension = new OrderedItemList<int>(arrayParameter) { 3, 2 };
+
+            var simpleQuantityKind = new SimpleQuantityKind()
+            {
+                Name = "aSimpleQuantity",
+                PossibleScale = { this.scale },
+                DefaultScale = this.scale
+            };
+
+            for (var i = 0; i < 6; i++)
+            {
+                arrayParameter.Component.Add(new ParameterTypeComponent()
+                {
+                    ParameterType = simpleQuantityKind,
+                    Scale = this.scale
+                });
+            }
+
+            var parameter = new Parameter()
+            {
+                Iid = new Guid(),
+                ParameterType = arrayParameter,
+                Container = new ElementDefinition(new Guid(), null, null),
+                ValueSet = { new ParameterValueSet() }
+            };
+
+            var arrayValue = new object[3, 2];
+
+            for (var i = 0; i < arrayValue.GetLength(0); i++)
+            {
+                for (var j = 0; j < arrayValue.GetLength(1); j++)
+                {
+                    arrayValue.SetValue(i + j + 1, i, j);
+                }
+            }
+
+            var variable = new MatlabWorkspaceRowViewModel("a", arrayValue);
+
+            variable.UnwrapVariableRowViewModels();
+            Assert.DoesNotThrow(() => this.rule.UpdateValueSet(variable, parameter));
+            Assert.AreEqual("1", parameter.ValueSet.First().Computed.First());
+            Assert.AreEqual(6, parameter.ValueSet.First().Computed.Count());
+        }
     }
 }

DEHPMatlab.Tests/NetChange/DstNetChangePreviewViewModelTestFixture.cs

@@ -75,6 +75,7 @@ public void Setup()
             this.hubMapResult = new ReactiveList<ParameterToMatlabVariableMappingRowViewModel>();
 
             this.dstController = new Mock<IDstController>();
+            this.dstController.Setup(x => x.MatlabAllWorkspaceRowViewModels).Returns(new ReactiveList<MatlabWorkspaceRowViewModel>());
             this.dstController.Setup(x => x.MatlabWorkspaceInputRowViewModels).Returns(this.inputVariables);
             this.dstController.Setup(x => x.HubMapResult).Returns(this.hubMapResult);
             this.dstController.Setup(x => x.SelectedHubMapResultToTransfer).Returns(this.hubMapResult);
@@ -97,8 +98,11 @@ public void VerifyPopulateContextMenu()
         [Test]
         public void VerifyCDPMessageListening()
         {
-            Assert.DoesNotThrow(() => CDPMessageBus.Current.SendMessage(new UpdateDstPreviewBasedOnSelectionEvent(new List<ElementDefinitionRowViewModel>(), null, false)));
-            Assert.DoesNotThrow(() => CDPMessageBus.Current.SendMessage(new UpdateDstPreviewBasedOnSelectionEvent(new List<ElementDefinitionRowViewModel>(), null, true)));
+            Assert.DoesNotThrow(() => CDPMessageBus.Current.SendMessage(
+                new UpdateDstPreviewBasedOnSelectionEvent(new List<ElementDefinitionRowViewModel>(), null, false)));
+
+            Assert.DoesNotThrow(() => CDPMessageBus.Current.SendMessage(
+                new UpdateDstPreviewBasedOnSelectionEvent(new List<ElementDefinitionRowViewModel>(), null, true)));
 
             var variable = new MatlabWorkspaceRowViewModel("a", 0)
             {
@@ -124,7 +128,6 @@ public void VerifyCDPMessageListening()
             this.inputVariables.Add(variable);
 
             Assert.DoesNotThrow(() => CDPMessageBus.Current.SendMessage(new UpdateDstVariableTreeEvent(true)));
-            Assert.IsFalse(this.inputVariables.First().IsSelectedForTransfer);
 
             Assert.DoesNotThrow(() => CDPMessageBus.Current.SendMessage(new UpdateDstVariableTreeEvent()));
             Assert.AreEqual("45", this.viewModel.InputVariablesCopy.First().ActualValue);
@@ -159,7 +162,11 @@ public void VerifyInputVariablesObservable()
         [Test]
         public void VerifySelectedThingsObservable()
         {
-            var variable = new MatlabWorkspaceRowViewModel("a", 45);
+            var variable = new MatlabWorkspaceRowViewModel("a", 45)
+            {
+                Identifier = "a-a"
+            };
+
             this.viewModel.SelectedThings.Add(variable);
 
             Assert.IsFalse(variable.IsSelectedForTransfer);
@@ -172,10 +179,10 @@ public void VerifySelectedThingsObservable()
 
             this.hubMapResult.Add(new ParameterToMatlabVariableMappingRowViewModel()
             {
-                SelectedMatlabVariable = variable
+                SelectedMatlabVariable = variable,
+                SelectedValue = new ValueSetValueRowViewModel(new ParameterValueSet(), "45", null),
             });
 
-            this.viewModel.SelectedThings.Add(variable);
             Assert.IsTrue(variable.IsSelectedForTransfer);
         }
 
@@ -194,8 +201,6 @@ public void VerifyCommands()
             this.inputVariables.Add(variable);
             Assert.DoesNotThrow(() => this.viewModel.SelectAllCommand.Execute(null));
 
-            Assert.IsTrue(variable.IsSelectedForTransfer);
-            
             Assert.DoesNotThrow(() => this.viewModel.DeselectAllCommand.Execute(null));
             Assert.IsFalse(variable.IsSelectedForTransfer);
         }

DEHPMatlab.Tests/NetChange/HubNetChangePreviewViewModelTestFixture.cs

@@ -322,19 +322,18 @@ public void VerifyComputeValues()
             Assert.AreEqual(1, this.viewModel.Things.Count);
             Assert.AreEqual(3, elements.Count);
             Assert.DoesNotThrow(() => this.viewModel.ComputeValues());
-            Assert.AreEqual(4, elements.Count);
+            Assert.AreEqual(3, elements.Count);
+            Assert.DoesNotThrow(() => this.viewModel.ComputeValuesWrapper());
 
             var parameterRowViewModels = elements.First(x => x.Thing.Iid == this.elementDefinition0.Iid)
                 .ContainedRows.OfType<ParameterRowViewModel>();
 
-            Assert.AreEqual("42", parameterRowViewModels.First().Value);
+            Assert.AreEqual("2", parameterRowViewModels.First().Value);
 
             var lastElementParameters = elements.First(x => x.Thing.Iid == this.elementDefinition1.Iid)
                 .ContainedRows.OfType<ParameterRowViewModel>();
 
             Assert.AreEqual(1, lastElementParameters.Count());
-
-            CDPMessageBus.Current.ClearSubscriptions();
         }
 
         [Test]