[FIX] Requirements Verification on RequirementsGroups; fixes #214

CDP4RequirementsVerification.Tests/Verifiers/RequirementsContainerVerifierTestFixture.cs

@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright file="RequirementsContainerVerifierTestFixture.cs" company="RHEA System S.A.">
-//    Copyright (c) 2015-2019 RHEA System S.A.
+//    Copyright (c) 2015-2021 RHEA System S.A.
 //
 //    Author: Sam Gerené, Alex Vorobiev, Alexander van Delft, Yevhen Ikonnykov
 //
@@ -43,14 +43,20 @@ public class RequirementsContainerVerifierTestFixture
 
         private RequirementsSpecification requirementsSpecification;
 
-        private Requirement requirement;
+        private RequirementsGroup requirementsGroup1;
+
+        private RequirementsGroup requirementsGroup2;
+
+        private Requirement requirement1;
 
         private ParametricConstraint parametricConstraint;
 
         private RelationalExpression relationalExpression;
 
         private Iteration iteration;
         private ElementDefinition elementDefinition;
+        private RequirementsContainerVerifier requirementsGroupVerifier1;
+        private RequirementsContainerVerifier requirementsGroupVerifier2;
 
         [SetUp]
         public void SetUp()
@@ -65,16 +71,26 @@ public void SetUp()
 
             this.parametricConstraint.Expression.Add(this.relationalExpression);
 
-            this.requirement = new Requirement(Guid.NewGuid(), null, null);
+            this.requirement1 = new Requirement(Guid.NewGuid(), null, null);
 
-            this.requirement.ParametricConstraint.Add(this.parametricConstraint);
+            this.requirement1.ParametricConstraint.Add(this.parametricConstraint);
 
             this.requirementsSpecification = new RequirementsSpecification(Guid.NewGuid(), null, null);
-            this.requirementsSpecification.Requirement.Add(this.requirement);
+            this.requirementsSpecification.Requirement.Add(this.requirement1);
+
+            this.requirementsGroup1 = new RequirementsGroup(Guid.NewGuid(), null, null);
+            this.requirementsGroup2 = new RequirementsGroup(Guid.NewGuid(), null, null);
 
+            this.requirementsSpecification.Group.Add(this.requirementsGroup1);
+            this.requirementsGroup1.Group.Add(this.requirementsGroup2);
+
+            this.requirement1.Group = this.requirementsGroup1;
 
             this.requirementsContainerVerifier = new RequirementsContainerVerifier(this.requirementsSpecification);
 
+            this.requirementsGroupVerifier1 = new RequirementsContainerVerifier(this.requirementsGroup1);
+            this.requirementsGroupVerifier2 = new RequirementsContainerVerifier(this.requirementsGroup2);
+
             this.iteration = new Iteration(Guid.NewGuid(), null, null);
 
             this.elementDefinition = new ElementDefinition(Guid.NewGuid(), null, null);
@@ -112,15 +128,27 @@ private void RegisterBinaryRelationShip(ParameterOrOverrideBase parameter, Relat
         public async Task Verify_that_state_of_compliances_are_properly_calculated()
         {
             await this.requirementsContainerVerifier.VerifyRequirements(this.iteration);
+            Assert.AreEqual(RequirementStateOfCompliance.Inconclusive, this.requirementsContainerVerifier.RequirementStateOfCompliance);
 
+            await this.requirementsGroupVerifier1.VerifyRequirements(this.iteration);
+            Assert.AreEqual(RequirementStateOfCompliance.Inconclusive, this.requirementsGroupVerifier1.RequirementStateOfCompliance);
+
+            await this.requirementsGroupVerifier2.VerifyRequirements(this.iteration);
+            Assert.AreEqual(RequirementStateOfCompliance.Inconclusive, this.requirementsGroupVerifier2.RequirementStateOfCompliance);
+
+            this.requirementsGroup1.Group.Clear(); // no more inconclusive sub groups.
+
+            await this.requirementsContainerVerifier.VerifyRequirements(this.iteration);
             Assert.AreEqual(RequirementStateOfCompliance.Pass, this.requirementsContainerVerifier.RequirementStateOfCompliance);
 
+            await this.requirementsGroupVerifier1.VerifyRequirements(this.iteration);
+            Assert.AreEqual(RequirementStateOfCompliance.Pass, this.requirementsGroupVerifier1.RequirementStateOfCompliance);
         }
 
         [Test]
         public async Task Verify_that_state_of_compliances_are_properly_calculated_when_requirement_is_deprecated()
         {
-            this.requirement.IsDeprecated = true;
+            this.requirement1.IsDeprecated = true;
             await this.requirementsContainerVerifier.VerifyRequirements(this.iteration);
 
             Assert.AreEqual(RequirementStateOfCompliance.Inconclusive, this.requirementsContainerVerifier.RequirementStateOfCompliance);
@@ -133,7 +161,6 @@ public async Task Verify_that_state_of_compliances_are_properly_calculated_when_
             await this.requirementsContainerVerifier.VerifyRequirements(this.iteration);
 
             Assert.AreEqual(RequirementStateOfCompliance.Inconclusive, this.requirementsContainerVerifier.RequirementStateOfCompliance);
-
         }
     }
 }

