From faf8a10b5983e0bd23a78d9285b71d58a2e0568b Mon Sep 17 00:00:00 2001 From: DominikaLos Date: Thu, 30 Nov 2023 09:21:13 +0100 Subject: [PATCH] renaming part 1 gsaResult2Tests -> gsaResultTests --- ...lement1dAverageStrainEnergyDensityTests.cs | 16 +++++++------- .../Element1dDerivedStressTests.cs | 16 +++++++------- .../Element1dDisplacementsTests.cs | 16 +++++++------- .../Element1dInternalForcesTests.cs | 16 +++++++------- .../Collections/Element1dResultSubsetTests.cs | 4 ++-- .../Element1dStrainEnergyDensityTests.cs | 16 +++++++------- .../Collections/Element1dStressTests.cs | 16 +++++++------- .../Element2dDisplacementsTests.cs | 16 +++++++------- .../Collections/Element2dForcesTests.cs | 16 +++++++------- .../Collections/Element2dMomentsTests.cs | 16 +++++++------- .../Collections/Element2dShearForcesTests.cs | 16 +++++++------- .../Collections/Element2dStressesTests.cs | 16 +++++++------- .../Collections/Element3dStressesTests.cs | 16 +++++++------- .../Collections/Element3dTranslationsTests.cs | 16 +++++++------- .../{GsaResult2Tests.cs => GsaResultTests.cs} | 2 +- .../Collections/Member1dDisplacementsTests.cs | 16 +++++++------- .../Collections/Member1dForcesTests.cs | 16 +++++++------- .../Collections/NodeDisplacementsTests.cs | 16 +++++++------- .../Collections/NodeFootfallTests.cs | 20 ++++++++--------- .../Collections/NodeReactionForcesTests.cs | 16 +++++++------- .../Collections/NodeResultsCacheTests.cs | 4 ++-- .../Collections/NodeSpringForcesTests.cs | 16 +++++++------- .../TotalLoadsAndReactionsTests.cs | 22 +++++++++---------- 23 files changed, 170 insertions(+), 170 deletions(-) rename GsaGHTests/1_BaseParameters/5_Results/Collections/{GsaResult2Tests.cs => GsaResultTests.cs} (96%) diff --git a/GsaGHTests/1_BaseParameters/5_Results/Collections/Element1dAverageStrainEnergyDensityTests.cs b/GsaGHTests/1_BaseParameters/5_Results/Collections/Element1dAverageStrainEnergyDensityTests.cs index 7b2b5cf5e..a9524d5fc 100644 --- a/GsaGHTests/1_BaseParameters/5_Results/Collections/Element1dAverageStrainEnergyDensityTests.cs +++ b/GsaGHTests/1_BaseParameters/5_Results/Collections/Element1dAverageStrainEnergyDensityTests.cs @@ -17,7 +17,7 @@ public class Element1dAverageStrainEnergyDensityTests { [Fact] public void Element1dAverageStrainEnergyDensityElement1dIdsFromAnalysisCaseTest() { // Assemble - var result = (GsaResult)GsaResult2Tests.AnalysisCaseResult(GsaFile.SteelDesignComplex, 1); + var result = (GsaResult)GsaResultTests.AnalysisCaseResult(GsaFile.SteelDesignComplex, 1); // Act ReadOnlyCollection elementIds = result.ElementIds(ElementList, 1); @@ -32,7 +32,7 @@ INodeResultSubset resultSet [Fact] public void Element1dAverageStrainEnergyDensitysElement1dIdsFromCombinationCaseTest() { // Assemble - var result = (GsaResult)GsaResult2Tests.CombinationCaseResult(GsaFile.SteelDesignComplex, 4); + var result = (GsaResult)GsaResultTests.CombinationCaseResult(GsaFile.SteelDesignComplex, 4); // Act ReadOnlyCollection elementIds = result.ElementIds(ElementList, 1); @@ -47,7 +47,7 @@ INodeResultSubset resultSet [Fact] public void Element1dAverageStrainEnergyDensitysMaxFromAnalysisCaseTest() { // Assemble - var result = (GsaResult)GsaResult2Tests.AnalysisCaseResult(GsaFile.SteelDesignComplex, 1); + var result = (GsaResult)GsaResultTests.AnalysisCaseResult(GsaFile.SteelDesignComplex, 1); double expected = Element1dAverageStrainEnergyDensity.A1EnergyInkJ().Max(); // Act @@ -63,7 +63,7 @@ INodeResultSubset resultSet [Fact] public void Element1dAverageStrainEnergyDensitysMaxFromCombinationCaseTest() { // Assemble - var result = (GsaResult)GsaResult2Tests.CombinationCaseResult(GsaFile.SteelDesignComplex, 4); + var result = (GsaResult)GsaResultTests.CombinationCaseResult(GsaFile.SteelDesignComplex, 4); double expected = Math.Max( Element1dAverageStrainEnergyDensity.C4p1EnergyInkJ().Max(), Element1dAverageStrainEnergyDensity.C4p2EnergyInkJ().Max()); @@ -81,7 +81,7 @@ INodeResultSubset resultSet [Fact] public void Element1dAverageStrainEnergyDensitysMinFromAnalysisCaseTest() { // Assemble - var result = (GsaResult)GsaResult2Tests.AnalysisCaseResult(GsaFile.SteelDesignComplex, 1); + var result = (GsaResult)GsaResultTests.AnalysisCaseResult(GsaFile.SteelDesignComplex, 1); double expected = Element1dAverageStrainEnergyDensity.A1EnergyInkJ().Min(); // Act @@ -97,7 +97,7 @@ INodeResultSubset resultSet [Fact] public void Element1dAverageStrainEnergyDensitysMinFromcombinationCaseTest() { // Assemble - var result = (GsaResult)GsaResult2Tests.CombinationCaseResult(GsaFile.SteelDesignComplex, 4); + var result = (GsaResult)GsaResultTests.CombinationCaseResult(GsaFile.SteelDesignComplex, 4); double expected = Math.Min( Element1dAverageStrainEnergyDensity.C4p1EnergyInkJ().Min(), Element1dAverageStrainEnergyDensity.C4p2EnergyInkJ().Min()); @@ -115,7 +115,7 @@ INodeResultSubset resultSet [Fact] public void Element1dAverageStrainEnergyDensitysValuesFromAnalysisCaseTest() { // Assemble - var result = (GsaResult)GsaResult2Tests.AnalysisCaseResult(GsaFile.SteelDesignComplex, 1); + var result = (GsaResult)GsaResultTests.AnalysisCaseResult(GsaFile.SteelDesignComplex, 1); List expected = Element1dAverageStrainEnergyDensity.A1EnergyInkJ(); // Act @@ -138,7 +138,7 @@ INodeResultSubset resultSet [Fact] public void Element1dAverageStrainEnergyDensitysValuesFromCombinationCaseTest() { // Assemble - var result = (GsaResult)GsaResult2Tests.CombinationCaseResult(GsaFile.SteelDesignComplex, 4); + var result = (GsaResult)GsaResultTests.CombinationCaseResult(GsaFile.SteelDesignComplex, 4); List expectedP1 = Element1dAverageStrainEnergyDensity.C4p1EnergyInkJ(); List expectedP2 = Element1dAverageStrainEnergyDensity.C4p2EnergyInkJ(); diff --git a/GsaGHTests/1_BaseParameters/5_Results/Collections/Element1dDerivedStressTests.cs b/GsaGHTests/1_BaseParameters/5_Results/Collections/Element1dDerivedStressTests.cs index 100e14b45..b4a528718 100644 --- a/GsaGHTests/1_BaseParameters/5_Results/Collections/Element1dDerivedStressTests.cs +++ b/GsaGHTests/1_BaseParameters/5_Results/Collections/Element1dDerivedStressTests.cs @@ -22,7 +22,7 @@ public enum ResultDerivedStress1dHelperEnum { [Fact] public void Element1dDerivedStressElement1dIdsFromAnalysisCaseTest() { // Assemble - var result = (GsaResult)GsaResult2Tests.AnalysisCaseResult(GsaFile.SteelDesignComplex, 1); + var result = (GsaResult)GsaResultTests.AnalysisCaseResult(GsaFile.SteelDesignComplex, 1); // Act ReadOnlyCollection elementIds = result.ElementIds(ElementList, 1); @@ -37,7 +37,7 @@ IEntity1dResultSubset elementIds = result.ElementIds(ElementList, 1); @@ -56,7 +56,7 @@ IEntity1dResultSubset expected = ExpectedAnalysisCaseValues(component); int positionsCount = 4; @@ -170,7 +170,7 @@ IEntity1dResultSubset expectedP1 = ExpectedCombinationCaseC4p1Values(component); List expectedP2 = ExpectedCombinationCaseC4p2Values(component); int positionsCount = 4; diff --git a/GsaGHTests/1_BaseParameters/5_Results/Collections/Element1dDisplacementsTests.cs b/GsaGHTests/1_BaseParameters/5_Results/Collections/Element1dDisplacementsTests.cs index 110ae4ef4..095d020b6 100644 --- a/GsaGHTests/1_BaseParameters/5_Results/Collections/Element1dDisplacementsTests.cs +++ b/GsaGHTests/1_BaseParameters/5_Results/Collections/Element1dDisplacementsTests.cs @@ -16,7 +16,7 @@ public class Element1dDisplacementsTests { [Fact] public void Element1dDisplacementsElement1dIdsFromAnalysisCaseTest() { // Assemble - var result = (GsaResult)GsaResult2Tests.AnalysisCaseResult(GsaFile.SteelDesignComplex, 1); + var result = (GsaResult)GsaResultTests.AnalysisCaseResult(GsaFile.SteelDesignComplex, 1); // Act ReadOnlyCollection elementIds = result.ElementIds(ElementList, 1); @@ -31,7 +31,7 @@ IEntity1dResultSubset elementIds = result.ElementIds(ElementList, 1); @@ -54,7 +54,7 @@ IEntity1dResultSubset expected = ExpectedAnalysisCaseValues(component); int positionsCount = 4; @@ -188,7 +188,7 @@ IEntity1dResultSubset expectedP1 = ExpectedCombinationCaseC4p1Values(component); List expectedP2 = ExpectedCombinationCaseC4p2Values(component); int positionsCount = 4; diff --git a/GsaGHTests/1_BaseParameters/5_Results/Collections/Element1dInternalForcesTests.cs b/GsaGHTests/1_BaseParameters/5_Results/Collections/Element1dInternalForcesTests.cs index b539903c8..34e0eac19 100644 --- a/GsaGHTests/1_BaseParameters/5_Results/Collections/Element1dInternalForcesTests.cs +++ b/GsaGHTests/1_BaseParameters/5_Results/Collections/Element1dInternalForcesTests.cs @@ -16,7 +16,7 @@ public class Element1dInternalForcesTests { [Fact] public void Element1dInternalForcesElement1dIdsFromAnalysisCaseTest() { // Assemble - var result = (GsaResult)GsaResult2Tests.AnalysisCaseResult(GsaFile.SteelDesignComplex, 1); + var result = (GsaResult)GsaResultTests.AnalysisCaseResult(GsaFile.SteelDesignComplex, 1); // Act ReadOnlyCollection elementIds = result.ElementIds(ElementList, 1); @@ -31,7 +31,7 @@ IEntity1dResultSubset elementIds = result.ElementIds(ElementList, 1); @@ -54,7 +54,7 @@ IEntity1dResultSubset expected = ExpectedAnalysisCaseValues(component); int positionsCount = 5; @@ -188,7 +188,7 @@ IEntity1dResultSubset expectedP1 = ExpectedCombinationCaseC4p1Values(component); List expectedP2 = ExpectedCombinationCaseC4p2Values(component); int positionsCount = 5; diff --git a/GsaGHTests/1_BaseParameters/5_Results/Collections/Element1dResultSubsetTests.cs b/GsaGHTests/1_BaseParameters/5_Results/Collections/Element1dResultSubsetTests.cs index b93b40519..e27da817e 100644 --- a/GsaGHTests/1_BaseParameters/5_Results/Collections/Element1dResultSubsetTests.cs +++ b/GsaGHTests/1_BaseParameters/5_Results/Collections/Element1dResultSubsetTests.cs @@ -15,7 +15,7 @@ public class Element1dResultSubsetTests { [Fact] public void GetMissingKeysTests() { // Assemble - var result = (GsaResult)GsaResult2Tests.AnalysisCaseResult(GsaFile.SteelDesignComplex, 1); + var result = (GsaResult)GsaResultTests.AnalysisCaseResult(GsaFile.SteelDesignComplex, 1); // Act ReadOnlyCollection elementIds = result.ElementIds("1", 1); @@ -34,7 +34,7 @@ IEntity1dResultSubset elementIds = result.ElementIds("1", 1); diff --git a/GsaGHTests/1_BaseParameters/5_Results/Collections/Element1dStrainEnergyDensityTests.cs b/GsaGHTests/1_BaseParameters/5_Results/Collections/Element1dStrainEnergyDensityTests.cs index 9778c7b82..c0b20bf7c 100644 --- a/GsaGHTests/1_BaseParameters/5_Results/Collections/Element1dStrainEnergyDensityTests.cs +++ b/GsaGHTests/1_BaseParameters/5_Results/Collections/Element1dStrainEnergyDensityTests.cs @@ -17,7 +17,7 @@ public class Element1dStrainEnergyDensityTests { [Fact] public void Element1dStrainEnergyDensityElement1dIdsFromAnalysisCaseTest() { // Assemble - var result = (GsaResult)GsaResult2Tests.AnalysisCaseResult(GsaFile.SteelDesignComplex, 1); + var result = (GsaResult)GsaResultTests.AnalysisCaseResult(GsaFile.SteelDesignComplex, 1); // Act ReadOnlyCollection elementIds = result.ElementIds(ElementList, 1); @@ -32,7 +32,7 @@ IEntity1dResultSubset elementIds = result.ElementIds(ElementList, 1); @@ -47,7 +47,7 @@ IEntity1dResultSubset expected = Element1dStrainEnergyDensity.A1EnergyInkJ(); int positionsCount = 5; @@ -141,7 +141,7 @@ IEntity1dResultSubset expectedP1 = Element1dStrainEnergyDensity.C4p1EnergyInkJ(); List expectedP2 = Element1dStrainEnergyDensity.C4p2EnergyInkJ(); int positionsCount = 5; diff --git a/GsaGHTests/1_BaseParameters/5_Results/Collections/Element1dStressTests.cs b/GsaGHTests/1_BaseParameters/5_Results/Collections/Element1dStressTests.cs index 9cdbe01af..17eb371d0 100644 --- a/GsaGHTests/1_BaseParameters/5_Results/Collections/Element1dStressTests.cs +++ b/GsaGHTests/1_BaseParameters/5_Results/Collections/Element1dStressTests.cs @@ -27,7 +27,7 @@ public enum ResultStress1dHelperEnum { [Fact] public void Element1dStressElement1dIdsFromAnalysisCaseTest() { // Assemble - var result = (GsaResult)GsaResult2Tests.AnalysisCaseResult(GsaFile.SteelDesignComplex, 1); + var result = (GsaResult)GsaResultTests.AnalysisCaseResult(GsaFile.SteelDesignComplex, 1); // Act ReadOnlyCollection elementIds = result.ElementIds(ElementList, 1); @@ -42,7 +42,7 @@ IEntity1dResultSubset elementIds = result.ElementIds(ElementList, 1); @@ -66,7 +66,7 @@ IEntity1dResultSubset expected = ExpectedAnalysisCaseValues(component); int positionsCount = 4; @@ -205,7 +205,7 @@ IEntity1dResultSubset expectedP1 = ExpectedCombinationCaseC4p1Values(component); List expectedP2 = ExpectedCombinationCaseC4p2Values(component); int positionsCount = 4; diff --git a/GsaGHTests/1_BaseParameters/5_Results/Collections/Element2dDisplacementsTests.cs b/GsaGHTests/1_BaseParameters/5_Results/Collections/Element2dDisplacementsTests.cs index 68c1d6bb0..662e41ad4 100644 --- a/GsaGHTests/1_BaseParameters/5_Results/Collections/Element2dDisplacementsTests.cs +++ b/GsaGHTests/1_BaseParameters/5_Results/Collections/Element2dDisplacementsTests.cs @@ -16,7 +16,7 @@ public class Element2dDisplacementsTests { [Fact] public void Element2dDisplacementsElement2dIdsFromAnalysisCaseTest() { // Assemble - var result = (GsaResult)GsaResult2Tests.AnalysisCaseResult(GsaFile.Element2dSimple, 1); + var result = (GsaResult)GsaResultTests.AnalysisCaseResult(GsaFile.Element2dSimple, 1); // Act ReadOnlyCollection elementIds = result.ElementIds(ElementList, 2); @@ -31,7 +31,7 @@ IMeshResultSubset, IDisplacement, ResultVector6 elementIds = result.ElementIds(ElementList, 2); @@ -50,7 +50,7 @@ IMeshResultSubset, IDisplacement, ResultVector6, IDisplacement, ResultVector6, IDisplacement, ResultVector6, IDisplacement, ResultVector6, IDisplacement, ResultVector6 expected = ExpectedAnalysisCaseValues(component); // Act @@ -160,7 +160,7 @@ IMeshResultSubset, IDisplacement, ResultVector6 expectedP1 = ExpectedCombinationCaseC2p1Values(component); List expectedP2 = ExpectedCombinationCaseC2p2Values(component); diff --git a/GsaGHTests/1_BaseParameters/5_Results/Collections/Element2dForcesTests.cs b/GsaGHTests/1_BaseParameters/5_Results/Collections/Element2dForcesTests.cs index 279bc1f45..abfebac6d 100644 --- a/GsaGHTests/1_BaseParameters/5_Results/Collections/Element2dForcesTests.cs +++ b/GsaGHTests/1_BaseParameters/5_Results/Collections/Element2dForcesTests.cs @@ -16,7 +16,7 @@ public class Element2dForcesTests { [Fact] public void Element2dForcesElement2dIdsFromAnalysisCaseTest() { // Assemble - var result = (GsaResult)GsaResult2Tests.AnalysisCaseResult(GsaFile.Element2dSimple, 1); + var result = (GsaResult)GsaResultTests.AnalysisCaseResult(GsaFile.Element2dSimple, 1); // Act ReadOnlyCollection elementIds = result.ElementIds(ElementList, 2); @@ -31,7 +31,7 @@ IMeshResultSubset, IForce2d, ResultTensor2InAxis elementIds = result.ElementIds(ElementList, 2); @@ -49,7 +49,7 @@ IMeshResultSubset, IForce2d, ResultTensor2InAxis, IForce2d, ResultTensor2InAxis, IForce2d, ResultTensor2InAxis, IForce2d, ResultTensor2InAxis, IForce2d, ResultTensor2InAxis expected = ExpectedAnalysisCaseValues(component); // Act @@ -154,7 +154,7 @@ IMeshResultSubset, IForce2d, ResultTensor2InAxis expectedP1 = ExpectedCombinationCaseC2p1Values(component); List expectedP2 = ExpectedCombinationCaseC2p2Values(component); diff --git a/GsaGHTests/1_BaseParameters/5_Results/Collections/Element2dMomentsTests.cs b/GsaGHTests/1_BaseParameters/5_Results/Collections/Element2dMomentsTests.cs index 08ea21afb..f25696f9f 100644 --- a/GsaGHTests/1_BaseParameters/5_Results/Collections/Element2dMomentsTests.cs +++ b/GsaGHTests/1_BaseParameters/5_Results/Collections/Element2dMomentsTests.cs @@ -16,7 +16,7 @@ public class Element2dMomentsTests { [Fact] public void Element2dMomentsElement2dIdsFromAnalysisCaseTest() { // Assemble - var result = (GsaResult)GsaResult2Tests.AnalysisCaseResult(GsaFile.Element2dSimple, 1); + var result = (GsaResult)GsaResultTests.AnalysisCaseResult(GsaFile.Element2dSimple, 1); // Act ReadOnlyCollection elementIds = result.ElementIds(ElementList, 2); @@ -31,7 +31,7 @@ IMeshResultSubset, IMoment2d, ResultTensor2AroundAxis elementIds = result.ElementIds(ElementList, 2); @@ -51,7 +51,7 @@ IMeshResultSubset, IMoment2d, ResultTensor2AroundAxis, IMoment2d, ResultTensor2AroundAxis, IMoment2d, ResultTensor2AroundAxis, IMoment2d, ResultTensor2AroundAxis, IMoment2d, ResultTensor2AroundAxis expected = ExpectedAnalysisCaseValues(component); // Act @@ -166,7 +166,7 @@ IMeshResultSubset, IMoment2d, ResultTensor2AroundAxis expectedP1 = ExpectedCombinationCaseC2p1Values(component); List expectedP2 = ExpectedCombinationCaseC2p2Values(component); diff --git a/GsaGHTests/1_BaseParameters/5_Results/Collections/Element2dShearForcesTests.cs b/GsaGHTests/1_BaseParameters/5_Results/Collections/Element2dShearForcesTests.cs index 4c3ece6ae..1b3b6be8d 100644 --- a/GsaGHTests/1_BaseParameters/5_Results/Collections/Element2dShearForcesTests.cs +++ b/GsaGHTests/1_BaseParameters/5_Results/Collections/Element2dShearForcesTests.cs @@ -16,7 +16,7 @@ public class Element2dShearForcesTests { [Fact] public void Element2dShearForcesElement2dIdsFromAnalysisCaseTest() { // Assemble - var result = (GsaResult)GsaResult2Tests.AnalysisCaseResult(GsaFile.Element2dSimple, 1); + var result = (GsaResult)GsaResultTests.AnalysisCaseResult(GsaFile.Element2dSimple, 1); // Act ReadOnlyCollection elementIds = result.ElementIds(ElementList, 2); @@ -31,7 +31,7 @@ IMeshResultSubset, IShear2d, ResultVector2 elementIds = result.ElementIds(ElementList, 2); @@ -48,7 +48,7 @@ IMeshResultSubset, IShear2d, ResultVector2, IShear2d, ResultVector2, IShear2d, ResultVector2, IShear2d, ResultVector2, IShear2d, ResultVector2 expected = ExpectedAnalysisCaseValues(component); // Act @@ -145,7 +145,7 @@ IMeshResultSubset, IShear2d, ResultVector2 expectedP1 = ExpectedCombinationCaseC2p1Values(component); List expectedP2 = ExpectedCombinationCaseC2p2Values(component); diff --git a/GsaGHTests/1_BaseParameters/5_Results/Collections/Element2dStressesTests.cs b/GsaGHTests/1_BaseParameters/5_Results/Collections/Element2dStressesTests.cs index 9025224e2..e9213a5b0 100644 --- a/GsaGHTests/1_BaseParameters/5_Results/Collections/Element2dStressesTests.cs +++ b/GsaGHTests/1_BaseParameters/5_Results/Collections/Element2dStressesTests.cs @@ -17,7 +17,7 @@ public class Element2dStressesTests { [InlineData(Layer2d.Bottom)] public void Element2dStressesElement2dIdsFromAnalysisCaseTest(Layer2d layer) { // Assemble - var result = (GsaResult)GsaResult2Tests.AnalysisCaseResult(GsaFile.Element2dSimple, 1); + var result = (GsaResult)GsaResultTests.AnalysisCaseResult(GsaFile.Element2dSimple, 1); // Act ReadOnlyCollection elementIds = result.ElementIds(ElementList, 2); @@ -35,7 +35,7 @@ IMeshResultSubset, IStress, ResultTensor3 elementIds = result.ElementIds(ElementList, 2); @@ -68,7 +68,7 @@ IMeshResultSubset, IStress, ResultTensor3, IStress, ResultTensor3, IStress, ResultTensor3, IStress, ResultTensor3, IStress, ResultTensor3 expected = ExpectedAnalysisCaseValues(component, layer); // Act @@ -255,7 +255,7 @@ IMeshResultSubset, IStress, ResultTensor3 expectedP1 = ExpectedCombinationCaseC2p1Values(component, layer); List expectedP2 = ExpectedCombinationCaseC2p2Values(component, layer); diff --git a/GsaGHTests/1_BaseParameters/5_Results/Collections/Element3dStressesTests.cs b/GsaGHTests/1_BaseParameters/5_Results/Collections/Element3dStressesTests.cs index 509faaf01..b7e2b949d 100644 --- a/GsaGHTests/1_BaseParameters/5_Results/Collections/Element3dStressesTests.cs +++ b/GsaGHTests/1_BaseParameters/5_Results/Collections/Element3dStressesTests.cs @@ -15,7 +15,7 @@ public class Element3dStressesTests { [Fact] public void Element3dStressesElement3dIdsFromAnalysisCaseTest() { // Assemble - var result = (GsaResult)GsaResult2Tests.AnalysisCaseResult(GsaFile.Element3dSimple, 1); + var result = (GsaResult)GsaResultTests.AnalysisCaseResult(GsaFile.Element3dSimple, 1); // Act ReadOnlyCollection elementIds = result.ElementIds(ElementList, 3); @@ -30,7 +30,7 @@ IMeshResultSubset, IStress, ResultTensor3 elementIds = result.ElementIds(ElementList, 3); @@ -51,7 +51,7 @@ IMeshResultSubset, IStress, ResultTensor3, IStress, ResultTensor3, IStress, ResultTensor3, IStress, ResultTensor3, IStress, ResultTensor3 expected = ExpectedAnalysisCaseValues(component); // Act @@ -173,7 +173,7 @@ IMeshResultSubset, IStress, ResultTensor3 expectedP1 = ExpectedCombinationCaseC2p1Values(component); List expectedP2 = ExpectedCombinationCaseC2p2Values(component); diff --git a/GsaGHTests/1_BaseParameters/5_Results/Collections/Element3dTranslationsTests.cs b/GsaGHTests/1_BaseParameters/5_Results/Collections/Element3dTranslationsTests.cs index af4515ebe..acbfbf081 100644 --- a/GsaGHTests/1_BaseParameters/5_Results/Collections/Element3dTranslationsTests.cs +++ b/GsaGHTests/1_BaseParameters/5_Results/Collections/Element3dTranslationsTests.cs @@ -16,7 +16,7 @@ public class Element3dTranslationsTests { [Fact] public void Element3dDisplacementsElement3dIdsFromAnalysisCaseTest() { // Assemble - var result = (GsaResult)GsaResult2Tests.AnalysisCaseResult(GsaFile.Element3dSimple, 1); + var result = (GsaResult)GsaResultTests.AnalysisCaseResult(GsaFile.Element3dSimple, 1); // Act ReadOnlyCollection elementIds = result.ElementIds(ElementList, 3); @@ -31,7 +31,7 @@ IMeshResultSubset, ITranslation, ResultVector3InAxis [Fact] public void Element3dDisplacementsElement3dIdsFromCombinationCaseTest() { // Assemble - var result = (GsaResult)GsaResult2Tests.CombinationCaseResult(GsaFile.Element3dSimple, 2); + var result = (GsaResult)GsaResultTests.CombinationCaseResult(GsaFile.Element3dSimple, 2); // Act ReadOnlyCollection elementIds = result.ElementIds(ElementList, 3); @@ -50,7 +50,7 @@ IMeshResultSubset, ITranslation, ResultVector3InAxis [InlineData(ResultVector6HelperEnum.Xyz)] public void Element3dDisplacementsMaxFromAnalysisCaseTest(ResultVector6HelperEnum component) { // Assemble - var result = (GsaResult)GsaResult2Tests.AnalysisCaseResult(GsaFile.Element3dSimple, 1); + var result = (GsaResult)GsaResultTests.AnalysisCaseResult(GsaFile.Element3dSimple, 1); double expected = ExpectedAnalysisCaseValues(component).Max(); // Act @@ -70,7 +70,7 @@ IMeshResultSubset, ITranslation, ResultVector3InAxis [InlineData(ResultVector6HelperEnum.Xyz)] public void Element3dDisplacementsMaxFromCombinationCaseTest(ResultVector6HelperEnum component) { // Assemble - var result = (GsaResult)GsaResult2Tests.CombinationCaseResult(GsaFile.Element3dSimple, 2); + var result = (GsaResult)GsaResultTests.CombinationCaseResult(GsaFile.Element3dSimple, 2); double expected = Math.Max(ExpectedCombinationCaseC2p1Values(component).Max(), ExpectedCombinationCaseC2p2Values(component).Max()); @@ -91,7 +91,7 @@ IMeshResultSubset, ITranslation, ResultVector3InAxis [InlineData(ResultVector6HelperEnum.Xyz)] public void Element3dDisplacementsMinFromAnalysisCaseTest(ResultVector6HelperEnum component) { // Assemble - var result = (GsaResult)GsaResult2Tests.AnalysisCaseResult(GsaFile.Element3dSimple, 1); + var result = (GsaResult)GsaResultTests.AnalysisCaseResult(GsaFile.Element3dSimple, 1); double expected = ExpectedAnalysisCaseValues(component).Min(); // Act @@ -111,7 +111,7 @@ IMeshResultSubset, ITranslation, ResultVector3InAxis [InlineData(ResultVector6HelperEnum.Xyz)] public void Element3dDisplacementsMinFromcombinationCaseTest(ResultVector6HelperEnum component) { // Assemble - var result = (GsaResult)GsaResult2Tests.CombinationCaseResult(GsaFile.Element3dSimple, 2); + var result = (GsaResult)GsaResultTests.CombinationCaseResult(GsaFile.Element3dSimple, 2); double expected = Math.Min(ExpectedCombinationCaseC2p1Values(component).Min(), ExpectedCombinationCaseC2p2Values(component).Min()); @@ -132,7 +132,7 @@ IMeshResultSubset, ITranslation, ResultVector3InAxis [InlineData(ResultVector6HelperEnum.Xyz)] public void Element3dDisplacementsValuesFromAnalysisCaseTest(ResultVector6HelperEnum component) { // Assemble - var result = (GsaResult)GsaResult2Tests.AnalysisCaseResult(GsaFile.Element3dSimple, 1); + var result = (GsaResult)GsaResultTests.AnalysisCaseResult(GsaFile.Element3dSimple, 1); List expected = ExpectedAnalysisCaseValues(component); // Act @@ -160,7 +160,7 @@ IMeshResultSubset, ITranslation, ResultVector3InAxis [InlineData(ResultVector6HelperEnum.Xyz)] public void Element3dDisplacementsValuesFromCombinationCaseTest(ResultVector6HelperEnum component) { // Assemble - var result = (GsaResult)GsaResult2Tests.CombinationCaseResult(GsaFile.Element3dSimple, 2); + var result = (GsaResult)GsaResultTests.CombinationCaseResult(GsaFile.Element3dSimple, 2); List expectedP1 = ExpectedCombinationCaseC2p1Values(component); List expectedP2 = ExpectedCombinationCaseC2p2Values(component); diff --git a/GsaGHTests/1_BaseParameters/5_Results/Collections/GsaResult2Tests.cs b/GsaGHTests/1_BaseParameters/5_Results/Collections/GsaResultTests.cs similarity index 96% rename from GsaGHTests/1_BaseParameters/5_Results/Collections/GsaResult2Tests.cs rename to GsaGHTests/1_BaseParameters/5_Results/Collections/GsaResultTests.cs index b53eb8ca5..1dc355df6 100644 --- a/GsaGHTests/1_BaseParameters/5_Results/Collections/GsaResult2Tests.cs +++ b/GsaGHTests/1_BaseParameters/5_Results/Collections/GsaResultTests.cs @@ -7,7 +7,7 @@ namespace GsaGHTests.Parameters.Results { [Collection("GrasshopperFixture collection")] - public partial class GsaResult2Tests { + public partial class GsaResultTests { public static IGsaResult AnalysisCaseResult(string file, int caseId) { var apiModel = new GsaAPI.Model(file); var model = new GsaModel(apiModel); diff --git a/GsaGHTests/1_BaseParameters/5_Results/Collections/Member1dDisplacementsTests.cs b/GsaGHTests/1_BaseParameters/5_Results/Collections/Member1dDisplacementsTests.cs index f5065c642..16a35388c 100644 --- a/GsaGHTests/1_BaseParameters/5_Results/Collections/Member1dDisplacementsTests.cs +++ b/GsaGHTests/1_BaseParameters/5_Results/Collections/Member1dDisplacementsTests.cs @@ -15,7 +15,7 @@ public class Member1dDisplacementsTests { [Fact] public void Member1dDisplacementsMember1dIdsFromAnalysisCaseTest() { // Assemble - var result = (GsaResult)GsaResult2Tests.AnalysisCaseResult(GsaFile.SteelDesignSimple, 1); + var result = (GsaResult)GsaResultTests.AnalysisCaseResult(GsaFile.SteelDesignSimple, 1); // Act ReadOnlyCollection memberIds = result.MemberIds(MemberList); @@ -30,7 +30,7 @@ IEntity1dResultSubset memberIds = result.MemberIds(MemberList); @@ -53,7 +53,7 @@ IEntity1dResultSubset expected = ExpectedAnalysisCaseValues(component); int positionsCount = 5; @@ -187,7 +187,7 @@ IEntity1dResultSubset expectedP1 = ExpectedCombinationCaseC1Values(component); int positionsCount = 5; diff --git a/GsaGHTests/1_BaseParameters/5_Results/Collections/Member1dForcesTests.cs b/GsaGHTests/1_BaseParameters/5_Results/Collections/Member1dForcesTests.cs index ee0fd8c59..328605092 100644 --- a/GsaGHTests/1_BaseParameters/5_Results/Collections/Member1dForcesTests.cs +++ b/GsaGHTests/1_BaseParameters/5_Results/Collections/Member1dForcesTests.cs @@ -15,7 +15,7 @@ public class Member1dForcesTests { [Fact] public void Member1dForcesMember1dIdsFromAnalysisCaseTest() { // Assemble - var result = (GsaResult)GsaResult2Tests.AnalysisCaseResult(GsaFile.SteelDesignSimple, 1); + var result = (GsaResult)GsaResultTests.AnalysisCaseResult(GsaFile.SteelDesignSimple, 1); // Act ReadOnlyCollection memberIds = result.MemberIds(MemberList); @@ -30,7 +30,7 @@ IEntity1dResultSubset memberIds = result.MemberIds(MemberList); @@ -53,7 +53,7 @@ IEntity1dResultSubset expected = ExpectedAnalysisCaseValues(component); int positionsCount = 5; @@ -187,7 +187,7 @@ IEntity1dResultSubset expectedP1 = ExpectedCombinationCaseC1Values(component); int positionsCount = 5; diff --git a/GsaGHTests/1_BaseParameters/5_Results/Collections/NodeDisplacementsTests.cs b/GsaGHTests/1_BaseParameters/5_Results/Collections/NodeDisplacementsTests.cs index 489876a64..21e17df99 100644 --- a/GsaGHTests/1_BaseParameters/5_Results/Collections/NodeDisplacementsTests.cs +++ b/GsaGHTests/1_BaseParameters/5_Results/Collections/NodeDisplacementsTests.cs @@ -15,7 +15,7 @@ public class NodeDisplacementsTests { [Fact] public void NodeDisplacementsNodeIdsFromAnalysisCaseTest() { // Assemble - var result = (GsaResult)GsaResult2Tests.AnalysisCaseResult(GsaFile.SteelDesignComplex, 1); + var result = (GsaResult)GsaResultTests.AnalysisCaseResult(GsaFile.SteelDesignComplex, 1); // Act ReadOnlyCollection nodeIds = result.NodeIds(NodeList); @@ -30,7 +30,7 @@ INodeResultSubset> resultSet [Fact] public void NodeDisplacementsNodeIdsFromcombinationCaseTest() { // Assemble - var result = (GsaResult)GsaResult2Tests.CombinationCaseResult(GsaFile.SteelDesignComplex, 4); + var result = (GsaResult)GsaResultTests.CombinationCaseResult(GsaFile.SteelDesignComplex, 4); // Act ReadOnlyCollection nodeIds = result.NodeIds(NodeList); @@ -53,7 +53,7 @@ INodeResultSubset> resultSet [InlineData(ResultVector6HelperEnum.Xxyyzz)] public void NodeDisplacementsMaxFromAnalysisCaseTest(ResultVector6HelperEnum component) { // Assemble - var result = (GsaResult)GsaResult2Tests.AnalysisCaseResult(GsaFile.SteelDesignComplex, 1); + var result = (GsaResult)GsaResultTests.AnalysisCaseResult(GsaFile.SteelDesignComplex, 1); double expected = ExpectedAnalysisCaseValues(component).Max(); // Act @@ -77,7 +77,7 @@ INodeResultSubset> resultSet [InlineData(ResultVector6HelperEnum.Xxyyzz)] public void NodeDisplacementsMaxFromCombinationCaseTest(ResultVector6HelperEnum component) { // Assemble - var result = (GsaResult)GsaResult2Tests.CombinationCaseResult(GsaFile.SteelDesignComplex, 4); + var result = (GsaResult)GsaResultTests.CombinationCaseResult(GsaFile.SteelDesignComplex, 4); double expected = Math.Max(ExpectedCombinationCaseC4p1Values(component).Max(), ExpectedCombinationCaseC4p2Values(component).Max()); @@ -102,7 +102,7 @@ INodeResultSubset> resultSet [InlineData(ResultVector6HelperEnum.Xxyyzz)] public void NodeDisplacementsMinFromAnalysisCaseTest(ResultVector6HelperEnum component) { // Assemble - var result = (GsaResult)GsaResult2Tests.AnalysisCaseResult(GsaFile.SteelDesignComplex, 1); + var result = (GsaResult)GsaResultTests.AnalysisCaseResult(GsaFile.SteelDesignComplex, 1); double expected = ExpectedAnalysisCaseValues(component).Min(); // Act @@ -126,7 +126,7 @@ INodeResultSubset> resultSet [InlineData(ResultVector6HelperEnum.Xxyyzz)] public void NodeDisplacementsMinFromcombinationCaseTest(ResultVector6HelperEnum component) { // Assemble - var result = (GsaResult)GsaResult2Tests.CombinationCaseResult(GsaFile.SteelDesignComplex, 4); + var result = (GsaResult)GsaResultTests.CombinationCaseResult(GsaFile.SteelDesignComplex, 4); double expected = Math.Min(ExpectedCombinationCaseC4p1Values(component).Min(), ExpectedCombinationCaseC4p2Values(component).Min()); @@ -151,7 +151,7 @@ INodeResultSubset> resultSet [InlineData(ResultVector6HelperEnum.Xxyyzz)] public void NodeDisplacementsValuesFromAnalysisCaseTest(ResultVector6HelperEnum component) { // Assemble - var result = (GsaResult)GsaResult2Tests.AnalysisCaseResult(GsaFile.SteelDesignComplex, 1); + var result = (GsaResult)GsaResultTests.AnalysisCaseResult(GsaFile.SteelDesignComplex, 1); List expected = ExpectedAnalysisCaseValues(component); // Act @@ -183,7 +183,7 @@ INodeResultSubset> resultSet [InlineData(ResultVector6HelperEnum.Xxyyzz)] public void NodeDisplacementsValuesFromCombinationCaseTest(ResultVector6HelperEnum component) { // Assemble - var result = (GsaResult)GsaResult2Tests.CombinationCaseResult(GsaFile.SteelDesignComplex, 4); + var result = (GsaResult)GsaResultTests.CombinationCaseResult(GsaFile.SteelDesignComplex, 4); List expectedP1 = ExpectedCombinationCaseC4p1Values(component); List expectedP2 = ExpectedCombinationCaseC4p2Values(component); diff --git a/GsaGHTests/1_BaseParameters/5_Results/Collections/NodeFootfallTests.cs b/GsaGHTests/1_BaseParameters/5_Results/Collections/NodeFootfallTests.cs index d4cc056d4..33dd76819 100644 --- a/GsaGHTests/1_BaseParameters/5_Results/Collections/NodeFootfallTests.cs +++ b/GsaGHTests/1_BaseParameters/5_Results/Collections/NodeFootfallTests.cs @@ -17,7 +17,7 @@ public class NodeFootfallTests { [Fact] public void NodeFootfallNodeIdsFromAnalysisCaseTest() { // Assemble - var result = (GsaResult)GsaResult2Tests.AnalysisCaseResult(GsaFile.SteelFootfall, 16); + var result = (GsaResult)GsaResultTests.AnalysisCaseResult(GsaFile.SteelFootfall, 16); // Act ReadOnlyCollection nodeIds = result.NodeIds(NodeList); @@ -28,7 +28,7 @@ INodeResultSubset> resultSet var expectedIds = result.Model.Model.Nodes(NodeList).Keys.OrderBy(x => x).ToList(); Assert.Equal(expectedIds, resultSet.Ids); - result = (GsaResult)GsaResult2Tests.AnalysisCaseResult(GsaFile.SteelFootfall, 17); + result = (GsaResult)GsaResultTests.AnalysisCaseResult(GsaFile.SteelFootfall, 17); resultSet = result.NodeTransientFootfalls.ResultSubset(nodeIds); Assert.Equal(expectedIds, resultSet.Ids); } @@ -36,7 +36,7 @@ INodeResultSubset> resultSet [Fact] public void NodeFootfallResonantResponseFactorTest() { // Assemble - var result = (GsaResult)GsaResult2Tests.AnalysisCaseResult(GsaFile.SteelFootfall, 16); + var result = (GsaResult)GsaResultTests.AnalysisCaseResult(GsaFile.SteelFootfall, 16); List expected = NodeFootfallResonantA16.MaximumResponseFactor(); // Act @@ -61,7 +61,7 @@ INodeResultSubset> resultSet [Fact] public void NodeFootfallTransientResponseFactorTest() { // Assemble - var result = (GsaResult)GsaResult2Tests.AnalysisCaseResult(GsaFile.SteelFootfall, 17); + var result = (GsaResult)GsaResultTests.AnalysisCaseResult(GsaFile.SteelFootfall, 17); List expected = NodeFootfallTransientA17.MaximumResponseFactor(); // Act @@ -86,7 +86,7 @@ INodeResultSubset> resultSet [Fact] public void NodeFootfallResonantVelocitiesTest() { // Assemble - var result = (GsaResult)GsaResult2Tests.AnalysisCaseResult(GsaFile.SteelFootfall, 16); + var result = (GsaResult)GsaResultTests.AnalysisCaseResult(GsaFile.SteelFootfall, 16); // Act ReadOnlyCollection nodeIds = result.NodeIds(NodeList); @@ -119,7 +119,7 @@ INodeResultSubset> resultSet [Fact] public void NodeFootfallTransientVelocitiesTest() { // Assemble - var result = (GsaResult)GsaResult2Tests.AnalysisCaseResult(GsaFile.SteelFootfall, 17); + var result = (GsaResult)GsaResultTests.AnalysisCaseResult(GsaFile.SteelFootfall, 17); // Act ReadOnlyCollection nodeIds = result.NodeIds(NodeList); @@ -152,7 +152,7 @@ INodeResultSubset> resultSet [Fact] public void NodeFootfallResonantAccelerationsTest() { // Assemble - var result = (GsaResult)GsaResult2Tests.AnalysisCaseResult(GsaFile.SteelFootfall, 16); + var result = (GsaResult)GsaResultTests.AnalysisCaseResult(GsaFile.SteelFootfall, 16); // Act ReadOnlyCollection nodeIds = result.NodeIds(NodeList); @@ -185,7 +185,7 @@ INodeResultSubset> resultSet [Fact] public void NodeFootfallTransientAccelerationsTest() { // Assemble - var result = (GsaResult)GsaResult2Tests.AnalysisCaseResult(GsaFile.SteelFootfall, 17); + var result = (GsaResult)GsaResultTests.AnalysisCaseResult(GsaFile.SteelFootfall, 17); // Act ReadOnlyCollection nodeIds = result.NodeIds(NodeList); @@ -218,7 +218,7 @@ INodeResultSubset> resultSet [Fact] public void NodeFootfallResonantFrequencyTest() { // Assemble - var result = (GsaResult)GsaResult2Tests.AnalysisCaseResult(GsaFile.SteelFootfall, 16); + var result = (GsaResult)GsaResultTests.AnalysisCaseResult(GsaFile.SteelFootfall, 16); // Act ReadOnlyCollection nodeIds = result.NodeIds(NodeList); @@ -245,7 +245,7 @@ INodeResultSubset> resultSet [Fact] public void NodeFootfallTransientFrequencyTest() { // Assemble - var result = (GsaResult)GsaResult2Tests.AnalysisCaseResult(GsaFile.SteelFootfall, 17); + var result = (GsaResult)GsaResultTests.AnalysisCaseResult(GsaFile.SteelFootfall, 17); // Act ReadOnlyCollection nodeIds = result.NodeIds(NodeList); diff --git a/GsaGHTests/1_BaseParameters/5_Results/Collections/NodeReactionForcesTests.cs b/GsaGHTests/1_BaseParameters/5_Results/Collections/NodeReactionForcesTests.cs index 88d4c3727..41403bf9a 100644 --- a/GsaGHTests/1_BaseParameters/5_Results/Collections/NodeReactionForcesTests.cs +++ b/GsaGHTests/1_BaseParameters/5_Results/Collections/NodeReactionForcesTests.cs @@ -14,7 +14,7 @@ public class GsaNodeReactionForcesTests { [Fact] public void NodeReactionForceNodeIdsFromAnalysisCaseTest() { // Assemble - var result = (GsaResult)GsaResult2Tests.AnalysisCaseResult(GsaFile.SteelDesignComplex, 1); + var result = (GsaResult)GsaResultTests.AnalysisCaseResult(GsaFile.SteelDesignComplex, 1); // Act ReadOnlyCollection nodeIds = result.NodeIds(NodeList); @@ -29,7 +29,7 @@ INodeResultSubset> resultSet [Fact] public void NodeReactionForceNodeIdsFromcombinationCaseTest() { // Assemble - var result = (GsaResult)GsaResult2Tests.CombinationCaseResult(GsaFile.SteelDesignComplex, 4); + var result = (GsaResult)GsaResultTests.CombinationCaseResult(GsaFile.SteelDesignComplex, 4); // Act ReadOnlyCollection nodeIds = result.NodeIds(NodeList); @@ -52,7 +52,7 @@ INodeResultSubset> resultSet [InlineData(ResultVector6HelperEnum.Xxyyzz)] public void NodeReactionForceMaxFromAnalysisCaseTest(ResultVector6HelperEnum component) { // Assemble - var result = (GsaResult)GsaResult2Tests.AnalysisCaseResult(GsaFile.SteelDesignComplex, 1); + var result = (GsaResult)GsaResultTests.AnalysisCaseResult(GsaFile.SteelDesignComplex, 1); double expected = ExpectedAnalysisCaseValues(component).Max(); // Act @@ -76,7 +76,7 @@ INodeResultSubset> resultSet [InlineData(ResultVector6HelperEnum.Xxyyzz)] public void NodeReactionForceMaxFromCombinationCaseTest(ResultVector6HelperEnum component) { // Assemble - var result = (GsaResult)GsaResult2Tests.CombinationCaseResult(GsaFile.SteelDesignComplex, 4); + var result = (GsaResult)GsaResultTests.CombinationCaseResult(GsaFile.SteelDesignComplex, 4); double expected = Math.Max(ExpectedCombinationCaseC4p1Values(component).Max(), ExpectedCombinationCaseC4p2Values(component).Max()); // Act @@ -100,7 +100,7 @@ INodeResultSubset> resultSet [InlineData(ResultVector6HelperEnum.Xxyyzz)] public void NodeReactionForceMinFromAnalysisCaseTest(ResultVector6HelperEnum component) { // Assemble - var result = (GsaResult)GsaResult2Tests.AnalysisCaseResult(GsaFile.SteelDesignComplex, 1); + var result = (GsaResult)GsaResultTests.AnalysisCaseResult(GsaFile.SteelDesignComplex, 1); double expected = ExpectedAnalysisCaseValues(component).Min(); // Act ReadOnlyCollection nodeIds = result.NodeIds(NodeList); @@ -123,7 +123,7 @@ INodeResultSubset> resultSet [InlineData(ResultVector6HelperEnum.Xxyyzz)] public void NodeReactionForceMinFromcombinationCaseTest(ResultVector6HelperEnum component) { // Assemble - var result = (GsaResult)GsaResult2Tests.CombinationCaseResult(GsaFile.SteelDesignComplex, 4); + var result = (GsaResult)GsaResultTests.CombinationCaseResult(GsaFile.SteelDesignComplex, 4); double expected = Math.Min(ExpectedCombinationCaseC4p1Values(component).Min(), ExpectedCombinationCaseC4p2Values(component).Min()); @@ -148,7 +148,7 @@ INodeResultSubset> resultSet [InlineData(ResultVector6HelperEnum.Xxyyzz)] public void NodeReactionForceValuesFromAnalysisCaseTest(ResultVector6HelperEnum component) { // Assemble - var result = (GsaResult)GsaResult2Tests.AnalysisCaseResult(GsaFile.SteelDesignComplex, 1); + var result = (GsaResult)GsaResultTests.AnalysisCaseResult(GsaFile.SteelDesignComplex, 1); List expected = ExpectedAnalysisCaseValues(component); // Act @@ -180,7 +180,7 @@ INodeResultSubset> resultSet [InlineData(ResultVector6HelperEnum.Xxyyzz)] public void NodeReactionForceValuesFromCombinationCaseTest(ResultVector6HelperEnum component) { // Assemble - var result = (GsaResult)GsaResult2Tests.CombinationCaseResult(GsaFile.SteelDesignComplex, 4); + var result = (GsaResult)GsaResultTests.CombinationCaseResult(GsaFile.SteelDesignComplex, 4); List expectedP1 = ExpectedCombinationCaseC4p1Values(component); List expectedP2 = ExpectedCombinationCaseC4p2Values(component); diff --git a/GsaGHTests/1_BaseParameters/5_Results/Collections/NodeResultsCacheTests.cs b/GsaGHTests/1_BaseParameters/5_Results/Collections/NodeResultsCacheTests.cs index 9c0393565..6da04631a 100644 --- a/GsaGHTests/1_BaseParameters/5_Results/Collections/NodeResultsCacheTests.cs +++ b/GsaGHTests/1_BaseParameters/5_Results/Collections/NodeResultsCacheTests.cs @@ -12,7 +12,7 @@ public class NodeResultsCacheTests { [Fact] public void GetMissingKeysEmptyTest() { // Assemble - var result = (GsaResult)GsaResult2Tests.AnalysisCaseResult(GsaFile.SteelDesignComplex, 1); + var result = (GsaResult)GsaResultTests.AnalysisCaseResult(GsaFile.SteelDesignComplex, 1); // Act ReadOnlyCollection nodeIds = result.NodeIds("442"); @@ -25,7 +25,7 @@ ConcurrentBag missingIds [Fact] public void GetMissingKeysUpdateTest() { // Assemble - var result = (GsaResult)GsaResult2Tests.AnalysisCaseResult(GsaFile.SteelDesignComplex, 1); + var result = (GsaResult)GsaResultTests.AnalysisCaseResult(GsaFile.SteelDesignComplex, 1); // Act ReadOnlyCollection nodeIds = result.NodeIds("442"); diff --git a/GsaGHTests/1_BaseParameters/5_Results/Collections/NodeSpringForcesTests.cs b/GsaGHTests/1_BaseParameters/5_Results/Collections/NodeSpringForcesTests.cs index e683211c5..a01af5b87 100644 --- a/GsaGHTests/1_BaseParameters/5_Results/Collections/NodeSpringForcesTests.cs +++ b/GsaGHTests/1_BaseParameters/5_Results/Collections/NodeSpringForcesTests.cs @@ -15,7 +15,7 @@ public class GsaNodeSpringForcesTests { [Fact] public void NodeReactionForceNodeIdsFromAnalysisCaseTest() { // Assemble - var result = (GsaResult)GsaResult2Tests.AnalysisCaseResult(GsaFile.SpringForces, 1); + var result = (GsaResult)GsaResultTests.AnalysisCaseResult(GsaFile.SpringForces, 1); // Act ReadOnlyCollection nodeIds = result.NodeIds(NodeList); @@ -30,7 +30,7 @@ INodeResultSubset> resultSet [Fact] public void NodeReactionForceNodeIdsFromcombinationCaseTest() { // Assemble - var result = (GsaResult)GsaResult2Tests.CombinationCaseResult(GsaFile.SpringForces, 2); + var result = (GsaResult)GsaResultTests.CombinationCaseResult(GsaFile.SpringForces, 2); // Act ReadOnlyCollection nodeIds = result.NodeIds(NodeList); @@ -53,7 +53,7 @@ INodeResultSubset> resultSet [InlineData(ResultVector6HelperEnum.Xxyyzz)] public void NodeReactionForceMaxFromAnalysisCaseTest(ResultVector6HelperEnum component) { // Assemble - var result = (GsaResult)GsaResult2Tests.AnalysisCaseResult(GsaFile.SpringForces, 1); + var result = (GsaResult)GsaResultTests.AnalysisCaseResult(GsaFile.SpringForces, 1); double expected = ExpectedAnalysisCaseValues(component).Max(); // Act @@ -77,7 +77,7 @@ INodeResultSubset> resultSet [InlineData(ResultVector6HelperEnum.Xxyyzz)] public void NodeReactionForceMaxFromCombinationCaseTest(ResultVector6HelperEnum component) { // Assemble - var result = (GsaResult)GsaResult2Tests.CombinationCaseResult(GsaFile.SpringForces, 2); + var result = (GsaResult)GsaResultTests.CombinationCaseResult(GsaFile.SpringForces, 2); double expected = Math.Max(ExpectedCombinationCaseC2p1Values(component).Max(), ExpectedCombinationCaseC2p2Values(component).Max()); // Act @@ -101,7 +101,7 @@ INodeResultSubset> resultSet [InlineData(ResultVector6HelperEnum.Xxyyzz)] public void NodeReactionForceMinFromAnalysisCaseTest(ResultVector6HelperEnum component) { // Assemble - var result = (GsaResult)GsaResult2Tests.AnalysisCaseResult(GsaFile.SpringForces, 1); + var result = (GsaResult)GsaResultTests.AnalysisCaseResult(GsaFile.SpringForces, 1); double expected = ExpectedAnalysisCaseValues(component).Min(); // Act ReadOnlyCollection nodeIds = result.NodeIds(NodeList); @@ -124,7 +124,7 @@ INodeResultSubset> resultSet [InlineData(ResultVector6HelperEnum.Xxyyzz)] public void NodeReactionForceMinFromcombinationCaseTest(ResultVector6HelperEnum component) { // Assemble - var result = (GsaResult)GsaResult2Tests.CombinationCaseResult(GsaFile.SpringForces, 2); + var result = (GsaResult)GsaResultTests.CombinationCaseResult(GsaFile.SpringForces, 2); double expected = Math.Min(ExpectedCombinationCaseC2p1Values(component).Min(), ExpectedCombinationCaseC2p2Values(component).Min()); @@ -149,7 +149,7 @@ INodeResultSubset> resultSet [InlineData(ResultVector6HelperEnum.Xxyyzz)] public void NodeReactionForceValuesFromAnalysisCaseTest(ResultVector6HelperEnum component) { // Assemble - var result = (GsaResult)GsaResult2Tests.AnalysisCaseResult(GsaFile.SpringForces, 1); + var result = (GsaResult)GsaResultTests.AnalysisCaseResult(GsaFile.SpringForces, 1); List expected = ExpectedAnalysisCaseValues(component); // Act @@ -181,7 +181,7 @@ INodeResultSubset> resultSet [InlineData(ResultVector6HelperEnum.Xxyyzz)] public void NodeReactionForceValuesFromCombinationCaseTest(ResultVector6HelperEnum component) { // Assemble - var result = (GsaResult)GsaResult2Tests.CombinationCaseResult(GsaFile.SpringForces, 2); + var result = (GsaResult)GsaResultTests.CombinationCaseResult(GsaFile.SpringForces, 2); List expectedP1 = ExpectedCombinationCaseC2p1Values(component); List expectedP2 = ExpectedCombinationCaseC2p2Values(component); diff --git a/GsaGHTests/1_BaseParameters/5_Results/Collections/TotalLoadsAndReactionsTests.cs b/GsaGHTests/1_BaseParameters/5_Results/Collections/TotalLoadsAndReactionsTests.cs index 554417878..546e23d86 100644 --- a/GsaGHTests/1_BaseParameters/5_Results/Collections/TotalLoadsAndReactionsTests.cs +++ b/GsaGHTests/1_BaseParameters/5_Results/Collections/TotalLoadsAndReactionsTests.cs @@ -13,7 +13,7 @@ public class TotalLoadsAndReactionsTests { [Fact] public void NullEffectiveInnertiaTest() { - var result = (GsaResult)GsaResult2Tests.AnalysisCaseResult(GsaFile.SteelDesignComplex, 3); + var result = (GsaResult)GsaResultTests.AnalysisCaseResult(GsaFile.SteelDesignComplex, 3); List expected = TotalLoadsAndReactionsA3.EffectiveInertia; //null here! IEffectiveInertia actual = result.GlobalResults.EffectiveInertia; @@ -24,7 +24,7 @@ public void NullEffectiveInnertiaTest() { [Fact] public void EffectiveMassTest() { - var result = (GsaResult)GsaResult2Tests.AnalysisCaseResult(GsaFile.SteelDesignComplex, 3); + var result = (GsaResult)GsaResultTests.AnalysisCaseResult(GsaFile.SteelDesignComplex, 3); List expected = TotalLoadsAndReactionsA3.EffectiveMass; IEffectiveMass actual = result.GlobalResults.EffectiveMass; @@ -36,7 +36,7 @@ public void EffectiveMassTest() { [Fact] public void EigenValueTest() { - var result = (GsaResult)GsaResult2Tests.AnalysisCaseResult(GsaFile.SteelDesignComplex, 3); + var result = (GsaResult)GsaResultTests.AnalysisCaseResult(GsaFile.SteelDesignComplex, 3); double? expected = TotalLoadsAndReactionsA3.EigenValue; double? actual = result.GlobalResults.Eigenvalue; @@ -46,7 +46,7 @@ public void EigenValueTest() { [Fact] public void FrequencyValueTest() { - var result = (GsaResult)GsaResult2Tests.AnalysisCaseResult(GsaFile.SteelDesignComplex, 3); + var result = (GsaResult)GsaResultTests.AnalysisCaseResult(GsaFile.SteelDesignComplex, 3); double expected = TotalLoadsAndReactionsA3.Frequency; Frequency actual = result.GlobalResults.Frequency; @@ -56,7 +56,7 @@ public void FrequencyValueTest() { [Fact] public void LoadFactorValueTest() { - var result = (GsaResult)GsaResult2Tests.AnalysisCaseResult(GsaFile.SteelDesignComplex, 3); + var result = (GsaResult)GsaResultTests.AnalysisCaseResult(GsaFile.SteelDesignComplex, 3); double? expected = TotalLoadsAndReactionsA3.LoadFactor; Ratio actual = result.GlobalResults.LoadFactor; @@ -66,7 +66,7 @@ public void LoadFactorValueTest() { [Fact] public void ModalGeometricStiffnessValueTest() { - var result = (GsaResult)GsaResult2Tests.AnalysisCaseResult(GsaFile.SteelDesignComplex, 3); + var result = (GsaResult)GsaResultTests.AnalysisCaseResult(GsaFile.SteelDesignComplex, 3); double? expected = TotalLoadsAndReactionsA3.ModalGeometricStiffness; ForcePerLength actual = result.GlobalResults.ModalGeometricStiffness; @@ -76,7 +76,7 @@ public void ModalGeometricStiffnessValueTest() { [Fact] public void ModalStiffnessValueTest() { - var result = (GsaResult)GsaResult2Tests.AnalysisCaseResult(GsaFile.SteelDesignComplex, 3); + var result = (GsaResult)GsaResultTests.AnalysisCaseResult(GsaFile.SteelDesignComplex, 3); double expected = TotalLoadsAndReactionsA3.ModalStiffness; ForcePerLength actual @@ -87,7 +87,7 @@ ForcePerLength actual [Fact] public void ModalMassValueTest() { - var result = (GsaResult)GsaResult2Tests.AnalysisCaseResult(GsaFile.SteelDesignComplex, 3); + var result = (GsaResult)GsaResultTests.AnalysisCaseResult(GsaFile.SteelDesignComplex, 3); double expected = TotalLoadsAndReactionsA3.ModalMass; Mass actual = result.GlobalResults.ModalMass; @@ -97,7 +97,7 @@ public void ModalMassValueTest() { [Fact] public void ModeValueTest() { - var result = (GsaResult)GsaResult2Tests.AnalysisCaseResult(GsaFile.SteelDesignComplex, 3); + var result = (GsaResult)GsaResultTests.AnalysisCaseResult(GsaFile.SteelDesignComplex, 3); int expected = TotalLoadsAndReactionsA3.Mode; int? actual = result.GlobalResults.Mode; @@ -107,7 +107,7 @@ public void ModeValueTest() { [Fact] public void TotalLoadTest() { - var result = (GsaResult)GsaResult2Tests.AnalysisCaseResult(GsaFile.SteelDesignComplex, 3); + var result = (GsaResult)GsaResultTests.AnalysisCaseResult(GsaFile.SteelDesignComplex, 3); List expected = TotalLoadsAndReactionsA3.TotalLoad; IInternalForce actual = result.GlobalResults.TotalLoad; @@ -124,7 +124,7 @@ public void TotalLoadTest() { [Fact] public void TotalReactionTest() { - var result = (GsaResult)GsaResult2Tests.AnalysisCaseResult(GsaFile.SteelDesignComplex, 3); + var result = (GsaResult)GsaResultTests.AnalysisCaseResult(GsaFile.SteelDesignComplex, 3); List expected = TotalLoadsAndReactionsA3.TotalReaction; IInternalForce actual = result.GlobalResults.TotalReaction;