Skip to content

Commit 7e118b0

Browse files
CopilotDaveTryon
andcommitted
Refactor SbomValidatorTests to use test fixture pattern for sbomValidator initialization
Co-authored-by: DaveTryon <45672944+DaveTryon@users.noreply.github.com>
1 parent 399220a commit 7e118b0

1 file changed

Lines changed: 13 additions & 36 deletions

File tree

test/Microsoft.Sbom.Api.Tests/SbomValidatorTests.cs

Lines changed: 13 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ public class SbomValidatorTests
2929
private Mock<ISbomConfigProvider> sbomConfigProviderMock;
3030
private Mock<IFileSystemUtils> fileSystemUtilsMock;
3131
private Mock<ISbomConfig> sbomConfigMock;
32+
private SbomValidator sbomValidator;
3233

3334
// Common test data
3435
private readonly string buildDropPath = "/test/drop";
@@ -49,6 +50,14 @@ public void Init()
4950
sbomConfigProviderMock = new Mock<ISbomConfigProvider>(MockBehavior.Strict);
5051
fileSystemUtilsMock = new Mock<IFileSystemUtils>(MockBehavior.Strict);
5152
sbomConfigMock = new Mock<ISbomConfig>(MockBehavior.Strict);
53+
54+
sbomValidator = new SbomValidator(
55+
workflowMock.Object,
56+
recorderMock.Object,
57+
configValidatorsMock.Object,
58+
configurationMock.Object,
59+
sbomConfigProviderMock.Object,
60+
fileSystemUtilsMock.Object);
5261
}
5362

5463
[TestCleanup]
@@ -86,15 +95,7 @@ public async Task ValidateSbomAsync_WithNoErrorsAndNoExceptions_ReturnsTrue()
8695
recorderMock.Setup(r => r.Errors).Returns(errors);
8796
recorderMock.Setup(r => r.Exceptions).Returns(exceptions);
8897

89-
var validator = new SbomValidator(
90-
workflowMock.Object,
91-
recorderMock.Object,
92-
configValidatorsMock.Object,
93-
configurationMock.Object,
94-
sbomConfigProviderMock.Object,
95-
fileSystemUtilsMock.Object);
96-
97-
var result = await validator.ValidateSbomAsync(buildDropPath, outputPathFile, specifications, manifestDirPath);
98+
var result = await sbomValidator.ValidateSbomAsync(buildDropPath, outputPathFile, specifications, manifestDirPath);
9899

99100
Assert.IsTrue(result.IsSuccess);
100101
Assert.AreEqual(0, result.Errors.Count);
@@ -126,15 +127,7 @@ public async Task ValidateSbomAsync_WithErrorsButNoExceptions_ReturnsFalse()
126127
recorderMock.Setup(r => r.Errors).Returns(errors);
127128
recorderMock.Setup(r => r.Exceptions).Returns(exceptions);
128129

129-
var validator = new SbomValidator(
130-
workflowMock.Object,
131-
recorderMock.Object,
132-
configValidatorsMock.Object,
133-
configurationMock.Object,
134-
sbomConfigProviderMock.Object,
135-
fileSystemUtilsMock.Object);
136-
137-
var result = await validator.ValidateSbomAsync(buildDropPath, outputPathFile, specifications, manifestDirPath);
130+
var result = await sbomValidator.ValidateSbomAsync(buildDropPath, outputPathFile, specifications, manifestDirPath);
138131

139132
Assert.IsFalse(result.IsSuccess);
140133
Assert.AreEqual(1, result.Errors.Count);
@@ -166,15 +159,7 @@ public async Task ValidateSbomAsync_WithNoErrorsButWithExceptions_ReturnsFalse()
166159
recorderMock.Setup(r => r.Errors).Returns(errors);
167160
recorderMock.Setup(r => r.Exceptions).Returns(exceptions);
168161

169-
var validator = new SbomValidator(
170-
workflowMock.Object,
171-
recorderMock.Object,
172-
configValidatorsMock.Object,
173-
configurationMock.Object,
174-
sbomConfigProviderMock.Object,
175-
fileSystemUtilsMock.Object);
176-
177-
var result = await validator.ValidateSbomAsync(buildDropPath, outputPathDirectory, specifications, manifestDirPath);
162+
var result = await sbomValidator.ValidateSbomAsync(buildDropPath, outputPathDirectory, specifications, manifestDirPath);
178163

179164
Assert.IsFalse(result.IsSuccess);
180165
Assert.AreEqual(0, result.Errors.Count); // No validation errors, but should still fail due to exception
@@ -209,15 +194,7 @@ public async Task ValidateSbomAsync_WithBothErrorsAndExceptions_ReturnsFalse()
209194
recorderMock.Setup(r => r.Errors).Returns(errors);
210195
recorderMock.Setup(r => r.Exceptions).Returns(exceptions);
211196

212-
var validator = new SbomValidator(
213-
workflowMock.Object,
214-
recorderMock.Object,
215-
configValidatorsMock.Object,
216-
configurationMock.Object,
217-
sbomConfigProviderMock.Object,
218-
fileSystemUtilsMock.Object);
219-
220-
var result = await validator.ValidateSbomAsync(buildDropPath, outputPathDirectory, specifications, manifestDirPath);
197+
var result = await sbomValidator.ValidateSbomAsync(buildDropPath, outputPathDirectory, specifications, manifestDirPath);
221198

222199
Assert.IsFalse(result.IsSuccess);
223200
Assert.AreEqual(1, result.Errors.Count);

0 commit comments

Comments
 (0)