Apply suggestions from code review

Co-authored-by: Kevin B <[email protected]>

Author: PandaMagnus

IntelliTect.TestTools.TestFramework.Tests/TestCaseTests/MultipleDependencyTests.cs

@@ -73,8 +73,7 @@ public async Task ReturnMultipleObjectsExecutesSubsequentTestBlocks()
 
             // Assert
             Assert.False(tc.Passed);
-            Assert.NotNull(result.InnerException);
-            Assert.True(result.InnerException.GetType() == typeof(DivideByZeroException));
+            Assert.IsType<DivideByZeroException>(result.InnerException);
         }
     }
 }

IntelliTect.TestTools.TestFramework.Tests/TestDataTests.cs

@@ -12,8 +12,7 @@ public void BlockDataT1T2ThrowsExceptionOnDuplicateTypes()
         {
             var _ = new BlockData<int, int>(1, 2);
         });
-        Assert.NotNull(exception.InnerException);
-        Assert.Equal(typeof(InvalidOperationException), exception.InnerException.GetType());
+        Assert.IsType<InvalidOperationException>(exception.InnerException);
         Assert.Equal("Duplicate type found: Int32 appears multiple times. BlockData must use different types to avoid unexpected behavior by the TestCase DI Container.",
             exception.InnerException.Message);
     }
@@ -25,10 +24,9 @@ public void BlockDataT1T2T3ThrowsExceptionOnDuplicateTypes()
         {
             var _ = new BlockData<int, bool, int>(1, true, 2);
         });
-        Assert.NotNull(exception.InnerException);
-        Assert.Equal(typeof(InvalidOperationException), exception.InnerException.GetType());
+        var invalidOp = Assert.IsType<InvalidOperationException>(exception.InnerException);
         Assert.Equal("Duplicate type found: Int32 appears multiple times. BlockData must use different types to avoid unexpected behavior by the TestCase DI Container.",
-            exception.InnerException.Message);
+            invalidOp.Message);
     }
 
     [Fact]

IntelliTect.TestTools.TestFramework/BlockData.cs

@@ -15,7 +15,11 @@ static BlockData()
         ValidateData.ValidateUniqueTypes(typeof(T1), typeof(T2));
     }
 
-    public List<KeyValuePair<Type, object?>> Data { get; } = 
+    public T1 Data1 => data1;
+    public T2 Data2 => data2;
+    
+
+    IBlockData.List<KeyValuePair<Type, object?>> Data { get; } = 
     [
         new KeyValuePair<Type, object?>(typeof(T1), data1),
         new KeyValuePair<Type, object?>(typeof(T2), data2)

IntelliTect.TestTools.TestFramework/TestCase.cs

@@ -406,8 +406,9 @@ private async Task<bool> TryRunBlock(Block block, object blockInstance, List<obj
                     else
                     {
                         Log?.TestBlockOutput(output);
-                        BlockOutput.Remove(output.GetType());
-                        BlockOutput.Add(output.GetType(), output);
+                        Type outputType = output.GetType();
+                        BlockOutput.Remove(outputType);
+                        BlockOutput.Add(outputType, output);
                     }
                 }
                 result = true;