[Fix] (de)serialization of AlternativeID; fixes #54

ReqIFSharp.Extensions.Tests/ReqIFExtensions/SpecElementWithAttributesExtensionTestFixture.cs

@@ -39,7 +39,7 @@ public class SpecElementWithAttributesExtensionTestFixture
     {
         private ReqIF reqIf;
 
-        private IReqIFLoaderService reqIFLoaderService;
+        private ReqIFLoaderService reqIFLoaderService;
 
         [SetUp]
         public async Task SetUp()

ReqIFSharp.Extensions/ReqIFExtensions/SpecElementWithAttributesExtensions.cs

@@ -69,14 +69,15 @@ public static async Task<IEnumerable<Tuple<ExternalObject, string>>> QueryBase64
         {
             var result = new List<Tuple<ExternalObject, string>>();
 
-            var cts = new CancellationTokenSource();
-
-            foreach (var specObjectValue in specElementWithAttributes.Values.OfType<AttributeValueXHTML>())
+            using (var cts = new CancellationTokenSource())
             {
-                foreach (var externalObject in specObjectValue.ExternalObjects)
+                foreach (var specObjectValue in specElementWithAttributes.Values.OfType<AttributeValueXHTML>())
                 {
-                    var payload = await reqIfLoaderService.QueryData(externalObject, cts.Token);
-                    result.Add(new Tuple<ExternalObject, string>(externalObject, payload));
+                    foreach (var externalObject in specObjectValue.ExternalObjects)
+                    {
+                        var payload = await reqIfLoaderService.QueryData(externalObject, cts.Token);
+                        result.Add(new Tuple<ExternalObject, string>(externalObject, payload));
+                    }
                 }
             }
 

ReqIFSharp.Tests/DeSerializeAndSerializeTestFixture.cs

@@ -149,5 +149,21 @@ public async Task Verify_that_DefaultValueDemo_file_is_deserialized_and_async_se
             Assert.That(attributeDefinitionString.DefaultValue.TheValue, Is.EqualTo("LAH ---.---.---.-"));
             Assert.That(attributeDefinitionString.DefaultValue.Definition.Identifier, Is.EqualTo("_d0368b53-d0c6-43a1-a746-45243624b027"));
         }
+
+        [Test]
+        public void Verify_That_ProRailDemo_with_validation_and_assert_alternaiveid()
+        {
+            var cancellationTokenSource = new CancellationTokenSource();
+
+            var reqifPath = Path.Combine(TestContext.CurrentContext.TestDirectory, "TestData", "ProR_Traceability-Template-v1.0.reqif");
+            var deserializer = new ReqIFDeserializer();
+
+            var reqIfs = deserializer.Deserialize(reqifPath, true);
+
+            var reqif = reqIfs.Single();
+            var alternativeId = reqif.CoreContent.DataTypes.Single(x => x.Identifier == "_o7scM6dbEeafNduaIhMwQg_ald").AlternativeId;
+
+            Assert.That(alternativeId.Identifier, Is.EqualTo("_o7scM6dbEeafNduaIhMwQg_ald"));
+        }
     }
 }

ReqIFSharp.Tests/ReqIFDeSerializerTestFixture.cs

@@ -655,14 +655,14 @@ public async Task Verify_that_AlternativeId_can_be_deserialized_async()
 
             var specObjectType = reqif.CoreContent.SpecTypes.OfType<SpecObjectType>().Single(x => x.Identifier == "_jgCytAfNEeeAO8RifBaE-g");
 
-            foreach (var attributeDefinition in specObjectType.SpecAttributes)
+            foreach (var datatypeDefinition in reqif.CoreContent.DataTypes)
             {
-                Assert.That(attributeDefinition.AlternativeId.Identifier, Is.EqualTo(attributeDefinition.Identifier));
+                Assert.That(datatypeDefinition.AlternativeId.Identifier, Is.EqualTo(datatypeDefinition.Identifier));
             }
 
-            foreach (var datatypeDefinition in reqif.CoreContent.DataTypes)
+            foreach (var attributeDefinition in specObjectType.SpecAttributes)
             {
-                Assert.That(datatypeDefinition.AlternativeId.Identifier, Is.EqualTo(datatypeDefinition.Identifier));
+                Assert.That(attributeDefinition.AlternativeId.Identifier, Is.EqualTo(attributeDefinition.Identifier));
             }
 
             foreach (var specType in reqif.CoreContent.SpecTypes)
@@ -706,5 +706,18 @@ public void Verify_that_sampleGH43_can_be_deserialized_async()
 
             Assert.That(async () => await deserializer.DeserializeAsync(reqifPath, cancellationTokenSource.Token), Throws.Nothing);
         }
+
+        [Test]
+        public void Verify_that_ReqIfSharp_file_can_be_deserialized_async_with_validation()
+        {
+            var cancellationTokenSource = new CancellationTokenSource();
+
+            var reqifPath = Path.Combine(TestContext.CurrentContext.TestDirectory, "TestData", "reqifsharpgenerated.reqif");
+
+            var deserializer = new ReqIFDeserializer();
+
+            Assert.That(async () => await deserializer.DeserializeAsync(reqifPath, cancellationTokenSource.Token, true), Throws.Nothing);
+        }
+
     }
 }

ReqIFSharp.Tests/ReqIFSerializerTestFixture.cs

@@ -42,8 +42,6 @@ internal class ReqIFSerializerTestFixture
         private string asyncResultFileUri;
         private string asyncResultFileUriArchive;
 
-        private const string ReqIFNamespace = @"http://www.omg.org/spec/ReqIF/20110401/reqif.xsd";
-
         private string specobject_1_id;
 
         private string specobject_2_id;
@@ -709,7 +707,7 @@ private void CreateValuesForSpecElementWithAttributes(SpecElementWithAttributes
             var simplifiedAttributeValueXhtml = new AttributeValueXHTML();
             simplifiedAttributeValueXhtml.Definition = (AttributeDefinitionXHTML)specType.SpecAttributes.SingleOrDefault(x => x.GetType() == typeof(AttributeDefinitionXHTML));
             simplifiedAttributeValueXhtml.IsSimplified = true;
-            simplifiedAttributeValueXhtml.TheValue = "simplified content";
+            simplifiedAttributeValueXhtml.TheValue = this.xhtmlcontent;
             simplifiedAttributeValueXhtml.TheOriginalValue= this.xhtmlcontent;
             specElementWithAttributes.Values.Add(simplifiedAttributeValueXhtml);
         }

ReqIFSharp.Tests/ReqIFSharp.Tests.csproj

@@ -63,6 +63,9 @@
 		<None Update="TestData\ProR_Traceability-Template-v1.0.reqif">
 			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
 		</None>
+		<None Update="TestData\reqifsharpgenerated.reqif">
+		  <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+		</None>
 		<None Update="TestData\requirements-and-objects.reqifz">
 			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
 		</None>