Skip to content

Commit 7289b23

Browse files

23 files changed

+69
-57
lines changed

MoreLinq.Test.Aot/ToDataTableTest.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,8 @@ sealed class TestObject(int key)
4545
readonly ImmutableArray<TestObject> testObjects;
4646

4747
public ToDataTableTest() =>
48-
this.testObjects = Enumerable.Range(0, 3)
49-
.Select(i => new TestObject(i))
50-
.ToImmutableArray();
48+
this.testObjects = [..from i in Enumerable.Range(0, 3)
49+
select new TestObject(i)];
5150

5251
[TestMethod]
5352
public void ToDataTableNullMemberExpressionMethod()

MoreLinq.Test/AggregateTest.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,8 @@ from m in typeof(MoreEnumerable).GetMethods(BindingFlags.Public | BindingFlags.S
5151
{
5252
Source = source,
5353
Expectation = sum,
54-
Instantiation = m.MakeGenericMethod(Enumerable.Repeat(typeof(int), m.GetGenericArguments().Length - 1)
55-
.Append(typeof(int[])) // TResult
56-
.ToArray()),
54+
Instantiation = m.MakeGenericMethod([..Enumerable.Repeat(typeof(int), m.GetGenericArguments().Length - 1)
55+
.Append(typeof(int[]))]), // TResult
5756
}
5857
into m
5958
let rst = m.Instantiation.GetParameters().Last().ParameterType

MoreLinq.Test/BacksertTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public IEnumerable<int> Backsert(int[] seq1, int index, int[] seq2)
5757
using var test1 = seq1.AsTestingSequence();
5858
using var test2 = seq2.AsTestingSequence();
5959

60-
return test1.Backsert(test2, index).ToArray();
60+
return [..test1.Backsert(test2, index)];
6161
}
6262
}
6363
}

MoreLinq.Test/CartesianTest.cs

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
namespace MoreLinq.Test
1919
{
20+
using System;
2021
using NUnit.Framework;
2122

2223
/// <summary>
@@ -122,14 +123,14 @@ public void TestCartesianProductCombinations()
122123
var sequenceA = Enumerable.Range(0, 5);
123124
var sequenceB = Enumerable.Range(0, 5);
124125

125-
var expectedSet = new[]
126-
{
127-
Enumerable.Repeat(false, 5).ToArray(),
128-
Enumerable.Repeat(false, 5).ToArray(),
129-
Enumerable.Repeat(false, 5).ToArray(),
130-
Enumerable.Repeat(false, 5).ToArray(),
131-
Enumerable.Repeat(false, 5).ToArray()
132-
};
126+
bool[][] expectedSet =
127+
[
128+
[..Enumerable.Repeat(false, 5)],
129+
[..Enumerable.Repeat(false, 5)],
130+
[..Enumerable.Repeat(false, 5)],
131+
[..Enumerable.Repeat(false, 5)],
132+
[..Enumerable.Repeat(false, 5)],
133+
];
133134

134135
using var tsA = sequenceA.AsTestingSequence();
135136
using var tsB = sequenceB.AsTestingSequence();

MoreLinq.Test/FullGroupJoinTest.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,8 +126,8 @@ public void FullGroupPreservesOrder(OverloadCase overloadCase)
126126
// Order of joined elements is preserved
127127
foreach (var (key, first, second) in result)
128128
{
129-
first.AssertSequenceEqual(listA.Where(t => t.Item1 == key).ToArray());
130-
second.AssertSequenceEqual(listB.Where(t => t.Item1 == key).ToArray());
129+
first.AssertSequenceEqual([..from t in listA where t.Item1 == key select t]);
130+
second.AssertSequenceEqual([..from t in listB where t.Item1 == key select t]);
131131
}
132132
}
133133

MoreLinq.Test/MaximaTest.cs

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ public class Take
213213
public string[] ReturnsMaxima(int count)
214214
{
215215
using var strings = SampleData.Strings.AsTestingSequence();
216-
return strings.Maxima(s => s.Length).Take(count).ToArray();
216+
return [..strings.Maxima(s => s.Length).Take(count)];
217217
}
218218

219219
[TestCase(0, 0, ExpectedResult = new string[0] )]
@@ -227,9 +227,8 @@ public string[] ReturnsMaxima(int count)
227227
public string[] WithComparerReturnsMaximaPerComparer(int count, int index)
228228
{
229229
using var strings = SampleData.Strings.AsTestingSequence();
230-
return strings.Maxima(s => s[index], Comparable<char>.DescendingOrderComparer)
231-
.Take(count)
232-
.ToArray();
230+
return [..strings.Maxima(s => s[index], Comparable<char>.DescendingOrderComparer)
231+
.Take(count)];
233232
}
234233
}
235234

