From 54df98764c4a2744c5a89f4043d55270558996cd Mon Sep 17 00:00:00 2001 From: DominikaLos Date: Tue, 6 Aug 2024 09:57:58 +0200 Subject: [PATCH 1/5] AdSec-63 fix for TestSection - unflattened --- AdSecGHTests/Parameters/AdSecSectionTests.cs | 30 ++++++++------------ 1 file changed, 12 insertions(+), 18 deletions(-) diff --git a/AdSecGHTests/Parameters/AdSecSectionTests.cs b/AdSecGHTests/Parameters/AdSecSectionTests.cs index c03d874a..541d9d9d 100644 --- 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); From 52d46da437cf8a5d863476daa089bddc3dd28ce5 Mon Sep 17 00:00:00 2001 From: DominikaLos Date: Tue, 6 Aug 2024 10:06:39 +0200 Subject: [PATCH 2/5] Adsecgh-63 fix styling --- AdSecGHTests/Parameters/AdSecSectionTests.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/AdSecGHTests/Parameters/AdSecSectionTests.cs b/AdSecGHTests/Parameters/AdSecSectionTests.cs index 541d9d9d..b079d712 100644 --- a/AdSecGHTests/Parameters/AdSecSectionTests.cs +++ b/AdSecGHTests/Parameters/AdSecSectionTests.cs @@ -63,10 +63,10 @@ private void TestSection(ISection expected, ISection actual, bool unflattened = Assert.Equal(expectedPoint.Z.Value, actualPoint.Z.Value, 4); } 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(((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); From 2a173cc6b621bbd0c08af0f9b1d582b156e98b62 Mon Sep 17 00:00:00 2001 From: DominikaLos Date: Tue, 6 Aug 2024 10:10:06 +0200 Subject: [PATCH 3/5] adsecgh-63 fix styling part2 --- AdSecGHTests/Parameters/AdSecSectionTests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AdSecGHTests/Parameters/AdSecSectionTests.cs b/AdSecGHTests/Parameters/AdSecSectionTests.cs index 0e4472cb..6c4f74bd 100644 --- a/AdSecGHTests/Parameters/AdSecSectionTests.cs +++ b/AdSecGHTests/Parameters/AdSecSectionTests.cs @@ -65,7 +65,7 @@ private void TestSection(ISection expected, ISection actual, bool unflattened = Assert.Equal(expectedPoint.Y.Value, actualPoint.Y.Value, 4); Assert.Equal(expectedPoint.Z.Value, actualPoint.Z.Value, 4); } - if(!unflattened) { + 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); From 1c788838060bfb45f50b8644e1524940b80e04c5 Mon Sep 17 00:00:00 2001 From: DominikaLos Date: Tue, 6 Aug 2024 10:14:58 +0200 Subject: [PATCH 4/5] adsecgh-63 styling part3 --- AdSecGHTests/Parameters/AdSecSectionTests.cs | 33 ++++++++++---------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/AdSecGHTests/Parameters/AdSecSectionTests.cs b/AdSecGHTests/Parameters/AdSecSectionTests.cs index 6c4f74bd..db95f63b 100644 --- a/AdSecGHTests/Parameters/AdSecSectionTests.cs +++ b/AdSecGHTests/Parameters/AdSecSectionTests.cs @@ -19,48 +19,49 @@ namespace AdSecGHTests.Parameters { [Collection("GrasshopperFixture collection")] public class AdSecSectionTests { - [Fact(Skip = "Not Implemented Yet")] + [Fact] public void SerialiseUnflattenedSectionTest() { - ISection section = CreateSection(); - IDesignCode designCode = EN1992.Part1_1.Edition_2004.NationalAnnex.DE.Edition_2013; + var section = CreateSection(); + + var designCode = EN1992.Part1_1.Edition_2004.NationalAnnex.DE.Edition_2013; var adSec = IAdSec.Create(designCode); - ISection flattened = adSec.Flatten(section); + var flattened = adSec.Flatten(section); 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 jsonParser = JsonParser.Deserialize(json); + var actualSection = jsonParser.Sections[0]; TestSection(flattened, actualSection, true); } [Fact] public void SerialiaseFlattenedSectionTest() { - ISection section = CreateSection(); + var section = CreateSection(); - IDesignCode designCode = EN1992.Part1_1.Edition_2004.NationalAnnex.DE.Edition_2013; + var designCode = EN1992.Part1_1.Edition_2004.NationalAnnex.DE.Edition_2013; var adSec = IAdSec.Create(designCode); - ISection flattened = adSec.Flatten(section); + var flattened = adSec.Flatten(section); string fileName = Path.GetTempPath() + "AdSecSectionTest.ads"; File.WriteAllText(fileName, CreateJson(designCode, flattened)); string json = File.ReadAllText(fileName); - ParsedResult jsonParser = JsonParser.Deserialize(json); - ISection actualSection = jsonParser.Sections[0]; + var jsonParser = JsonParser.Deserialize(json); + var actualSection = jsonParser.Sections[0]; TestSection(flattened, actualSection); } - private void TestSection(ISection expected, ISection actual, bool unflattened = false) { + private static void TestSection(ISection expected, ISection actual, bool unflattened = false) { var expectedProfile = (IPerimeterProfile)expected.Profile; var actualProfile = (IPerimeterProfile)actual.Profile; for (int i = 0; i < expectedProfile.SolidPolygon.Points.Count; i++) { - IPoint expectedPoint = expectedProfile.SolidPolygon.Points[i]; - IPoint actualPoint = actualProfile.SolidPolygon.Points[i]; + var expectedPoint = expectedProfile.SolidPolygon.Points[i]; + var actualPoint = actualProfile.SolidPolygon.Points[i]; Assert.Equal(expectedPoint.Y.Value, actualPoint.Y.Value, 4); Assert.Equal(expectedPoint.Z.Value, actualPoint.Z.Value, 4); @@ -89,7 +90,7 @@ private static string CreateJson(IDesignCode designCode, ISection section) { private static ISection CreateSection() { IMaterial material = Oasys.AdSec.StandardMaterials.Concrete.EN1992.Part1_1.Edition_2004.NationalAnnex.DE.Edition_2013.C40_50; - IReinforcement rebarMaterial = Oasys.AdSec.StandardMaterials.Reinforcement.Steel.EN1992.Part1_1.Edition_2004.NationalAnnex.DE.Edition_2013.S500B; + var rebarMaterial = Oasys.AdSec.StandardMaterials.Reinforcement.Steel.EN1992.Part1_1.Edition_2004.NationalAnnex.DE.Edition_2013.S500B; var points = new List() { new Point2d(new Length(3.1464410643837, LengthUnit.Meter), new Length(2.9552083887352, LengthUnit.Meter)), @@ -128,7 +129,7 @@ private static ISection CreateSection() { var polygon = new Polygon(points); var profile = new Oasys.Taxonomy.Profiles.PerimeterProfile(polygon, new List()); - IPerimeterProfile adsecProfile = AdSecProfiles.CreatePerimeterProfile(profile); + var adsecProfile = AdSecProfiles.CreatePerimeterProfile(profile); var section = ISection.Create(adsecProfile, material); var bars = ISingleBars.Create(IBarBundle.Create(rebarMaterial, new Length(25, LengthUnit.Millimeter))); From a08a5edb489b2f5a3bcb1357cc5ce4d1e24db8ef Mon Sep 17 00:00:00 2001 From: DominikaLos Date: Wed, 7 Aug 2024 11:41:34 +0200 Subject: [PATCH 5/5] feat: GsaGH-63 formatting part4 --- AdSecGHTests/Parameters/AdSecSectionTests.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/AdSecGHTests/Parameters/AdSecSectionTests.cs b/AdSecGHTests/Parameters/AdSecSectionTests.cs index db95f63b..d8f4de1e 100644 --- a/AdSecGHTests/Parameters/AdSecSectionTests.cs +++ b/AdSecGHTests/Parameters/AdSecSectionTests.cs @@ -26,14 +26,14 @@ public void SerialiseUnflattenedSectionTest() { var designCode = EN1992.Part1_1.Edition_2004.NationalAnnex.DE.Edition_2013; var adSec = IAdSec.Create(designCode); var flattened = adSec.Flatten(section); - + string fileName = Path.GetTempPath() + "AdSecSectionTest-Unflattened.ads"; File.WriteAllText(fileName, CreateJson(designCode, section)); - + string json = File.ReadAllText(fileName); var jsonParser = JsonParser.Deserialize(json); var actualSection = jsonParser.Sections[0]; - + TestSection(flattened, actualSection, true); }