From 1c5edd8324d85b7d065e61fb38f33dab5587cc34 Mon Sep 17 00:00:00 2001 From: Kristjan Nielsen Date: Wed, 29 Nov 2023 09:56:37 +0100 Subject: [PATCH] fix unit tests --- GsaGH/Components/6_Display/Contour1dResults.cs | 3 ++- .../3_Components/6_Display/Contour1dResultsTests.cs | 12 ++++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/GsaGH/Components/6_Display/Contour1dResults.cs b/GsaGH/Components/6_Display/Contour1dResults.cs index e3ade508b..160a24fbb 100644 --- a/GsaGH/Components/6_Display/Contour1dResults.cs +++ b/GsaGH/Components/6_Display/Contour1dResults.cs @@ -590,7 +590,8 @@ protected override void SolveInternal(IGH_DataAccess da) { if (elems.Count == 0) { this.AddRuntimeError($"Model contains no results for elements in list '{elementlist}'"); return; - }; + } + LengthUnit lengthUnit = result.Model.ModelUnit; var ghDiv = new GH_Integer(); diff --git a/GsaGHTests/3_Components/6_Display/Contour1dResultsTests.cs b/GsaGHTests/3_Components/6_Display/Contour1dResultsTests.cs index 719f20f6a..08ba55f60 100644 --- a/GsaGHTests/3_Components/6_Display/Contour1dResultsTests.cs +++ b/GsaGHTests/3_Components/6_Display/Contour1dResultsTests.cs @@ -20,10 +20,18 @@ public void DefaultDropSelectionsTest() { Assert.Equal("Moment Myy", comp._selectedItems[1]); comp.SetSelected(0, 2); + Assert.Equal("Stress", comp._selectedItems[0]); + Assert.Equal("Combined, C1", comp._selectedItems[1]); + + comp.SetSelected(0, 3); + Assert.Equal("Derived Stress", comp._selectedItems[0]); + Assert.Equal("Von Mises", comp._selectedItems[1]); + + comp.SetSelected(0, 4); Assert.Equal("Strain Energy", comp._selectedItems[0]); Assert.Equal("Average", comp._selectedItems[1]); - comp.SetSelected(0, 3); + comp.SetSelected(0, 5); Assert.Equal("Footfall", comp._selectedItems[0]); Assert.Equal("Resonant", comp._selectedItems[1]); @@ -80,7 +88,7 @@ public void DrawViewportMeshesAndWiresTest() { public void DrawViewportMeshesAndWiresFootfallTest() { var comp = new Contour1dResults(); ComponentTestHelper.SetInput(comp, GsaResultTests.NodeAndElement1dFootfallResultsMother()); - SetSelectedDrawViewportMeshesAndWiresTest(comp, 0, 3); + SetSelectedDrawViewportMeshesAndWiresTest(comp, 0, 5); SetSelectedDrawViewportMeshesAndWiresTest(comp, 1, 0); SetSelectedDrawViewportMeshesAndWiresTest(comp, 1, 1); }