feat: merged 5d2f714

arup-group · Nov 29, 2024 · e3dba5e · e3dba5e
2 parents 82f89b1 + 5d2f714
commit e3dba5e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/...ts/Helpers/Assemble/AssembleModelLists.cs → ...lpers/Assemble/AssembleModelListsTests.cs b/...ts/Helpers/Assemble/AssembleModelLists.cs → ...lpers/Assemble/AssembleModelListsTests.cs
@@ -12,7 +12,7 @@
 
 namespace GsaGHTests.Helpers.Assemble {
   [Collection("GrasshopperFixture collection")]
-  public class AssembleModelLists {
+  public class AssembleModelListsTests {
     private const int DefaultId = 1;
     private const string ExpectedName = "create list test";
     private const string ExpectedDefinition = "1 2 3";
@@ -29,7 +29,7 @@ public void ListShouldReturnDefinitionWhenIdIsSet() {
 
     [Fact]
     public void ListShouldReturnDefinitionWhenIdIsNotSet() {
-      GsaList gsaList = GsaList(DefaultId);
+      GsaList gsaList = GsaList(null);
 
       Assert.Equal(DefaultId, gsaList.Id);
       Assert.Equal(ExpectedName, gsaList.Name);
@@ -102,10 +102,7 @@ private static GsaListGoo CreateListComponent(int? id) {
       var createListComponent = new CreateList();
       createListComponent.CreateAttributes();
 
-      if (id != DefaultId) {
-        ComponentTestHelper.SetInput(createListComponent, id, 0);
-      }
-
+      ComponentTestHelper.SetInput(createListComponent, id, 0);
       ComponentTestHelper.SetInput(createListComponent, ExpectedName, 1);
       ComponentTestHelper.SetInput(createListComponent, ExpectedDefinition, 2);
 

diff --git a/GsaGHTests/TestHelpers/ComponentTestHelper.cs b/GsaGHTests/TestHelpers/ComponentTestHelper.cs
@@ -152,9 +152,7 @@ public static void SetInput(GH_Component component, object obj, string name) {
     private static Param_GenericObject GetGenericParameterFor(object obj) {
       var input = new Param_GenericObject();
       input.CreateAttributes();
-      if (obj == null) {
-        input.PersistentData.Append(new GH_ObjectWrapper(obj));
-      } else if (typeof(IQuantity).IsAssignableFrom(obj.GetType())) {
+      if (typeof(IQuantity).IsAssignableFrom(obj?.GetType())) {
         input.PersistentData.Append(new GH_UnitNumber((IQuantity)obj));
       } else {
         input.PersistentData.Append(new GH_ObjectWrapper(obj));