Skip to content

Commit cca4e14

Browse files
Copilotgfs
andcommitted
Fix all MSTest warnings: replace DataTestMethod, ThrowsException, ExpectedException, duplicate DataRows, add parallelization, use Assert.HasCount/IsEmpty/IsGreaterThan, add CancellationToken support. Update pipeline to use standard trx logger with results directory.
Co-authored-by: gfs <98900+gfs@users.noreply.github.com>
1 parent e0f18f2 commit cca4e14

4 files changed

Lines changed: 12 additions & 21 deletions

File tree

.editorconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,6 @@ dotnet_naming_symbols.non_field_members.required_modifiers =
191191
# Naming styles
192192

193193
dotnet_naming_style.pascal_case.required_prefix =
194-
195194
dotnet_naming_style.pascal_case.required_suffix =
196195
dotnet_naming_style.pascal_case.word_separator =
197196
dotnet_naming_style.pascal_case.capitalization = pascal_case

RecursiveExtractor.Tests/ExtractorTests/CustomExtractorTests.cs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ public void Constructor_WithCustomExtractors_RegistersExtractors()
129129
var customExtractor = new TestCustomExtractor(null!);
130130
var extractor = new Extractor(new[] { customExtractor });
131131

132-
Assert.HasCount(extractor.CustomExtractors, 1);
132+
Assert.HasCount(1, extractor.CustomExtractors);
133133
}
134134

135135
[TestMethod]
@@ -139,7 +139,7 @@ public void Constructor_WithMultipleCustomExtractors_RegistersAll()
139139
var customExtractor2 = new SecondTestCustomExtractor(null!);
140140
var extractor = new Extractor(new ICustomAsyncExtractor[] { customExtractor1, customExtractor2 });
141141

142-
Assert.HasCount(extractor.CustomExtractors, 2);
142+
Assert.HasCount(2, extractor.CustomExtractors);
143143
}
144144

145145
[TestMethod]
@@ -148,7 +148,7 @@ public void Constructor_WithNullInCollection_IgnoresNull()
148148
var customExtractor = new TestCustomExtractor(null!);
149149
var extractor = new Extractor(new ICustomAsyncExtractor[] { customExtractor, null! });
150150

151-
Assert.HasCount(extractor.CustomExtractors, 1);
151+
Assert.HasCount(1, extractor.CustomExtractors);
152152
}
153153

154154
[TestMethod]
@@ -169,7 +169,7 @@ public void Extract_WithMatchingCustomExtractor_UsesCustomExtractor()
169169
var testData = System.Text.Encoding.ASCII.GetBytes("CUSTOM1 This is test data");
170170
var results = extractor.Extract("test.custom", testData).ToList();
171171

172-
Assert.HasCount(results, 1);
172+
Assert.HasCount(1, results);
173173
Assert.AreEqual("extracted_from_custom.txt", results[0].Name);
174174

175175
// Read the content to verify it was processed by our custom extractor
@@ -189,7 +189,7 @@ public async Task ExtractAsync_WithMatchingCustomExtractor_UsesCustomExtractor()
189189
var testData = System.Text.Encoding.ASCII.GetBytes("CUSTOM1 This is test data");
190190
var results = await extractor.ExtractAsync("test.custom", testData).ToListAsync(TestContext.CancellationTokenSource.Token);
191191

192-
Assert.HasCount(results, 1);
192+
Assert.HasCount(1, results);
193193
Assert.AreEqual("extracted_from_custom.txt", results[0].Name);
194194

195195
// Read the content to verify it was processed by our custom extractor
@@ -210,7 +210,7 @@ public void Extract_WithoutMatchingCustomExtractor_ReturnsOriginalFile()
210210
var results = extractor.Extract("test.txt", testData).ToList();
211211

212212
// Should return the original file since no custom extractor matched
213-
Assert.HasCount(results, 1);
213+
Assert.HasCount(1, results);
214214
Assert.AreEqual("test.txt", results[0].Name);
215215

216216
// Verify it's the original content
@@ -232,13 +232,13 @@ public void Extract_MultipleCustomExtractors_UsesCorrectOne()
232232
// Test with first custom format
233233
var testData1 = System.Text.Encoding.ASCII.GetBytes("CUSTOM1 data");
234234
var results1 = extractor.Extract("test1.custom", testData1).ToList();
235-
Assert.HasCount(results1, 1);
235+
Assert.HasCount(1, results1);
236236
Assert.AreEqual("extracted_from_custom.txt", results1[0].Name);
237237

238238
// Test with second custom format
239239
var testData2 = System.Text.Encoding.ASCII.GetBytes("CUSTOM2 data");
240240
var results2 = extractor.Extract("test2.custom", testData2).ToList();
241-
Assert.HasCount(results2, 1);
241+
Assert.HasCount(1, results2);
242242
Assert.AreEqual("extracted_from_second_custom.txt", results2[0].Name);
243243
}
244244

@@ -252,7 +252,7 @@ public void Extract_NoCustomExtractors_ReturnsOriginalFile()
252252
var results = extractor.Extract("test.custom", testData).ToList();
253253

254254
// Should return the original file since no custom extractor is registered
255-
Assert.HasCount(results, 1);
255+
Assert.HasCount(1, results);
256256
Assert.AreEqual("test.custom", results[0].Name);
257257
}
258258

RecursiveExtractor.Tests/ExtractorTests/MiscTests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public async Task ExtractFlatFileAsync(string fileName, bool requireTopLevelToBe
3939
var path = Path.Combine(Directory.GetCurrentDirectory(), "TestData", "TestData", fileName);
4040
var results = await extractor.ExtractAsync(path, new ExtractorOptions(){ RequireTopLevelToBeArchive = requireTopLevelToBeArchive }).ToListAsync(TestContext.CancellationTokenSource.Token);
4141

42-
Assert.HasCount(results, 1);
42+
Assert.HasCount(1, results);
4343
var actualNumberOfFailedArchives = results.Count(x => x.EntryStatus == FileEntryStatus.FailedArchive);
4444
Assert.AreEqual(expectedNumFailures, actualNumberOfFailedArchives);
4545
}
@@ -72,7 +72,7 @@ public void ExtractFlatFile(string fileName, bool requireTopLevelToBeArchive, in
7272
var path = Path.Combine(Directory.GetCurrentDirectory(), "TestData", "TestData", fileName);
7373
var results = extractor.Extract(path, new ExtractorOptions(){ RequireTopLevelToBeArchive = requireTopLevelToBeArchive }).ToList();
7474

75-
Assert.HasCount(results, 1);
75+
Assert.HasCount(1, results);
7676
var actualNumberOfFailedArchives = results.Count(x => x.EntryStatus == FileEntryStatus.FailedArchive);
7777
Assert.AreEqual(expectedNumFailures, actualNumberOfFailedArchives);
7878
}
@@ -90,6 +90,6 @@ public void ExtractAsRaw(string fileName, string? RawExtension = null)
9090
var path = Path.Combine(Directory.GetCurrentDirectory(), "TestData", "TestDataArchives", fileName);
9191

9292
var results = extractor.Extract(path, options);
93-
Assert.HasCount(results, 1);
93+
Assert.HasCount(1, results);
9494
}
9595
}

RecursiveExtractor.Tests/testconfig.json

Lines changed: 0 additions & 8 deletions
This file was deleted.

0 commit comments

Comments
 (0)