CDP4RequirementsVerification/CDP4RequirementsVerification.csproj

@@ -4,7 +4,7 @@
     <TargetFrameworks>net45;net451;net452;net46;net461;net462;net47;net471;net472;net48;netstandard2.0;netstandard2.1;netcoreapp3.1</TargetFrameworks>
     <Company>RHEA System S.A.</Company>
     <Title>CDP4RequirementsVerification Community Edition</Title>
-    <VersionPrefix>0.9.2</VersionPrefix>
+    <VersionPrefix>0.10.2</VersionPrefix>
     <Description>CDP4 Class Library that provides requirement verification</Description>
     <Copyright>Copyright © RHEA System S.A.</Copyright>
     <Authors>Sam, Alex, Alexander, Yevhen, Nathanael</Authors>

CDP4RequirementsVerification/Verifiers/OrExpressionVerifier.cs

@@ -67,10 +67,10 @@ public override async Task<RequirementStateOfCompliance> VerifyRequirementStateO
                 requirementStateOfCompliances.Add(await expressionVerifier.VerifyRequirementStateOfCompliance(booleanExpressionVerifiers, iteration));
             }
 
-            return this.RequirementStateOfCompliance = requirementStateOfCompliances.Any(x => x == RequirementStateOfCompliance.Inconclusive)
-                ? RequirementStateOfCompliance.Inconclusive
-                : requirementStateOfCompliances.Any(x => x == RequirementStateOfCompliance.Pass)
-                    ? RequirementStateOfCompliance.Pass
+            return this.RequirementStateOfCompliance = requirementStateOfCompliances.Any(x => x == RequirementStateOfCompliance.Pass)
+                ? RequirementStateOfCompliance.Pass
+                : requirementStateOfCompliances.Any(x => x == RequirementStateOfCompliance.Inconclusive)
+                    ? RequirementStateOfCompliance.Inconclusive
                     : RequirementStateOfCompliance.Failed;
         }
     }

CDP4RequirementsVerification/Verifiers/RequirementsContainerVerifier.cs

@@ -108,6 +108,23 @@ public async Task<RequirementStateOfCompliance> VerifyRequirements(Iteration ite
                     tasks.Add(requirementsVerifier.VerifyRequirements(iteration));
                 }
             }
+            else if (this.Container is RequirementsGroup requirementsGroup)
+            {
+                var parentRequirementsSpecification = requirementsGroup.GetContainerOfType<RequirementsSpecification>();
+
+                var allRelatedGroups = requirementsGroup.ContainedGroup().ToList();
+                allRelatedGroups.Add(requirementsGroup);
+
+                foreach (var requirement in this.GetAllowedRequirements(parentRequirementsSpecification.Requirement))
+                {
+                    if (allRelatedGroups.Contains(requirement.Group))
+                    {
+                        var requirementsVerifier = new RequirementVerifier(requirement);
+                        verifiers.Add(requirementsVerifier);
+                        tasks.Add(requirementsVerifier.VerifyRequirements(iteration));
+                    }
+                }
+            }
 
             await Task.WhenAll(tasks.ToArray());