AdSec-63 fix for TestSection - unflattened

arup-group · Aug 6, 2024 · 54df987 · 54df987
1 parent 5956947
commit 54df987
Showing 1 changed file with 12 additions and 18 deletions.
diff --git a/AdSecGHTests/Parameters/AdSecSectionTests.cs b/AdSecGHTests/Parameters/AdSecSectionTests.cs
@@ -19,22 +19,18 @@ public class AdSecSectionTests {
     [Fact]
     public void SerialiseUnflattenedSectionTest() {
       ISection section = CreateSection();
-
       IDesignCode designCode = EN1992.Part1_1.Edition_2004.NationalAnnex.DE.Edition_2013;
       var adSec = IAdSec.Create(designCode);
       ISection flattened = adSec.Flatten(section);
-
-      string fileName = Path.GetTempPath() + "AdSecSectionTest.ads";
+      
+      string fileName = Path.GetTempPath() + "AdSecSectionTest-Unflattened.ads";
       File.WriteAllText(fileName, CreateJson(designCode, section));
-
+      
       string json = File.ReadAllText(fileName);
       ParsedResult jsonParser = JsonParser.Deserialize(json);
       ISection actualSection = jsonParser.Sections[0];
-
-      var expectedProfile = (IPerimeterProfile)flattened.Profile;
-      var actualProfile = (IPerimeterProfile)actualSection.Profile;
-
-      TestSection(flattened, actualSection);
+
+      TestSection(flattened, actualSection, true);
     }
 
     [Fact]
@@ -52,13 +48,10 @@ public void SerialiaseFlattenedSectionTest() {
       ParsedResult jsonParser = JsonParser.Deserialize(json);
       ISection actualSection = jsonParser.Sections[0];
 
-      var expectedProfile = (IPerimeterProfile)flattened.Profile;
-      var actualProfile = (IPerimeterProfile)actualSection.Profile;
-
       TestSection(flattened, actualSection);
     }
 
-    private void TestSection(ISection expected, ISection actual) {
+    private void TestSection(ISection expected, ISection actual, bool unflattened = false) {
       var expectedProfile = (IPerimeterProfile)expected.Profile;
       var actualProfile = (IPerimeterProfile)actual.Profile;
 
@@ -69,11 +62,12 @@ private void TestSection(ISection expected, ISection actual) {
         Assert.Equal(expectedPoint.Y.Value, actualPoint.Y.Value, 4);
         Assert.Equal(expectedPoint.Z.Value, actualPoint.Z.Value, 4);
       }
-
-      Assert.Equal(((ISingleBars)expected.ReinforcementGroups[0]).Positions[0].Y.Value, ((ISingleBars)actual.ReinforcementGroups[0]).Positions[0].Y.Value, 4);
-      Assert.Equal(((ISingleBars)expected.ReinforcementGroups[0]).Positions[0].Z.Value, ((ISingleBars)actual.ReinforcementGroups[0]).Positions[0].Z.Value, 4);
-      Assert.Equal(((ISingleBars)expected.ReinforcementGroups[0]).BarBundle.CountPerBundle, ((ISingleBars)actual.ReinforcementGroups[0]).BarBundle.CountPerBundle);
-      Assert.Equal(((ISingleBars)expected.ReinforcementGroups[0]).BarBundle.Diameter, ((ISingleBars)actual.ReinforcementGroups[0]).BarBundle.Diameter);
+      if(!unflattened) {
+          Assert.Equal(((ISingleBars)expected.ReinforcementGroups[0]).Positions[0].Y.Value, ((ISingleBars)actual.ReinforcementGroups[0]).Positions[0].Y.Value, 4);
+          Assert.Equal(((ISingleBars)expected.ReinforcementGroups[0]).Positions[0].Z.Value, ((ISingleBars)actual.ReinforcementGroups[0]).Positions[0].Z.Value, 4);
+          Assert.Equal(((ISingleBars)expected.ReinforcementGroups[0]).BarBundle.CountPerBundle, ((ISingleBars)actual.ReinforcementGroups[0]).BarBundle.CountPerBundle);
+          Assert.Equal(((ISingleBars)expected.ReinforcementGroups[0]).BarBundle.Diameter, ((ISingleBars)actual.ReinforcementGroups[0]).BarBundle.Diameter);
+      }
 
       Assert.Equal(expectedProfile.ElasticModulus().Y.Value, actualProfile.ElasticModulus().Y.Value, 10);
       Assert.Equal(expectedProfile.ElasticModulus().Z.Value, actualProfile.ElasticModulus().Z.Value, 10);