Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Update tests to use TestingSequence #1045

Closed
wants to merge 4 commits into from
Closed

Update tests to use TestingSequence #1045

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e3c5554
Update `AggregateRight` tests
viceroypenguin Nov 16, 2023
c511cc8
Report error if `IDisposable` is created and not disposed
viceroypenguin Nov 16, 2023
f4e602b
Merge remote-tracking branch 'upstream/master' into testing-sequence
viceroypenguin Nov 18, 2023
21ac927
Update `Append` tests
viceroypenguin Nov 18, 2023
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
4 changes: 4 additions & 0 deletions .editorconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,10 @@ dotnet_diagnostic.IDE0055.severity = suggestion
# IDE0046: Convert to conditional expression
dotnet_diagnostic.IDE0046.severity = suggestion

# Dispose things need disposing
# CA2000: Dispose objects before losing scope
dotnet_diagnostic.CA2000.severity = error

# CA1510: Use 'ArgumentNullException.ThrowIfNull' instead of explicitly throwing a new exception instance
# TODO: Remove post https://github.com/morelinq/MoreLINQ/issues/903
dotnet_diagnostic.CA1510.severity = suggestion
Expand Down
67 changes: 40 additions & 27 deletions MoreLinq.Test/AggregateRightTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
namespace MoreLinq.Test
{
using NUnit.Framework;
using System;
using System.Collections.Generic;

[TestFixture]
public class AggregateRightTest
Expand All @@ -27,28 +29,31 @@ public class AggregateRightTest
[Test]
public void AggregateRightWithEmptySequence()
{
Assert.That(() => new int[0].AggregateRight((a, b) => a + b),
Throws.InvalidOperationException);
using var ts = TestingSequence.Of<int>();
Assert.That(
() => ts.AggregateRight((a, b) => a + b),
Throws.InvalidOperationException);
}

[Test]
public void AggregateRightFuncIsNotInvokedOnSingleElementSequence()
{
const int value = 1;
using var ts = TestingSequence.Of(1);
var result = ts.AggregateRight(BreakingFunc.Of<int, int, int>());

var result = new[] { value }.AggregateRight(BreakingFunc.Of<int, int, int>());

Assert.That(result, Is.EqualTo(value));
Assert.That(result, Is.EqualTo(1));
}

[TestCase(SourceKind.BreakingList)]
[TestCase(SourceKind.BreakingReadOnlyList)]
[TestCase(SourceKind.Sequence)]
public void AggregateRight(SourceKind sourceKind)
{
var enumerable = Enumerable.Range(1, 5).Select(x => x.ToInvariantString()).ToSourceKind(sourceKind);
public static IEnumerable<TestCaseData> AggregateRightSource =>
Enumerable.Range(1, 5)
.Select(x => x.ToInvariantString())
.ToTestData(SourceKinds.Sequence.Concat(SourceKinds.List));

var result = enumerable.AggregateRight((a, b) => $"({a}+{b})");
[TestCaseSource(nameof(AggregateRightSource))]
public void AggregateRight(IEnumerable<string> sequence)
{
using var d = sequence as IDisposable;
var result = sequence.AggregateRight((a, b) => $"({a}+{b})");

Assert.That(result, Is.EqualTo("(1+(2+(3+(4+5))))"));
}
Expand All @@ -60,24 +65,30 @@ public void AggregateRight(SourceKind sourceKind)
[TestCase(true)]
public void AggregateRightSeedWithEmptySequence(object defaultValue)
{
Assert.That(new int[0].AggregateRight(defaultValue, (_, b) => b), Is.EqualTo(defaultValue));
using var ts = TestingSequence.Of<int>();
var result = ts.AggregateRight(defaultValue, (_, b) => b);

Assert.That(result, Is.EqualTo(defaultValue));
}

[Test]
public void AggregateRightSeedFuncIsNotInvokedOnEmptySequence()
{
const int value = 1;
using var ts = TestingSequence.Of<int>();
var result = ts.AggregateRight(1, BreakingFunc.Of<int, int, int>());

var result = new int[0].AggregateRight(value, BreakingFunc.Of<int, int, int>());

Assert.That(result, Is.EqualTo(value));
Assert.That(result, Is.EqualTo(1));
}

[Test]
public void AggregateRightSeed()
public static IEnumerable<TestCaseData> AggregateRightSeedSource =>
Enumerable.Range(1, 4)
.ToTestData(SourceKinds.Sequence.Concat(SourceKinds.List));

[TestCaseSource(nameof(AggregateRightSeedSource))]
public void AggregateRightSeed(IEnumerable<int> sequence)
{
var result = Enumerable.Range(1, 4)
.AggregateRight("5", (a, b) => $"({a}+{b})");
using var d = sequence as IDisposable;
var result = sequence.AggregateRight("5", (a, b) => $"({a}+{b})");

Assert.That(result, Is.EqualTo("(1+(2+(3+(4+5))))"));
}
Expand All @@ -89,14 +100,16 @@ public void AggregateRightSeed()
[TestCase(true)]
public void AggregateRightResultorWithEmptySequence(object defaultValue)
{
Assert.That(new int[0].AggregateRight(defaultValue, (_, b) => b, a => a == defaultValue), Is.EqualTo(true));
using var ts = TestingSequence.Of<int>();
var result = ts.AggregateRight(defaultValue, (_, b) => b, a => a == defaultValue);
Assert.That(result, Is.EqualTo(true));
}

[Test]
public void AggregateRightResultor()
[TestCaseSource(nameof(AggregateRightSeedSource))]
public void AggregateRightResultor(IEnumerable<int> sequence)
{
var result = Enumerable.Range(1, 4)
.AggregateRight("5", (a, b) => $"({a}+{b})", a => a.Length);
using var d = sequence as IDisposable;
var result = sequence.AggregateRight("5", (a, b) => $"({a}+{b})", a => a.Length);

Assert.That(result, Is.EqualTo("(1+(2+(3+(4+5))))".Length));
}
Expand Down
18 changes: 11 additions & 7 deletions MoreLinq.Test/AppendTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

namespace MoreLinq.Test
{
using System;
using System.Collections.Generic;
using NUnit.Framework;
using static MoreLinq.Extensions.AppendExtension;
Expand Down Expand Up @@ -60,10 +61,11 @@ public void AppendIsLazyInHeadSequence()
#endregion

[TestCaseSource(nameof(ContactManySource))]
public void AppendMany(int[] head, int[] tail)
public void AppendMany(IEnumerable<int> head, IEnumerable<int> tail, IEnumerable<int> expected)
{
tail.Aggregate(head.AsEnumerable(), (xs, x) => xs.Append(x))
.AssertSequenceEqual(head.Concat(tail));
using var d = head as IDisposable;
tail.Aggregate(head, (xs, x) => xs.Append(x))
.AssertSequenceEqual(expected);
}

public static IEnumerable<object> ContactManySource =>
Expand All @@ -75,14 +77,16 @@ select new
Tail = Enumerable.Range(x + 1, y).ToArray(),
}
into e
select new TestCaseData(e.Head,
e.Tail).SetName("Head = [" + string.Join(", ", e.Head) + "], " +
"Tail = [" + string.Join(", ", e.Tail) + "]");
select new TestCaseData(e.Head.AsTestingSequence(),
e.Tail,
e.Head.Concat(e.Tail))
.SetName("Head = [" + string.Join(", ", e.Head) + "], " +
"Tail = [" + string.Join(", ", e.Tail) + "]");

[Test]
public void AppendWithSharedSource()
{
var first = new[] { 1 }.Append(2);
using var first = new TestingSequence<int>([1, 2], maxEnumerations: 2);
var second = first.Append(3).Append(4);
var third = first.Append(4).Append(8);

Expand Down
27 changes: 26 additions & 1 deletion MoreLinq.Test/TestingSequence.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,31 @@ public enum Options
AllowRepeatedDisposals = 0x2,
AllowRepeatedMoveNexts = 0x4,
}

internal static IEnumerable<TestCaseData> ToTestData<T>(
this IEnumerable<T> input,
IEnumerable<SourceKind> kinds)
{
var list = input.ToList();
foreach (var k in kinds)
{
var sequence = list.ToTestKind(k);
var data = new TestCaseData(sequence)
.SetName($"{{m}}({k}[{string.Join(", ", list)}]");
yield return data;
}
}

internal static IEnumerable<T> ToTestKind<T>(this IEnumerable<T> input, SourceKind kind) =>
kind switch
{
SourceKind.Sequence => new TestingSequence<T>(input, Options.None, maxEnumerations: 2),
SourceKind.BreakingList => new BreakingList<T>(input.ToList()),
SourceKind.BreakingReadOnlyList => new BreakingReadOnlyList<T>(input.ToList()),
SourceKind.BreakingCollection => new BreakingCollection<T>(input.ToList()),
SourceKind.BreakingReadOnlyCollection => new BreakingReadOnlyCollection<T>(input.ToList()),
_ => throw new InvalidOperationException("Unknown SourceKind"),
};
}

/// <summary>
Expand All @@ -71,7 +96,7 @@ sealed class TestingSequence<T> : IEnumerable<T>, IDisposable
int _disposedCount;
int _enumerationCount;

internal TestingSequence(IEnumerable<T> sequence, Options options, int maxEnumerations)
internal TestingSequence(IEnumerable<T> sequence, Options options = Options.None, int maxEnumerations = 1)
{
_sequence = sequence;
_maxEnumerations = maxEnumerations;
Expand Down