Skip to content

Commit db83d97

Browse files
dragon7307dragon7307
committed
expaned if statements & commented type verification tests out
1 parent edf7a7d commit db83d97

File tree

24 files changed

+339
-206
lines changed

24 files changed

+339
-206
lines changed

‎src/Extensions/ReadOnlySpan/Linq/LastOrDefault.cs‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,6 @@ public static T LastOrDefault<T>(this ReadOnlySpan<T> source, T defaultValue)
1818
return defaultValue;
1919
}
2020
return source[^1];
21-
22-
/* Unmerged change from project 'SpanExtensions (netstandard2.1)'
23-
Before:
24-
}
25-
26-
/// <summary>
27-
After:
28-
}
29-
30-
/// <summary>
31-
*/
3221
}
3322

3423
/// <summary>

‎tests/fuzzing/Tests/ReadOnlySpan/Split/Split.cs‎

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ public static TheoryData<int, int, int, int> SplitData(int iterations)
1111
const int minValue = 0;
1212
const int maxValue = 100;
1313

14-
TheoryData<int, int, int, int> data = new TheoryData<int, int, int, int>();
14+
var data = new TheoryData<int, int, int, int>();
1515

1616
foreach(int length in new MultiplierRange(1, 1000, 10).And([0]))
1717
{
@@ -84,8 +84,16 @@ static void AssertOptions<T>(T[] array, T delimiter, int count, CountExceedingBe
8484
{
8585
AssertOptions(integerArray, integerDelimiter, 0, countExceedingBehaviour);
8686
AssertOptions(integerArray, integerDelimiter, 1, countExceedingBehaviour);
87-
if(countDelimiters - 1 > 1) AssertOptions(integerArray, integerDelimiter, countDelimiters - 1, countExceedingBehaviour);
88-
if(countDelimiters > 1) AssertOptions(integerArray, integerDelimiter, countDelimiters, countExceedingBehaviour);
87+
if(countDelimiters - 1 > 1)
88+
{
89+
AssertOptions(integerArray, integerDelimiter, countDelimiters - 1, countExceedingBehaviour);
90+
}
91+
92+
if(countDelimiters > 1)
93+
{
94+
AssertOptions(integerArray, integerDelimiter, countDelimiters, countExceedingBehaviour);
95+
}
96+
8997
AssertOptions(integerArray, integerDelimiter, countDelimiters + 2, countExceedingBehaviour);
9098
AssertOptions(integerArray, maxValue, 0, countExceedingBehaviour);
9199
AssertOptions(integerArray, maxValue, 1, countExceedingBehaviour);
@@ -100,8 +108,16 @@ static void AssertOptions<T>(T[] array, T delimiter, int count, CountExceedingBe
100108
{
101109
AssertOptions(charArray, charDelimiter, 0, countExceedingBehaviour);
102110
AssertOptions(charArray, charDelimiter, 1, countExceedingBehaviour);
103-
if(countDelimiters - 1 > 1) AssertOptions(charArray, charDelimiter, countDelimiters - 1, countExceedingBehaviour);
104-
if(countDelimiters > 1) AssertOptions(charArray, charDelimiter, countDelimiters, countExceedingBehaviour);
111+
if(countDelimiters - 1 > 1)
112+
{
113+
AssertOptions(charArray, charDelimiter, countDelimiters - 1, countExceedingBehaviour);
114+
}
115+
116+
if(countDelimiters > 1)
117+
{
118+
AssertOptions(charArray, charDelimiter, countDelimiters, countExceedingBehaviour);
119+
}
120+
105121
AssertOptions(charArray, charDelimiter, countDelimiters + 2, countExceedingBehaviour);
106122
AssertOptions(charArray, charMissingDelimiter, 0, countExceedingBehaviour);
107123
AssertOptions(charArray, charMissingDelimiter, 1, countExceedingBehaviour);

‎tests/fuzzing/Tests/ReadOnlySpan/Split/SplitAny.cs‎

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,16 @@ static void AssertOptions<T>(T[] array, T[] delimiters, int count, CountExceedin
106106
{
107107
AssertOptions(integerArray, integerDelimiters, 0, countExceedingBehaviour);
108108
AssertOptions(integerArray, integerDelimiters, 1, countExceedingBehaviour);
109-
if(countDelimiters - 1 > 1) AssertOptions(integerArray, integerDelimiters, countDelimiters, countExceedingBehaviour);
110-
if(countDelimiters > 1) AssertOptions(integerArray, integerDelimiters, countDelimiters, countExceedingBehaviour);
109+
if(countDelimiters - 1 > 1)
110+
{
111+
AssertOptions(integerArray, integerDelimiters, countDelimiters, countExceedingBehaviour);
112+
}
113+
114+
if(countDelimiters > 1)
115+
{
116+
AssertOptions(integerArray, integerDelimiters, countDelimiters, countExceedingBehaviour);
117+
}
118+
111119
AssertOptions(integerArray, integerDelimiters, countDelimiters + 2, countExceedingBehaviour);
112120
}
113121

@@ -121,8 +129,16 @@ static void AssertOptions<T>(T[] array, T[] delimiters, int count, CountExceedin
121129
{
122130
AssertOptions(charArray, charDelimiters, 0, countExceedingBehaviour);
123131
AssertOptions(charArray, charDelimiters, 0, countExceedingBehaviour);
124-
if(countDelimiters - 1 > 1) AssertOptions(charArray, charDelimiters, countDelimiters - 1, countExceedingBehaviour);
125-
if(countDelimiters > 1) AssertOptions(charArray, charDelimiters, countDelimiters, countExceedingBehaviour);
132+
if(countDelimiters - 1 > 1)
133+
{
134+
AssertOptions(charArray, charDelimiters, countDelimiters - 1, countExceedingBehaviour);
135+
}
136+
137+
if(countDelimiters > 1)
138+
{
139+
AssertOptions(charArray, charDelimiters, countDelimiters, countExceedingBehaviour);
140+
}
141+
126142
AssertOptions(charArray, charDelimiters, countDelimiters + 2, countExceedingBehaviour);
127143
}
128144
}

‎tests/fuzzing/Tests/ReadOnlySpan/Split/SplitAnyString.cs‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,16 @@ static void AssertOptions(string @string, char[] delimiters, int count, StringSp
101101
{
102102
AssertOptions(@string, charDelimiters, 0, options, countExceedingBehaviour);
103103
AssertOptions(@string, charDelimiters, 1, options, countExceedingBehaviour);
104-
if(countDelimiters - 1 > 1) AssertOptions(@string, charDelimiters, countDelimiters - 1, options, countExceedingBehaviour);
105-
if(countDelimiters > 1) AssertOptions(@string, charDelimiters, countDelimiters, options, countExceedingBehaviour);
104+
if(countDelimiters - 1 > 1)
105+
{
106+
AssertOptions(@string, charDelimiters, countDelimiters - 1, options, countExceedingBehaviour);
107+
}
108+
109+
if(countDelimiters > 1)
110+
{
111+
AssertOptions(@string, charDelimiters, countDelimiters, options, countExceedingBehaviour);
112+
}
113+
106114
AssertOptions(@string, charDelimiters, countDelimiters + 2, options, countExceedingBehaviour);
107115
}
108116
}

‎tests/fuzzing/Tests/ReadOnlySpan/Split/SplitSequence.cs‎

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,16 @@ static void AssertOptions<T>(T[] array, T[] delimiter, int count, CountExceeding
9393
{
9494
AssertOptions(integerArray, integerSequenceDelimiter, 0, countExceedingBehaviour);
9595
AssertOptions(integerArray, integerSequenceDelimiter, 1, countExceedingBehaviour);
96-
if(countDelimiters - 1 > 1) AssertOptions(integerArray, integerSequenceDelimiter, countDelimiters - 1, countExceedingBehaviour);
97-
if(countDelimiters > 1) AssertOptions(integerArray, integerSequenceDelimiter, countDelimiters, countExceedingBehaviour);
96+
if(countDelimiters - 1 > 1)
97+
{
98+
AssertOptions(integerArray, integerSequenceDelimiter, countDelimiters - 1, countExceedingBehaviour);
99+
}
100+
101+
if(countDelimiters > 1)
102+
{
103+
AssertOptions(integerArray, integerSequenceDelimiter, countDelimiters, countExceedingBehaviour);
104+
}
105+
98106
AssertOptions(integerArray, integerSequenceDelimiter, countDelimiters + 2, countExceedingBehaviour);
99107
AssertOptions(integerArray, integerSequenceMissingDelimiter, 0, countExceedingBehaviour);
100108
AssertOptions(integerArray, integerSequenceMissingDelimiter, 1, countExceedingBehaviour);
@@ -109,8 +117,16 @@ static void AssertOptions<T>(T[] array, T[] delimiter, int count, CountExceeding
109117
{
110118
AssertOptions(charArray, charSequenceDelimiter, 0, countExceedingBehaviour);
111119
AssertOptions(charArray, charSequenceDelimiter, 1, countExceedingBehaviour);
112-
if(countDelimiters - 1 > 1) AssertOptions(charArray, charSequenceDelimiter, countDelimiters - 1, countExceedingBehaviour);
113-
if(countDelimiters > 1) AssertOptions(charArray, charSequenceDelimiter, countDelimiters, countExceedingBehaviour);
120+
if(countDelimiters - 1 > 1)
121+
{
122+
AssertOptions(charArray, charSequenceDelimiter, countDelimiters - 1, countExceedingBehaviour);
123+
}
124+
125+
if(countDelimiters > 1)
126+
{
127+
AssertOptions(charArray, charSequenceDelimiter, countDelimiters, countExceedingBehaviour);
128+
}
129+
114130
AssertOptions(charArray, charSequenceDelimiter, countDelimiters + 2, countExceedingBehaviour);
115131
AssertOptions(charArray, charSequenceMissingDelimiter, 0, countExceedingBehaviour);
116132
AssertOptions(charArray, charSequenceMissingDelimiter, 1, countExceedingBehaviour);

‎tests/fuzzing/Tests/ReadOnlySpan/Split/SplitString.cs‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,16 @@ static void AssertOptions(string @string, char delimiter, int count, StringSplit
8181
{
8282
AssertOptions(@string, charDelimiter, 0, options, countExceedingBehaviour);
8383
AssertOptions(@string, charDelimiter, 1, options, countExceedingBehaviour);
84-
if(countDelimiters - 1 > 1) AssertOptions(@string, charDelimiter, countDelimiters - 1, options, countExceedingBehaviour);
85-
if(countDelimiters > 1) AssertOptions(@string, charDelimiter, countDelimiters, options, countExceedingBehaviour);
84+
if(countDelimiters - 1 > 1)
85+
{
86+
AssertOptions(@string, charDelimiter, countDelimiters - 1, options, countExceedingBehaviour);
87+
}
88+
89+
if(countDelimiters > 1)
90+
{
91+
AssertOptions(@string, charDelimiter, countDelimiters, options, countExceedingBehaviour);
92+
}
93+
8694
AssertOptions(@string, charDelimiter, countDelimiters + 2, options, countExceedingBehaviour);
8795
AssertOptions(@string, 'ა', 0, options, countExceedingBehaviour);
8896
AssertOptions(@string, 'ა', 1, options, countExceedingBehaviour);

‎tests/fuzzing/Tests/ReadOnlySpan/Split/SplitStringSequence.cs‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,16 @@ static void AssertOptions(string @string, char[] delimiter, int count, StringSpl
8787
{
8888
AssertOptions(@string, charSequenceDelimiter, 0, options, countExceedingBehaviour);
8989
AssertOptions(@string, charSequenceDelimiter, 1, options, countExceedingBehaviour);
90-
if(countDelimiters - 1 > 1) AssertOptions(@string, charSequenceDelimiter, countDelimiters - 1, options, countExceedingBehaviour);
91-
if(countDelimiters > 1) AssertOptions(@string, charSequenceDelimiter, countDelimiters, options, countExceedingBehaviour);
90+
if(countDelimiters - 1 > 1)
91+
{
92+
AssertOptions(@string, charSequenceDelimiter, countDelimiters - 1, options, countExceedingBehaviour);
93+
}
94+
95+
if(countDelimiters > 1)
96+
{
97+
AssertOptions(@string, charSequenceDelimiter, countDelimiters, options, countExceedingBehaviour);
98+
}
99+
92100
AssertOptions(@string, charSequenceDelimiter, countDelimiters + 2, options, countExceedingBehaviour);
93101
AssertOptions(@string, charSequenceMissingDelimiter, 0, options, countExceedingBehaviour);
94102
AssertOptions(@string, charSequenceMissingDelimiter, 1, options, countExceedingBehaviour);

‎tests/fuzzing/Tests/Span/Split/Split.cs‎

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,16 @@ static void AssertOptions<T>(T[] array, T delimiter, int count, CountExceedingBe
8484
{
8585
AssertOptions(integerArray, integerDelimiter, 0, countExceedingBehaviour);
8686
AssertOptions(integerArray, integerDelimiter, 1, countExceedingBehaviour);
87-
if(countDelimiters - 1 > 1) AssertOptions(integerArray, integerDelimiter, countDelimiters - 1, countExceedingBehaviour);
88-
if(countDelimiters > 1) AssertOptions(integerArray, integerDelimiter, countDelimiters, countExceedingBehaviour);
87+
if(countDelimiters - 1 > 1)
88+
{
89+
AssertOptions(integerArray, integerDelimiter, countDelimiters - 1, countExceedingBehaviour);
90+
}
91+
92+
if(countDelimiters > 1)
93+
{
94+
AssertOptions(integerArray, integerDelimiter, countDelimiters, countExceedingBehaviour);
95+
}
96+
8997
AssertOptions(integerArray, integerDelimiter, countDelimiters + 2, countExceedingBehaviour);
9098
AssertOptions(integerArray, maxValue, 0, countExceedingBehaviour);
9199
AssertOptions(integerArray, maxValue, 1, countExceedingBehaviour);
@@ -100,8 +108,16 @@ static void AssertOptions<T>(T[] array, T delimiter, int count, CountExceedingBe
100108
{
101109
AssertOptions(charArray, charDelimiter, 0, countExceedingBehaviour);
102110
AssertOptions(charArray, charDelimiter, 1, countExceedingBehaviour);
103-
if(countDelimiters - 1 > 1) AssertOptions(charArray, charDelimiter, countDelimiters - 1, countExceedingBehaviour);
104-
if(countDelimiters > 1) AssertOptions(charArray, charDelimiter, countDelimiters, countExceedingBehaviour);
111+
if(countDelimiters - 1 > 1)
112+
{
113+
AssertOptions(charArray, charDelimiter, countDelimiters - 1, countExceedingBehaviour);
114+
}
115+
116+
if(countDelimiters > 1)
117+
{
118+
AssertOptions(charArray, charDelimiter, countDelimiters, countExceedingBehaviour);
119+
}
120+
105121
AssertOptions(charArray, charDelimiter, countDelimiters + 2, countExceedingBehaviour);
106122
AssertOptions(charArray, charMissingDelimiter, 0, countExceedingBehaviour);
107123
AssertOptions(charArray, charMissingDelimiter, 1, countExceedingBehaviour);

‎tests/fuzzing/Tests/Span/Split/SplitAny.cs‎

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,16 @@ static void AssertOptions<T>(T[] array, T[] delimiters, int count, CountExceedin
106106
{
107107
AssertOptions(integerArray, integerDelimiters, 0, countExceedingBehaviour);
108108
AssertOptions(integerArray, integerDelimiters, 1, countExceedingBehaviour);
109-
if(countDelimiters - 1 > 1) AssertOptions(integerArray, integerDelimiters, countDelimiters, countExceedingBehaviour);
110-
if(countDelimiters > 1) AssertOptions(integerArray, integerDelimiters, countDelimiters, countExceedingBehaviour);
109+
if(countDelimiters - 1 > 1)
110+
{
111+
AssertOptions(integerArray, integerDelimiters, countDelimiters, countExceedingBehaviour);
112+
}
113+
114+
if(countDelimiters > 1)
115+
{
116+
AssertOptions(integerArray, integerDelimiters, countDelimiters, countExceedingBehaviour);
117+
}
118+
111119
AssertOptions(integerArray, integerDelimiters, countDelimiters + 2, countExceedingBehaviour);
112120
}
113121

@@ -121,8 +129,16 @@ static void AssertOptions<T>(T[] array, T[] delimiters, int count, CountExceedin
121129
{
122130
AssertOptions(charArray, charDelimiters, 0, countExceedingBehaviour);
123131
AssertOptions(charArray, charDelimiters, 0, countExceedingBehaviour);
124-
if(countDelimiters - 1 > 1) AssertOptions(charArray, charDelimiters, countDelimiters - 1, countExceedingBehaviour);
125-
if(countDelimiters > 1) AssertOptions(charArray, charDelimiters, countDelimiters, countExceedingBehaviour);
132+
if(countDelimiters - 1 > 1)
133+
{
134+
AssertOptions(charArray, charDelimiters, countDelimiters - 1, countExceedingBehaviour);
135+
}
136+
137+
if(countDelimiters > 1)
138+
{
139+
AssertOptions(charArray, charDelimiters, countDelimiters, countExceedingBehaviour);
140+
}
141+
126142
AssertOptions(charArray, charDelimiters, countDelimiters + 2, countExceedingBehaviour);
127143
}
128144
}

‎tests/fuzzing/Tests/Span/Split/SplitAnyString.cs‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,16 @@ static void AssertOptions(string @string, char[] delimiters, int count, StringSp
101101
{
102102
AssertOptions(@string, charDelimiters, 0, options, countExceedingBehaviour);
103103
AssertOptions(@string, charDelimiters, 1, options, countExceedingBehaviour);
104-
if(countDelimiters - 1 > 1) AssertOptions(@string, charDelimiters, countDelimiters - 1, options, countExceedingBehaviour);
105-
if(countDelimiters > 1) AssertOptions(@string, charDelimiters, countDelimiters, options, countExceedingBehaviour);
104+
if(countDelimiters - 1 > 1)
105+
{
106+
AssertOptions(@string, charDelimiters, countDelimiters - 1, options, countExceedingBehaviour);
107+
}
108+
109+
if(countDelimiters > 1)
110+
{
111+
AssertOptions(@string, charDelimiters, countDelimiters, options, countExceedingBehaviour);
112+
}
113+
106114
AssertOptions(@string, charDelimiters, countDelimiters + 2, options, countExceedingBehaviour);
107115
}
108116
}

0 commit comments

Comments
 (0)