Finish requested changes to BlockData

Author: PandaMagnus

IntelliTect.TestTools.TestFramework.Tests/TestDataTests.cs

@@ -43,23 +43,29 @@ public void BlockDataT1T2T3T4ThrowsExceptionOnDuplicateTypes()
     }
 
     [Fact]
-    public void BlockDataT1T2DoesNotThrowExceptionOnWithUniqueTypes()
+    public void BlockDataT1T2DoesNotThrowExceptionWithUniqueTypes()
     {
         BlockData<int, bool> blockData = new(1, true);
-        Assert.Equal(2, blockData.Data.Count);
+        Assert.Equal(1, blockData.Data1);
+        Assert.True(blockData.Data2);
     }
 
     [Fact]
-    public void BlockDataT1T2T3DoesNotThrowExceptionOnWithUniqueTypes()
+    public void BlockDataT1T2T3DoesNotThrowExceptionWithUniqueTypes()
     {
         BlockData<ArgumentException, Exception, bool> blockData = new(new ArgumentException(), new Exception(), true);
-        Assert.Equal(3, blockData.Data.Count);
+        Assert.IsType<ArgumentException>(blockData.Data1);
+        Assert.IsType<Exception>(blockData.Data2);
+        Assert.True(blockData.Data3);
     }
 
     [Fact]
-    public void BlockDataT1T2T3T4DoesNotThrowExceptionOnWithUniqueTypes()
+    public void BlockDataT1T2T3T4DoesNotThrowExceptionWithUniqueTypes()
     {
         BlockData<int, bool, string, double> blockData = new(1, true, "", 0.5);
-        Assert.Equal(4, blockData.Data.Count);
+        Assert.Equal(1, blockData.Data1);
+        Assert.True(blockData.Data2);
+        Assert.Equal("", blockData.Data3);
+        Assert.Equal(0.5, blockData.Data4);
     }
 }

IntelliTect.TestTools.TestFramework/BlockData.cs

@@ -19,7 +19,7 @@ static BlockData()
     public T2 Data2 => data2;
 
 
-    IBlockData.List<KeyValuePair<Type, object?>> Data { get; } = 
+    List<KeyValuePair<Type, object?>> IBlockData.Data { get; } = 
     [
         new KeyValuePair<Type, object?>(typeof(T1), data1),
         new KeyValuePair<Type, object?>(typeof(T2), data2)
@@ -33,7 +33,11 @@ static BlockData()
         ValidateData.ValidateUniqueTypes(typeof(T1), typeof(T2), typeof(T3));
     }
 
-    public List<KeyValuePair<Type, object?>> Data { get; } =
+    public T1 Data1 => data1;
+    public T2 Data2 => data2;
+    public T3 Data3 => data3;
+
+    List<KeyValuePair<Type, object?>> IBlockData.Data { get; } =
     [
         new KeyValuePair<Type, object?>(typeof(T1), data1),
         new KeyValuePair<Type, object?>(typeof(T2), data2),
@@ -48,7 +52,12 @@ static BlockData()
         ValidateData.ValidateUniqueTypes(typeof(T1), typeof(T2), typeof(T3), typeof(T4));
     }
 
-    public List<KeyValuePair<Type, object?>> Data { get; } =
+    public T1 Data1 => data1;
+    public T2 Data2 => data2;
+    public T3 Data3 => data3;
+    public T4 Data4 => data4;
+
+    List<KeyValuePair<Type, object?>> IBlockData.Data { get; } =
     [
         new KeyValuePair<Type, object?>(typeof(T1), data1),
         new KeyValuePair<Type, object?>(typeof(T2), data2),