diff --git a/Recyclable.CollectionsTests/RecyclableListTestData.cs b/Recyclable.CollectionsTests/RecyclableListTestData.cs index 31e32b7..0bef65c 100644 --- a/Recyclable.CollectionsTests/RecyclableListTestData.cs +++ b/Recyclable.CollectionsTests/RecyclableListTestData.cs @@ -35,13 +35,6 @@ namespace Recyclable.CollectionsTests } } - private static Dictionary>? _testCases = new(); - - public RecyclableListTestData() - { - _testCases ??= new(); - } - private static IEnumerable DoCreateTestData(long itemsCount) { for (long index = 1; index <= itemsCount; index++) @@ -50,30 +43,7 @@ namespace Recyclable.CollectionsTests } } - public static IEnumerable CreateTestData(long itemsCount) - { - if (_testCases!.TryGetValue(itemsCount, out var testCases)) - { - return testCases; - } - - testCases = DoCreateTestData(itemsCount).ToArray(); - _testCases.Add(itemsCount, testCases); - return testCases; - } - - public void Dispose() - { - DisposeTestData(_testCases?.Values); - DisposeTestData(_sourceDataVariants); - DisposeTestData(_emptySourceDataVariants); - _testCases = null; - _sourceDataVariants = null; - _targetDataVariants = null; - _sourceTargetDataVariants = null; - _emptySourceDataVariants = null; - GC.SuppressFinalize(this); - } + public static IEnumerable CreateTestData(long itemsCount) => DoCreateTestData(itemsCount).ToArray(); public static readonly IEnumerable ItemsCountVariants = new long[] { @@ -98,8 +68,7 @@ namespace Recyclable.CollectionsTests } } - private static IEnumerable? _targetDataVariants; - public static IEnumerable TargetDataVariants => _targetDataVariants ??= GetTargetDataVariants().ToArray(); + public static IEnumerable TargetDataVariants => GetTargetDataVariants().ToArray(); private static IEnumerable CreateSourceDataVariants() { @@ -125,9 +94,8 @@ namespace Recyclable.CollectionsTests } } - private static IEnumerable? _sourceDataVariants; - public static IEnumerable SourceDataVariants => _sourceDataVariants ??= CreateSourceDataVariants().ToArray(); - + public static IEnumerable SourceDataVariants => CreateSourceDataVariants().ToArray(); + private static IEnumerable CreateSourceEmptyDataVariants() => new[] { new object[] { "int[]", Array.Empty() }, @@ -139,8 +107,7 @@ namespace Recyclable.CollectionsTests new object[] { "IEnumerable without non-enumerated count", new EnumerableWithoutCount(Array.Empty()) } }; - private static IEnumerable? _emptySourceDataVariants; - public static IEnumerable EmptySourceDataVariants => _emptySourceDataVariants ??= CreateSourceEmptyDataVariants().ToArray(); + public static IEnumerable EmptySourceDataVariants => CreateSourceEmptyDataVariants().ToArray(); private static IEnumerable CreateSourceTargetDataVariants() { @@ -153,7 +120,6 @@ namespace Recyclable.CollectionsTests } } - private static IEnumerable? _sourceTargetDataVariants; - public static IEnumerable SourceTargetDataVariants => _sourceTargetDataVariants ??= CreateSourceTargetDataVariants().ToArray(); + public static IEnumerable SourceTargetDataVariants => CreateSourceTargetDataVariants().ToArray(); } } \ No newline at end of file