Skip to content

Refactor enumerables unit testing #353

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="BenchmarkDotNet" Version="0.12.1.1521" />
<PackageReference Include="BenchmarkDotNet" Version="0.12.1.1527" />
<PackageReference Include="LinqFaster.SIMD" Version="1.0.3" />
<PackageReference Include="StructLinq" Version="0.26.0" />
<PackageReference Include="System.Interactive" Version="5.0.0" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<PackageReference Include="Meziantou.Analyzer" Version="1.0.645">
<PackageReference Include="Meziantou.Analyzer" Version="1.0.656">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="3.8.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" />
<PackageReference Include="NetFabric.Assertive" Version="3.0.0" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="3.9.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
<PackageReference Include="NetFabric.Assertive" Version="4.0.0-beta01" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="3.8.0" PrivateAssets="all" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="3.9.0" PrivateAssets="all" />
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.2" PrivateAssets="all" />
<PackageReference Include="Nullable" Version="1.3.0">
<PrivateAssets>all</PrivateAssets>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,31 +1,28 @@
using System.Linq;
using NetFabric.Assertive;
using Xunit;
using System.Linq;
using System.Collections.Generic;

namespace NetFabric.Hyperlinq.UnitTests.Conversion.AsValueEnumerable
namespace NetFabric.Hyperlinq.UnitTests.Conversion.AsValueEnumerable.Enumerable
{
public partial class EnumerableTests
public partial class Tests
{
[Theory]
[MemberData(nameof(TestData.Empty), MemberType = typeof(TestData))]
[MemberData(nameof(TestData.Single), MemberType = typeof(TestData))]
[MemberData(nameof(TestData.Multiple), MemberType = typeof(TestData))]
public void AsValueEnumerable1_With_ValidData_Must_Succeed(int[] source)
[Fact]
public void AsValueEnumerable1_Enumerator_With_ValidData_Must_Succeed()
{
// Arrange
var wrapped = Wrap
.AsEnumerable(source);
.AsEnumerable(System.Array.Empty<int>());

// Act
var result = wrapped
.AsValueEnumerable();
.AsValueEnumerable<int>();

// Assert
_ = result.Must()
.BeEnumerableOf<int>()
.BeEqualTo(source);
.BeOfType<EnumerableExtensions.ValueEnumerable<int>>();
}

[Theory]
[MemberData(nameof(TestData.Empty), MemberType = typeof(TestData))]
[MemberData(nameof(TestData.Single), MemberType = typeof(TestData))]
Expand All @@ -37,15 +34,30 @@ public void AsValueEnumerable1_Sum_With_ValidData_Must_Succeed(int[] source)
.AsEnumerable(source);
var expected = source
.Sum();

// Act
var result = wrapped
.AsValueEnumerable()
.AsValueEnumerable<int>()
.Sum();

// Assert
_ = result.Must()
.BeEqualTo(expected);
}
}
}

public class ValueEnumerableTests1
: ValueEnumerableTests<
EnumerableExtensions.ValueEnumerable<int>,
ValueEnumerableExtensions.SkipEnumerable<EnumerableExtensions.ValueEnumerable<int>, ValueEnumerator<int>, int>,
ValueEnumerableExtensions.TakeEnumerable<EnumerableExtensions.ValueEnumerable<int>, ValueEnumerator<int>, int>,
ValueEnumerableExtensions.WhereEnumerable<EnumerableExtensions.ValueEnumerable<int>, ValueEnumerator<int>, int, FunctionWrapper<int, bool>>,
ValueEnumerableExtensions.WhereAtEnumerable<EnumerableExtensions.ValueEnumerable<int>, ValueEnumerator<int>, int, FunctionWrapper<int, int, bool>>
>
{
public ValueEnumerableTests1()
: base(array => Wrap.AsEnumerable(array).AsValueEnumerable<int>())
{}
}

}
Original file line number Diff line number Diff line change
@@ -1,53 +1,27 @@
using System.Linq;
using NetFabric.Assertive;
using System.Linq;
using Xunit;

namespace NetFabric.Hyperlinq.UnitTests.Conversion.AsValueEnumerable
namespace NetFabric.Hyperlinq.UnitTests.Conversion.AsValueEnumerable.ReadOnlyCollection
{
public partial class ReadOnlyCollectionTests
public partial class Tests
{
[Theory]
[MemberData(nameof(TestData.Empty), MemberType = typeof(TestData))]
[MemberData(nameof(TestData.Single), MemberType = typeof(TestData))]
[MemberData(nameof(TestData.Multiple), MemberType = typeof(TestData))]
public void AsValueEnumerable1_With_ValidData_Must_Succeed(int[] source)
{
// Arrange
var wrapped = Wrap
.AsReadOnlyCollection(source);

// Act
var result = wrapped
.AsValueEnumerable();

// Assert
_ = result.Must()
.BeEnumerableOf<int>()
.BeEqualTo(source);
}

[Theory]
[MemberData(nameof(TestData.Empty), MemberType = typeof(TestData))]
[MemberData(nameof(TestData.Single), MemberType = typeof(TestData))]
[MemberData(nameof(TestData.Multiple), MemberType = typeof(TestData))]
public void AsValueEnumerable1_Count_With_ValidData_Must_Succeed(int[] source)
[Fact]
public void AsValueEnumerable1_Enumerator_With_ValidData_Must_Succeed()
{
// Arrange
var wrapped = Wrap
.AsReadOnlyCollection(source);
var expected = source
.Count();
.AsReadOnlyCollection(System.Array.Empty<int>());

// Act
var result = wrapped
.AsValueEnumerable()
.Count();
.AsValueEnumerable<int>();

// Assert
_ = result.Must()
.BeEqualTo(expected);
.BeOfType<ReadOnlyCollectionExtensions.ValueEnumerable<int>>();
}

[Theory]
[MemberData(nameof(TestData.Empty), MemberType = typeof(TestData))]
[MemberData(nameof(TestData.Single), MemberType = typeof(TestData))]
Expand All @@ -59,15 +33,30 @@ public void AsValueEnumerable1_Sum_With_ValidData_Must_Succeed(int[] source)
.AsReadOnlyCollection(source);
var expected = source
.Sum();

// Act
var result = wrapped
.AsValueEnumerable()
.AsValueEnumerable<int>()
.Sum();

// Assert
_ = result.Must()
.BeEqualTo(expected);
}
}

public class ValueEnumerableTests1
: ValueEnumerableTests<
ReadOnlyCollectionExtensions.ValueEnumerable<int>,
ValueReadOnlyCollectionExtensions.SkipTakeEnumerable<ReadOnlyCollectionExtensions.ValueEnumerable<int>, ValueEnumerator<int>, int>,
ValueReadOnlyCollectionExtensions.SkipTakeEnumerable<ReadOnlyCollectionExtensions.ValueEnumerable<int>, ValueEnumerator<int>, int>,
ValueReadOnlyCollectionExtensions.WhereEnumerable<ReadOnlyCollectionExtensions.ValueEnumerable<int>, ValueEnumerator<int>, int, FunctionWrapper<int, bool>>,
ValueReadOnlyCollectionExtensions.WhereAtEnumerable<ReadOnlyCollectionExtensions.ValueEnumerable<int>, ValueEnumerator<int>, int, FunctionWrapper<int, int, bool>>
>
{
public ValueEnumerableTests1()
: base(array => Wrap.AsReadOnlyCollection(array).AsValueEnumerable<int>())
{
}
}
}

This file was deleted.

This file was deleted.

Loading