@@ -242,7 +241,7 @@ public class TakeLast
242241
public string[] TakeLastReturnsMaxima(int count)
243242
{
244243
using var strings = SampleData.Strings.AsTestingSequence();
245-
return strings.Maxima(s => s.Length).TakeLast(count).ToArray();
244+
return [..strings.Maxima(s => s.Length).TakeLast(count)];
246245
}
247246

248247
[TestCase(0, 0, ExpectedResult = new string[0] )]
@@ -256,9 +255,8 @@ public string[] TakeLastReturnsMaxima(int count)
256255
public string[] WithComparerReturnsMaximaPerComparer(int count, int index)
257256
{
258257
using var strings = SampleData.Strings.AsTestingSequence();
259-
return strings.Maxima(s => s[index], Comparable<char>.DescendingOrderComparer)
260-
.TakeLast(count)
261-
.ToArray();
258+
return [..strings.Maxima(s => s[index], Comparable<char>.DescendingOrderComparer)
259+
.TakeLast(count)];
262260
}
263261
}
264262
}

MoreLinq.Test/MinimaTest.cs

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ public class Take
212212
public string[] ReturnsMinima(int count)
213213
{
214214
using var strings = SampleData.Strings.AsTestingSequence();
215-
return strings.Minima(s => s.Length).Take(count).ToArray();
215+
return [..strings.Minima(s => s.Length).Take(count)];
216216
}
217217

218218
[TestCase(0, ExpectedResult = new string[0] )]
@@ -222,9 +222,8 @@ public string[] ReturnsMinima(int count)
222222
public string[] WithComparerReturnsMinimaPerComparer(int count)
223223
{
224224
using var strings = SampleData.Strings.AsTestingSequence();
225-
return strings.Minima(s => s.Length, Comparable<int>.DescendingOrderComparer)
226-
.Take(count)
227-
.ToArray();
225+
return [..strings.Minima(s => s.Length, Comparable<int>.DescendingOrderComparer)
226+
.Take(count)];
228227
}
229228
}
230229

@@ -240,7 +239,7 @@ public class TakeLast
240239
public string[] ReturnsMinima(int count)
241240
{
242241
using var strings = SampleData.Strings.AsTestingSequence();
243-
return strings.Minima(s => s.Length).TakeLast(count).ToArray();
242+
return [..strings.Minima(s => s.Length).TakeLast(count)];
244243
}
245244

246245
[TestCase(0, ExpectedResult = new string[0] )]
@@ -250,9 +249,8 @@ public string[] ReturnsMinima(int count)
250249
public string[] WithComparerReturnsMinimaPerComparer(int count)
251250
{
252251
using var strings = SampleData.Strings.AsTestingSequence();
253-
return strings.Minima(s => s.Length, Comparable<int>.DescendingOrderComparer)
254-
.TakeLast(count)
255-
.ToArray();
252+
return [..strings.Minima(s => s.Length, Comparable<int>.DescendingOrderComparer)
253+
.TakeLast(count)];
256254
}
257255
}
258256
}

MoreLinq.Test/NullArgumentTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ var constraints when constraints.Any(t => t.IsGenericType && t.GetGenericTypeDef
103103
_ => throw new NotImplementedException("NullArgumentTest.InstantiateType")
104104
};
105105

106-
return definition.MakeGenericMethod(typeArguments.ToArray());
106+
return definition.MakeGenericMethod([..typeArguments]);
107107
}
108108

109109
static bool IsReferenceType(ParameterInfo parameter) =>

MoreLinq.Test/PrependTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public void PrependIsLazyInTailSequence()
6060
[TestCaseSource(nameof(PrependManySource))]
6161
public int[] PrependMany(int[] head, int[] tail)
6262
{
63-
return tail.Aggregate(head.AsEnumerable(), MoreEnumerable.Prepend).ToArray();
63+
return [..tail.Aggregate(head.AsEnumerable(), MoreEnumerable.Prepend)];
6464
}
6565

6666
public static IEnumerable<TestCaseData> PrependManySource =>

MoreLinq.Test/RepeatTest.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public void TestRepeatBehavior()
4646

4747
int[] result;
4848
using (var ts = sequence.AsTestingSequence())
49-
result = ts.Repeat(repeatCount).ToArray();
49+
result = [..ts.Repeat(repeatCount)];
5050

5151
var expectedResult = Enumerable.Empty<int>();
5252
for (var i = 0; i < repeatCount; i++)
@@ -94,7 +94,7 @@ public void TestRepeatForeverBehaviorManyElementsList()
9494

9595
int[] result;
9696
using (var ts = sequence.AsTestingSequence())
97-
result = ts.Repeat().Take(takeCount).ToArray();
97+
result = [..ts.Repeat().Take(takeCount)];
9898

9999
var expectedResult = Enumerable.Empty<int>();
100100
for (var i = 0; i < repeatCount; i++)

0 commit comments

Comments
 (0)