From 8f5887c1d683fc18a6e251e20d12bbcfc4609da5 Mon Sep 17 00:00:00 2001 From: Jamie Magee Date: Thu, 30 Oct 2025 07:57:45 -0700 Subject: [PATCH 1/2] Migrate from FluentAssertions to AwesomeAssertions --- Directory.Packages.props | 6 +++--- test/.editorconfig | 5 +++++ test/Directory.Build.props | 4 ++-- .../AsyncExceptionTests.cs | 2 +- .../BaseDetectionTelemetryRecordTests.cs | 4 ++-- .../CommandLineInvocationServiceTests.cs | 2 +- .../ComponentRecorderTests.cs | 2 +- .../ComponentStreamEnumerableTests.cs | 2 +- .../ConsoleWritingServiceTests.cs | 2 +- .../DependencyGraphTests.cs | 2 +- .../DependencyScopeComparerTests.cs | 2 +- .../DirectoryUtilityServiceTests.cs | 2 +- .../DockerReferenceUtilityTests.cs | 2 +- .../DockerServiceTests.cs | 2 +- .../EnvironmentVariableServiceTests.cs | 2 +- .../FileEnumerationTests.cs | 2 +- .../FileUtilityServiceTests.cs | 2 +- .../FileWritingServiceTests.cs | 2 +- .../LazyComponentStreamTests.cs | 2 +- .../Microsoft.ComponentDetection.Common.Tests.csproj | 2 +- .../PathUtilityServiceTests.cs | 2 +- .../PatternMatchingUtilityTests.cs | 2 +- .../SafeFileEnumerableTests.cs | 2 +- .../StringUtilitiesTests.cs | 2 +- .../TabularStringFormatTests.cs | 2 +- .../DetectedComponentTests.cs | 2 +- .../FileComponentDetectorWithCleanupTests.cs | 2 +- ...Microsoft.ComponentDetection.Contracts.Tests.csproj | 2 +- .../PurlGenerationTests.cs | 2 +- .../ScanResultSerializationTests.cs | 2 +- .../TypedComponentSerializationTests.cs | 2 +- .../ComponentDetectorTests.cs | 2 +- .../ConanLockComponentDetectorTests.cs | 2 +- .../CondaLockComponentDetectorTests.cs | 2 +- .../DotNetComponentDetectorTests.cs | 2 +- .../GoComponentDetectorTests.cs | 2 +- .../GoComponentTests.cs | 2 +- .../GradleComponentDetectorTests.cs | 2 +- .../IvyDetectorTests.cs | 2 +- .../LinuxContainerDetectorTests.cs | 2 +- .../LinuxScannerTests.cs | 2 +- .../MavenCommandServiceTests.cs | 2 +- .../MavenParsingUtilitiesTests.cs | 2 +- .../MavenStyleDependencyGraphParserTests.cs | 2 +- ...Microsoft.ComponentDetection.Detectors.Tests.csproj | 2 +- .../MvnCliDetectorTests.cs | 2 +- .../NpmDetectorTests.cs | 2 +- .../NpmDetectorWithRootsTests.cs | 2 +- .../NpmLockfile3DetectorTests.cs | 2 +- .../NpmUtilitiesTests.cs | 2 +- .../NuGetComponentDetectorTests.cs | 2 +- .../NuGetNuspecUtilitiesTests.cs | 2 +- ...ProjectModelProjectCentricComponentDetectorTests.cs | 2 +- .../PipCommandServiceTests.cs | 2 +- .../PipComponentDetectorTests.cs | 2 +- .../PipDependencySpecifierTests.cs | 2 +- .../PipReportComponentDetectorTests.cs | 2 +- .../PipReportUtilitiesTests.cs | 2 +- .../PipResolverTests.cs | 2 +- .../PnpmDetectorTests.cs | 2 +- .../PnpmParsingUtilitiesTest.cs | 2 +- .../PodDetectorTest.cs | 2 +- .../PoetryComponentDetectorTests.cs | 2 +- .../PyPiClientTests.cs | 2 +- .../PythonCommandServiceTests.cs | 2 +- .../PythonVersionTests.cs | 2 +- .../RubyDetectorTest.cs | 2 +- .../RustCargoLockParserTests.cs | 8 ++++---- .../RustCliParserTests.cs | 8 ++++---- .../RustDependencySpecifierTest.cs | 2 +- .../RustMetadataContextBuilderTests.cs | 2 +- .../RustSbomDetectorTests.cs | 2 +- .../RustSbomParserTests.cs | 4 ++-- .../SPDX22ComponentDetectorTests.cs | 2 +- .../SimplePipComponentDetectorTests.cs | 2 +- .../SimplePypiClientTests.cs | 2 +- .../SimplePythonResolverTests.cs | 2 +- .../SwiftComponentTests.cs | 2 +- .../SwiftResolvedDetectorTests.cs | 2 +- .../Utilities/ComponentRecorderTestUtilities.cs | 2 +- .../UvLockDetectorTests.cs | 2 +- .../UvLockTests.cs | 2 +- .../VcpkgComponentDetectorTests.cs | 2 +- .../Yarn/YarnBerryTypeConverterTests.cs | 2 +- .../YarnBlockFileTests.cs | 2 +- .../YarnLockDetectorTests.cs | 2 +- .../YarnParserTests.cs | 2 +- .../nuget/NuGetPackagesConfigDetectorTests.cs | 2 +- .../Commands/BaseSettingsTests.cs | 2 +- .../Commands/InterceptorTests.cs | 2 +- .../Commands/ListDetectorCommandTests.cs | 2 +- .../Commands/ScanCommandTests.cs | 2 +- .../Commands/ScanSettingsTests.cs | 2 +- .../Experiments/ExperimentConfigTests.cs | 2 +- .../Experiments/ExperimentDiffTests.cs | 2 +- .../Experiments/ExperimentResultsTests.cs | 2 +- .../Experiments/ExperimentServiceTests.cs | 2 +- .../Experiments/UvLockDetectorExperimentTests.cs | 2 +- .../Extensions/CommaDelimitedConverterTests.cs | 2 +- .../Extensions/KeyValueDelimitedConverterTests.cs | 2 +- .../Extensions/SemicolonDelimitedConverterTests.cs | 2 +- .../Extensions/TypeRegistrarTests.cs | 2 +- .../GraphTranslationUtilityTests.cs | 2 +- .../LoggingEnricherTests.cs | 2 +- ...rosoft.ComponentDetection.Orchestrator.Tests.csproj | 2 +- .../Services/BcdeScanExecutionServiceTests.cs | 2 +- .../Services/DefaultGraphTranslationServiceTests.cs | 2 +- .../Services/DetectorProcessingServiceTests.cs | 2 +- .../Services/DetectorRestrictionServiceTests.cs | 2 +- .../ComponentDetectionIntegrationTests.cs | 10 +++++----- .../JsonSchemaTests.cs | 2 +- ...crosoft.ComponentDetection.VerificationTests.csproj | 2 +- 112 files changed, 131 insertions(+), 126 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index e24f56e53..0ba927dd5 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -8,8 +8,8 @@ - - + + @@ -55,4 +55,4 @@ - \ No newline at end of file + diff --git a/test/.editorconfig b/test/.editorconfig index 8a58ab540..e33d0b57a 100644 --- a/test/.editorconfig +++ b/test/.editorconfig @@ -38,3 +38,8 @@ dotnet_diagnostic.CA1062.severity = none # Justification: Test method names contain underscores # https://docs.microsoft.com/en-us/visualstudio/code-quality/ca1707 dotnet_diagnostic.CA1707.severity = none + +# FAA0001: AwesomeAssertions analyzer suggestions +# Justification: Suppress style suggestions that would be treated as errors +# https://awesomeassertions.org/tips/ +dotnet_diagnostic.FAA0001.severity = none diff --git a/test/Directory.Build.props b/test/Directory.Build.props index 971c396dd..138792c7d 100644 --- a/test/Directory.Build.props +++ b/test/Directory.Build.props @@ -5,12 +5,12 @@ true - + - + diff --git a/test/Microsoft.ComponentDetection.Common.Tests/AsyncExceptionTests.cs b/test/Microsoft.ComponentDetection.Common.Tests/AsyncExceptionTests.cs index 82e323e97..290f9b213 100644 --- a/test/Microsoft.ComponentDetection.Common.Tests/AsyncExceptionTests.cs +++ b/test/Microsoft.ComponentDetection.Common.Tests/AsyncExceptionTests.cs @@ -3,7 +3,7 @@ namespace Microsoft.ComponentDetection.Common.Tests; using System; using System.Threading; using System.Threading.Tasks; -using FluentAssertions; +using AwesomeAssertions; using Microsoft.VisualStudio.TestTools.UnitTesting; [TestClass] diff --git a/test/Microsoft.ComponentDetection.Common.Tests/BaseDetectionTelemetryRecordTests.cs b/test/Microsoft.ComponentDetection.Common.Tests/BaseDetectionTelemetryRecordTests.cs index baa81598e..cd055f99e 100644 --- a/test/Microsoft.ComponentDetection.Common.Tests/BaseDetectionTelemetryRecordTests.cs +++ b/test/Microsoft.ComponentDetection.Common.Tests/BaseDetectionTelemetryRecordTests.cs @@ -6,7 +6,7 @@ namespace Microsoft.ComponentDetection.Common.Tests; using System.Net; using System.Reflection; using System.Runtime.Serialization; -using FluentAssertions; +using AwesomeAssertions; using Microsoft.ComponentDetection.Common.Telemetry.Records; using Microsoft.VisualStudio.TestTools.UnitTesting; @@ -41,7 +41,7 @@ public void UniqueRecordNames() recordName.Should().NotBeNullOrEmpty($"RecordName not set for {type.FullName}!"); - dic.Should().NotContainKey(recordName, "Duplicate RecordName:`{RecordName}` found for {TypeName}!", recordName, type.FullName); + dic.Should().NotContainKey(recordName, $"Duplicate RecordName:{recordName} found for {type.FullName}!"); dic.Add(recordName, type); } diff --git a/test/Microsoft.ComponentDetection.Common.Tests/CommandLineInvocationServiceTests.cs b/test/Microsoft.ComponentDetection.Common.Tests/CommandLineInvocationServiceTests.cs index b12b05af7..32e913c50 100644 --- a/test/Microsoft.ComponentDetection.Common.Tests/CommandLineInvocationServiceTests.cs +++ b/test/Microsoft.ComponentDetection.Common.Tests/CommandLineInvocationServiceTests.cs @@ -4,7 +4,7 @@ namespace Microsoft.ComponentDetection.Common.Tests; using System.IO; using System.Text; using System.Threading.Tasks; -using FluentAssertions; +using AwesomeAssertions; using Microsoft.ComponentDetection.TestsUtilities; using Microsoft.VisualStudio.TestTools.UnitTesting; diff --git a/test/Microsoft.ComponentDetection.Common.Tests/ComponentRecorderTests.cs b/test/Microsoft.ComponentDetection.Common.Tests/ComponentRecorderTests.cs index 0df33869d..a1e5378a7 100644 --- a/test/Microsoft.ComponentDetection.Common.Tests/ComponentRecorderTests.cs +++ b/test/Microsoft.ComponentDetection.Common.Tests/ComponentRecorderTests.cs @@ -2,7 +2,7 @@ namespace Microsoft.ComponentDetection.Common.Tests; using System; using System.Collections.Generic; -using FluentAssertions; +using AwesomeAssertions; using Microsoft.ComponentDetection.Common.DependencyGraph; using Microsoft.ComponentDetection.Contracts; using Microsoft.ComponentDetection.Contracts.BcdeModels; diff --git a/test/Microsoft.ComponentDetection.Common.Tests/ComponentStreamEnumerableTests.cs b/test/Microsoft.ComponentDetection.Common.Tests/ComponentStreamEnumerableTests.cs index 38f0a2cc4..3cc9e03a8 100644 --- a/test/Microsoft.ComponentDetection.Common.Tests/ComponentStreamEnumerableTests.cs +++ b/test/Microsoft.ComponentDetection.Common.Tests/ComponentStreamEnumerableTests.cs @@ -3,7 +3,7 @@ namespace Microsoft.ComponentDetection.Common.Tests; using System; using System.IO; using System.Linq; -using FluentAssertions; +using AwesomeAssertions; using Microsoft.Extensions.Logging; using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; diff --git a/test/Microsoft.ComponentDetection.Common.Tests/ConsoleWritingServiceTests.cs b/test/Microsoft.ComponentDetection.Common.Tests/ConsoleWritingServiceTests.cs index 6ff4bb842..5ec5911be 100644 --- a/test/Microsoft.ComponentDetection.Common.Tests/ConsoleWritingServiceTests.cs +++ b/test/Microsoft.ComponentDetection.Common.Tests/ConsoleWritingServiceTests.cs @@ -2,7 +2,7 @@ namespace Microsoft.ComponentDetection.Common.Tests; using System; using System.IO; -using FluentAssertions; +using AwesomeAssertions; using Microsoft.VisualStudio.TestTools.UnitTesting; [TestClass] diff --git a/test/Microsoft.ComponentDetection.Common.Tests/DependencyGraphTests.cs b/test/Microsoft.ComponentDetection.Common.Tests/DependencyGraphTests.cs index 334a92ff5..b244f8158 100644 --- a/test/Microsoft.ComponentDetection.Common.Tests/DependencyGraphTests.cs +++ b/test/Microsoft.ComponentDetection.Common.Tests/DependencyGraphTests.cs @@ -3,7 +3,7 @@ namespace Microsoft.ComponentDetection.Common.Tests; using System; using System.Collections.Generic; using System.Linq; -using FluentAssertions; +using AwesomeAssertions; using Microsoft.ComponentDetection.Common.DependencyGraph; using Microsoft.ComponentDetection.Contracts; using Microsoft.ComponentDetection.Contracts.TypedComponent; diff --git a/test/Microsoft.ComponentDetection.Common.Tests/DependencyScopeComparerTests.cs b/test/Microsoft.ComponentDetection.Common.Tests/DependencyScopeComparerTests.cs index e90809327..2bc5d7c1f 100644 --- a/test/Microsoft.ComponentDetection.Common.Tests/DependencyScopeComparerTests.cs +++ b/test/Microsoft.ComponentDetection.Common.Tests/DependencyScopeComparerTests.cs @@ -1,6 +1,6 @@ namespace Microsoft.ComponentDetection.Common.Tests; -using FluentAssertions; +using AwesomeAssertions; using Microsoft.ComponentDetection.Contracts.BcdeModels; using Microsoft.VisualStudio.TestTools.UnitTesting; using static Microsoft.ComponentDetection.Common.DependencyScopeComparer; diff --git a/test/Microsoft.ComponentDetection.Common.Tests/DirectoryUtilityServiceTests.cs b/test/Microsoft.ComponentDetection.Common.Tests/DirectoryUtilityServiceTests.cs index bc5baf7e6..7e826388f 100644 --- a/test/Microsoft.ComponentDetection.Common.Tests/DirectoryUtilityServiceTests.cs +++ b/test/Microsoft.ComponentDetection.Common.Tests/DirectoryUtilityServiceTests.cs @@ -1,7 +1,7 @@ namespace Microsoft.ComponentDetection.Common.Tests; using System.IO; -using FluentAssertions; +using AwesomeAssertions; using Microsoft.ComponentDetection.Common; using Microsoft.ComponentDetection.Contracts; using Microsoft.VisualStudio.TestTools.UnitTesting; diff --git a/test/Microsoft.ComponentDetection.Common.Tests/DockerReferenceUtilityTests.cs b/test/Microsoft.ComponentDetection.Common.Tests/DockerReferenceUtilityTests.cs index 044cefde3..df9742b8c 100644 --- a/test/Microsoft.ComponentDetection.Common.Tests/DockerReferenceUtilityTests.cs +++ b/test/Microsoft.ComponentDetection.Common.Tests/DockerReferenceUtilityTests.cs @@ -1,7 +1,7 @@ namespace Microsoft.ComponentDetection.Common.Tests; using System; -using FluentAssertions; +using AwesomeAssertions; using Microsoft.ComponentDetection.Contracts; using Microsoft.VisualStudio.TestTools.UnitTesting; diff --git a/test/Microsoft.ComponentDetection.Common.Tests/DockerServiceTests.cs b/test/Microsoft.ComponentDetection.Common.Tests/DockerServiceTests.cs index b203be826..3d1bf7535 100644 --- a/test/Microsoft.ComponentDetection.Common.Tests/DockerServiceTests.cs +++ b/test/Microsoft.ComponentDetection.Common.Tests/DockerServiceTests.cs @@ -2,8 +2,8 @@ namespace Microsoft.ComponentDetection.Common.Tests; using System; using System.Threading.Tasks; +using AwesomeAssertions; using Docker.DotNet.Models; -using FluentAssertions; using Microsoft.ComponentDetection.TestsUtilities; using Microsoft.Extensions.Logging; using Microsoft.VisualStudio.TestTools.UnitTesting; diff --git a/test/Microsoft.ComponentDetection.Common.Tests/EnvironmentVariableServiceTests.cs b/test/Microsoft.ComponentDetection.Common.Tests/EnvironmentVariableServiceTests.cs index ef7ad8ba9..5d6901783 100644 --- a/test/Microsoft.ComponentDetection.Common.Tests/EnvironmentVariableServiceTests.cs +++ b/test/Microsoft.ComponentDetection.Common.Tests/EnvironmentVariableServiceTests.cs @@ -1,7 +1,7 @@ namespace Microsoft.ComponentDetection.Common.Tests; using System; -using FluentAssertions; +using AwesomeAssertions; using Microsoft.VisualStudio.TestTools.UnitTesting; [TestClass] diff --git a/test/Microsoft.ComponentDetection.Common.Tests/FileEnumerationTests.cs b/test/Microsoft.ComponentDetection.Common.Tests/FileEnumerationTests.cs index ed88ef6af..dfbc0a31d 100644 --- a/test/Microsoft.ComponentDetection.Common.Tests/FileEnumerationTests.cs +++ b/test/Microsoft.ComponentDetection.Common.Tests/FileEnumerationTests.cs @@ -4,7 +4,7 @@ namespace Microsoft.ComponentDetection.Common.Tests; using System.Collections.Generic; using System.IO; using System.Runtime.InteropServices; -using FluentAssertions; +using AwesomeAssertions; using Microsoft.Extensions.Logging; using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; diff --git a/test/Microsoft.ComponentDetection.Common.Tests/FileUtilityServiceTests.cs b/test/Microsoft.ComponentDetection.Common.Tests/FileUtilityServiceTests.cs index fc02cea77..c6c2cc344 100644 --- a/test/Microsoft.ComponentDetection.Common.Tests/FileUtilityServiceTests.cs +++ b/test/Microsoft.ComponentDetection.Common.Tests/FileUtilityServiceTests.cs @@ -1,7 +1,7 @@ namespace Microsoft.ComponentDetection.Common.Tests; using System.IO; -using FluentAssertions; +using AwesomeAssertions; using Microsoft.ComponentDetection.Contracts; using Microsoft.VisualStudio.TestTools.UnitTesting; diff --git a/test/Microsoft.ComponentDetection.Common.Tests/FileWritingServiceTests.cs b/test/Microsoft.ComponentDetection.Common.Tests/FileWritingServiceTests.cs index eb0965c89..6d117b27e 100644 --- a/test/Microsoft.ComponentDetection.Common.Tests/FileWritingServiceTests.cs +++ b/test/Microsoft.ComponentDetection.Common.Tests/FileWritingServiceTests.cs @@ -4,7 +4,7 @@ namespace Microsoft.ComponentDetection.Common.Tests; using System.Collections.Generic; using System.Globalization; using System.IO; -using FluentAssertions; +using AwesomeAssertions; using Microsoft.ComponentDetection.Common.Exceptions; using Microsoft.VisualStudio.TestTools.UnitTesting; diff --git a/test/Microsoft.ComponentDetection.Common.Tests/LazyComponentStreamTests.cs b/test/Microsoft.ComponentDetection.Common.Tests/LazyComponentStreamTests.cs index fd5feba30..e5b841ef6 100644 --- a/test/Microsoft.ComponentDetection.Common.Tests/LazyComponentStreamTests.cs +++ b/test/Microsoft.ComponentDetection.Common.Tests/LazyComponentStreamTests.cs @@ -1,7 +1,7 @@ namespace Microsoft.ComponentDetection.Common.Tests; using System.IO; -using FluentAssertions; +using AwesomeAssertions; using Microsoft.Extensions.Logging; using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; diff --git a/test/Microsoft.ComponentDetection.Common.Tests/Microsoft.ComponentDetection.Common.Tests.csproj b/test/Microsoft.ComponentDetection.Common.Tests/Microsoft.ComponentDetection.Common.Tests.csproj index ff43771b0..fb0fe9727 100644 --- a/test/Microsoft.ComponentDetection.Common.Tests/Microsoft.ComponentDetection.Common.Tests.csproj +++ b/test/Microsoft.ComponentDetection.Common.Tests/Microsoft.ComponentDetection.Common.Tests.csproj @@ -6,7 +6,7 @@ - + diff --git a/test/Microsoft.ComponentDetection.Common.Tests/PathUtilityServiceTests.cs b/test/Microsoft.ComponentDetection.Common.Tests/PathUtilityServiceTests.cs index 4f38b2ba4..9917db854 100644 --- a/test/Microsoft.ComponentDetection.Common.Tests/PathUtilityServiceTests.cs +++ b/test/Microsoft.ComponentDetection.Common.Tests/PathUtilityServiceTests.cs @@ -1,6 +1,6 @@ namespace Microsoft.ComponentDetection.Common.Tests; -using FluentAssertions; +using AwesomeAssertions; using Microsoft.ComponentDetection.Common; using Microsoft.Extensions.Logging.Abstractions; using Microsoft.VisualStudio.TestTools.UnitTesting; diff --git a/test/Microsoft.ComponentDetection.Common.Tests/PatternMatchingUtilityTests.cs b/test/Microsoft.ComponentDetection.Common.Tests/PatternMatchingUtilityTests.cs index 4779fdaff..1f6a25404 100644 --- a/test/Microsoft.ComponentDetection.Common.Tests/PatternMatchingUtilityTests.cs +++ b/test/Microsoft.ComponentDetection.Common.Tests/PatternMatchingUtilityTests.cs @@ -1,6 +1,6 @@ namespace Microsoft.ComponentDetection.Common.Tests; -using FluentAssertions; +using AwesomeAssertions; using Microsoft.VisualStudio.TestTools.UnitTesting; [TestClass] diff --git a/test/Microsoft.ComponentDetection.Common.Tests/SafeFileEnumerableTests.cs b/test/Microsoft.ComponentDetection.Common.Tests/SafeFileEnumerableTests.cs index 1579128ca..48d6715b4 100644 --- a/test/Microsoft.ComponentDetection.Common.Tests/SafeFileEnumerableTests.cs +++ b/test/Microsoft.ComponentDetection.Common.Tests/SafeFileEnumerableTests.cs @@ -3,7 +3,7 @@ namespace Microsoft.ComponentDetection.Common.Tests; using System; using System.Collections.Generic; using System.IO; -using FluentAssertions; +using AwesomeAssertions; using Microsoft.ComponentDetection.Contracts; using Microsoft.ComponentDetection.TestsUtilities; using Microsoft.Extensions.Logging; diff --git a/test/Microsoft.ComponentDetection.Common.Tests/StringUtilitiesTests.cs b/test/Microsoft.ComponentDetection.Common.Tests/StringUtilitiesTests.cs index 62d8bd708..4759e5b6d 100644 --- a/test/Microsoft.ComponentDetection.Common.Tests/StringUtilitiesTests.cs +++ b/test/Microsoft.ComponentDetection.Common.Tests/StringUtilitiesTests.cs @@ -1,6 +1,6 @@ namespace Microsoft.ComponentDetection.Common.Tests; -using FluentAssertions; +using AwesomeAssertions; using Microsoft.VisualStudio.TestTools.UnitTesting; [TestClass] diff --git a/test/Microsoft.ComponentDetection.Common.Tests/TabularStringFormatTests.cs b/test/Microsoft.ComponentDetection.Common.Tests/TabularStringFormatTests.cs index 8d08dbb65..9fc5f002a 100644 --- a/test/Microsoft.ComponentDetection.Common.Tests/TabularStringFormatTests.cs +++ b/test/Microsoft.ComponentDetection.Common.Tests/TabularStringFormatTests.cs @@ -2,7 +2,7 @@ namespace Microsoft.ComponentDetection.Common.Tests; using System; using System.Linq; -using FluentAssertions; +using AwesomeAssertions; using Microsoft.VisualStudio.TestTools.UnitTesting; [TestClass] diff --git a/test/Microsoft.ComponentDetection.Contracts.Tests/DetectedComponentTests.cs b/test/Microsoft.ComponentDetection.Contracts.Tests/DetectedComponentTests.cs index 823442d07..41f1f8840 100644 --- a/test/Microsoft.ComponentDetection.Contracts.Tests/DetectedComponentTests.cs +++ b/test/Microsoft.ComponentDetection.Contracts.Tests/DetectedComponentTests.cs @@ -1,6 +1,6 @@ namespace Microsoft.ComponentDetection.Contracts.Tests; -using FluentAssertions; +using AwesomeAssertions; using Microsoft.ComponentDetection.Contracts.TypedComponent; using Microsoft.VisualStudio.TestTools.UnitTesting; diff --git a/test/Microsoft.ComponentDetection.Contracts.Tests/FileComponentDetectorWithCleanupTests.cs b/test/Microsoft.ComponentDetection.Contracts.Tests/FileComponentDetectorWithCleanupTests.cs index 116b8f62e..9cc72b69f 100644 --- a/test/Microsoft.ComponentDetection.Contracts.Tests/FileComponentDetectorWithCleanupTests.cs +++ b/test/Microsoft.ComponentDetection.Contracts.Tests/FileComponentDetectorWithCleanupTests.cs @@ -7,7 +7,7 @@ namespace Microsoft.ComponentDetection.Contracts.Tests; using System.Text.RegularExpressions; using System.Threading; using System.Threading.Tasks; -using FluentAssertions; +using AwesomeAssertions; using Microsoft.ComponentDetection.Contracts.Internal; using Microsoft.ComponentDetection.Contracts.TypedComponent; using Microsoft.Extensions.Logging; diff --git a/test/Microsoft.ComponentDetection.Contracts.Tests/Microsoft.ComponentDetection.Contracts.Tests.csproj b/test/Microsoft.ComponentDetection.Contracts.Tests/Microsoft.ComponentDetection.Contracts.Tests.csproj index 63e700222..790e95a8a 100644 --- a/test/Microsoft.ComponentDetection.Contracts.Tests/Microsoft.ComponentDetection.Contracts.Tests.csproj +++ b/test/Microsoft.ComponentDetection.Contracts.Tests/Microsoft.ComponentDetection.Contracts.Tests.csproj @@ -11,7 +11,7 @@ - + diff --git a/test/Microsoft.ComponentDetection.Contracts.Tests/PurlGenerationTests.cs b/test/Microsoft.ComponentDetection.Contracts.Tests/PurlGenerationTests.cs index a0834f7b7..6ae058131 100644 --- a/test/Microsoft.ComponentDetection.Contracts.Tests/PurlGenerationTests.cs +++ b/test/Microsoft.ComponentDetection.Contracts.Tests/PurlGenerationTests.cs @@ -1,6 +1,6 @@ namespace Microsoft.ComponentDetection.Contracts.Tests; -using FluentAssertions; +using AwesomeAssertions; using Microsoft.ComponentDetection.Contracts.TypedComponent; using Microsoft.VisualStudio.TestTools.UnitTesting; diff --git a/test/Microsoft.ComponentDetection.Contracts.Tests/ScanResultSerializationTests.cs b/test/Microsoft.ComponentDetection.Contracts.Tests/ScanResultSerializationTests.cs index c5e99c779..b077243e6 100644 --- a/test/Microsoft.ComponentDetection.Contracts.Tests/ScanResultSerializationTests.cs +++ b/test/Microsoft.ComponentDetection.Contracts.Tests/ScanResultSerializationTests.cs @@ -1,7 +1,7 @@ namespace Microsoft.ComponentDetection.Contracts.Tests; using System.Linq; -using FluentAssertions; +using AwesomeAssertions; using Microsoft.ComponentDetection.Contracts.BcdeModels; using Microsoft.ComponentDetection.Contracts.TypedComponent; using Microsoft.VisualStudio.TestTools.UnitTesting; diff --git a/test/Microsoft.ComponentDetection.Contracts.Tests/TypedComponentSerializationTests.cs b/test/Microsoft.ComponentDetection.Contracts.Tests/TypedComponentSerializationTests.cs index 27c3fb981..72564f27f 100644 --- a/test/Microsoft.ComponentDetection.Contracts.Tests/TypedComponentSerializationTests.cs +++ b/test/Microsoft.ComponentDetection.Contracts.Tests/TypedComponentSerializationTests.cs @@ -1,7 +1,7 @@ namespace Microsoft.ComponentDetection.Contracts.Tests; using System; -using FluentAssertions; +using AwesomeAssertions; using Microsoft.ComponentDetection.Contracts.Internal; using Microsoft.ComponentDetection.Contracts.TypedComponent; using Microsoft.VisualStudio.TestTools.UnitTesting; diff --git a/test/Microsoft.ComponentDetection.Detectors.Tests/ComponentDetectorTests.cs b/test/Microsoft.ComponentDetection.Detectors.Tests/ComponentDetectorTests.cs index 7543d7e46..d37c27423 100644 --- a/test/Microsoft.ComponentDetection.Detectors.Tests/ComponentDetectorTests.cs +++ b/test/Microsoft.ComponentDetection.Detectors.Tests/ComponentDetectorTests.cs @@ -2,7 +2,7 @@ namespace Microsoft.ComponentDetection.Detectors.Tests; using System.Collections.Generic; using System.Linq; -using FluentAssertions; +using AwesomeAssertions; using Microsoft.ComponentDetection.Contracts; using Microsoft.ComponentDetection.Orchestrator.Extensions; using Microsoft.Extensions.DependencyInjection; diff --git a/test/Microsoft.ComponentDetection.Detectors.Tests/ConanLockComponentDetectorTests.cs b/test/Microsoft.ComponentDetection.Detectors.Tests/ConanLockComponentDetectorTests.cs index b509188d6..7230bf26d 100644 --- a/test/Microsoft.ComponentDetection.Detectors.Tests/ConanLockComponentDetectorTests.cs +++ b/test/Microsoft.ComponentDetection.Detectors.Tests/ConanLockComponentDetectorTests.cs @@ -4,7 +4,7 @@ namespace Microsoft.ComponentDetection.Detectors.Tests; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using FluentAssertions; +using AwesomeAssertions; using Microsoft.ComponentDetection.Contracts; using Microsoft.ComponentDetection.Contracts.TypedComponent; using Microsoft.ComponentDetection.Detectors.Conan; diff --git a/test/Microsoft.ComponentDetection.Detectors.Tests/CondaLockComponentDetectorTests.cs b/test/Microsoft.ComponentDetection.Detectors.Tests/CondaLockComponentDetectorTests.cs index d404fd56b..8b26d2528 100644 --- a/test/Microsoft.ComponentDetection.Detectors.Tests/CondaLockComponentDetectorTests.cs +++ b/test/Microsoft.ComponentDetection.Detectors.Tests/CondaLockComponentDetectorTests.cs @@ -3,7 +3,7 @@ namespace Microsoft.ComponentDetection.Detectors.Tests; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using FluentAssertions; +using AwesomeAssertions; using Microsoft.ComponentDetection.Contracts; using Microsoft.ComponentDetection.Contracts.TypedComponent; using Microsoft.ComponentDetection.Detectors.Poetry; diff --git a/test/Microsoft.ComponentDetection.Detectors.Tests/DotNetComponentDetectorTests.cs b/test/Microsoft.ComponentDetection.Detectors.Tests/DotNetComponentDetectorTests.cs index 08c021b6b..5b68aa66e 100644 --- a/test/Microsoft.ComponentDetection.Detectors.Tests/DotNetComponentDetectorTests.cs +++ b/test/Microsoft.ComponentDetection.Detectors.Tests/DotNetComponentDetectorTests.cs @@ -11,7 +11,7 @@ namespace Microsoft.ComponentDetection.Detectors.Tests; using System.Text.RegularExpressions; using System.Threading; using System.Threading.Tasks; -using FluentAssertions; +using AwesomeAssertions; using global::NuGet.Frameworks; using global::NuGet.ProjectModel; using Microsoft.ComponentDetection.Contracts; diff --git a/test/Microsoft.ComponentDetection.Detectors.Tests/GoComponentDetectorTests.cs b/test/Microsoft.ComponentDetection.Detectors.Tests/GoComponentDetectorTests.cs index cd59e3d48..c9d07dd43 100644 --- a/test/Microsoft.ComponentDetection.Detectors.Tests/GoComponentDetectorTests.cs +++ b/test/Microsoft.ComponentDetection.Detectors.Tests/GoComponentDetectorTests.cs @@ -6,7 +6,7 @@ namespace Microsoft.ComponentDetection.Detectors.Tests; using System.Linq; using System.Threading; using System.Threading.Tasks; -using FluentAssertions; +using AwesomeAssertions; using Microsoft.ComponentDetection.Common.Telemetry.Records; using Microsoft.ComponentDetection.Contracts; using Microsoft.ComponentDetection.Contracts.BcdeModels; diff --git a/test/Microsoft.ComponentDetection.Detectors.Tests/GoComponentTests.cs b/test/Microsoft.ComponentDetection.Detectors.Tests/GoComponentTests.cs index 2075ae463..879244424 100644 --- a/test/Microsoft.ComponentDetection.Detectors.Tests/GoComponentTests.cs +++ b/test/Microsoft.ComponentDetection.Detectors.Tests/GoComponentTests.cs @@ -1,7 +1,7 @@ namespace Microsoft.ComponentDetection.Detectors.Tests; using System; -using FluentAssertions; +using AwesomeAssertions; using Microsoft.ComponentDetection.Contracts.TypedComponent; using Microsoft.VisualStudio.TestTools.UnitTesting; diff --git a/test/Microsoft.ComponentDetection.Detectors.Tests/GradleComponentDetectorTests.cs b/test/Microsoft.ComponentDetection.Detectors.Tests/GradleComponentDetectorTests.cs index 2a70a4673..fafda875c 100644 --- a/test/Microsoft.ComponentDetection.Detectors.Tests/GradleComponentDetectorTests.cs +++ b/test/Microsoft.ComponentDetection.Detectors.Tests/GradleComponentDetectorTests.cs @@ -5,7 +5,7 @@ namespace Microsoft.ComponentDetection.Detectors.Tests; using System.IO; using System.Linq; using System.Threading.Tasks; -using FluentAssertions; +using AwesomeAssertions; using Microsoft.ComponentDetection.Contracts; using Microsoft.ComponentDetection.Contracts.TypedComponent; using Microsoft.ComponentDetection.Detectors.Gradle; diff --git a/test/Microsoft.ComponentDetection.Detectors.Tests/IvyDetectorTests.cs b/test/Microsoft.ComponentDetection.Detectors.Tests/IvyDetectorTests.cs index 077c209cd..71d81274f 100644 --- a/test/Microsoft.ComponentDetection.Detectors.Tests/IvyDetectorTests.cs +++ b/test/Microsoft.ComponentDetection.Detectors.Tests/IvyDetectorTests.cs @@ -5,7 +5,7 @@ namespace Microsoft.ComponentDetection.Detectors.Tests; using System.IO; using System.Linq; using System.Threading.Tasks; -using FluentAssertions; +using AwesomeAssertions; using Microsoft.ComponentDetection.Contracts; using Microsoft.ComponentDetection.Contracts.TypedComponent; using Microsoft.ComponentDetection.Detectors.Ivy; diff --git a/test/Microsoft.ComponentDetection.Detectors.Tests/LinuxContainerDetectorTests.cs b/test/Microsoft.ComponentDetection.Detectors.Tests/LinuxContainerDetectorTests.cs index 94c2287fb..f4cfe6648 100644 --- a/test/Microsoft.ComponentDetection.Detectors.Tests/LinuxContainerDetectorTests.cs +++ b/test/Microsoft.ComponentDetection.Detectors.Tests/LinuxContainerDetectorTests.cs @@ -6,7 +6,7 @@ namespace Microsoft.ComponentDetection.Detectors.Tests; using System.Linq; using System.Threading; using System.Threading.Tasks; -using FluentAssertions; +using AwesomeAssertions; using Microsoft.ComponentDetection.Common.DependencyGraph; using Microsoft.ComponentDetection.Contracts; using Microsoft.ComponentDetection.Contracts.BcdeModels; diff --git a/test/Microsoft.ComponentDetection.Detectors.Tests/LinuxScannerTests.cs b/test/Microsoft.ComponentDetection.Detectors.Tests/LinuxScannerTests.cs index 2c352dfc2..56de075e5 100644 --- a/test/Microsoft.ComponentDetection.Detectors.Tests/LinuxScannerTests.cs +++ b/test/Microsoft.ComponentDetection.Detectors.Tests/LinuxScannerTests.cs @@ -4,7 +4,7 @@ namespace Microsoft.ComponentDetection.Detectors.Tests; using System.Linq; using System.Threading; using System.Threading.Tasks; -using FluentAssertions; +using AwesomeAssertions; using Microsoft.ComponentDetection.Contracts; using Microsoft.ComponentDetection.Contracts.BcdeModels; using Microsoft.ComponentDetection.Detectors.Linux; diff --git a/test/Microsoft.ComponentDetection.Detectors.Tests/MavenCommandServiceTests.cs b/test/Microsoft.ComponentDetection.Detectors.Tests/MavenCommandServiceTests.cs index 216230036..69e575be2 100644 --- a/test/Microsoft.ComponentDetection.Detectors.Tests/MavenCommandServiceTests.cs +++ b/test/Microsoft.ComponentDetection.Detectors.Tests/MavenCommandServiceTests.cs @@ -6,7 +6,7 @@ namespace Microsoft.ComponentDetection.Detectors.Tests; using System.Text; using System.Threading; using System.Threading.Tasks; -using FluentAssertions; +using AwesomeAssertions; using Microsoft.ComponentDetection.Common; using Microsoft.ComponentDetection.Contracts; using Microsoft.ComponentDetection.Contracts.Internal; diff --git a/test/Microsoft.ComponentDetection.Detectors.Tests/MavenParsingUtilitiesTests.cs b/test/Microsoft.ComponentDetection.Detectors.Tests/MavenParsingUtilitiesTests.cs index 5c7791fc9..683f30ca8 100644 --- a/test/Microsoft.ComponentDetection.Detectors.Tests/MavenParsingUtilitiesTests.cs +++ b/test/Microsoft.ComponentDetection.Detectors.Tests/MavenParsingUtilitiesTests.cs @@ -1,6 +1,6 @@ namespace Microsoft.ComponentDetection.Detectors.Tests; -using FluentAssertions; +using AwesomeAssertions; using Microsoft.ComponentDetection.Contracts.BcdeModels; using Microsoft.ComponentDetection.Contracts.TypedComponent; using Microsoft.VisualStudio.TestTools.UnitTesting; diff --git a/test/Microsoft.ComponentDetection.Detectors.Tests/MavenStyleDependencyGraphParserTests.cs b/test/Microsoft.ComponentDetection.Detectors.Tests/MavenStyleDependencyGraphParserTests.cs index 7612f5cd6..674357398 100644 --- a/test/Microsoft.ComponentDetection.Detectors.Tests/MavenStyleDependencyGraphParserTests.cs +++ b/test/Microsoft.ComponentDetection.Detectors.Tests/MavenStyleDependencyGraphParserTests.cs @@ -2,7 +2,7 @@ namespace Microsoft.ComponentDetection.Detectors.Tests; using System.IO; using System.Linq; -using FluentAssertions; +using AwesomeAssertions; using Microsoft.ComponentDetection.Common.DependencyGraph; using Microsoft.ComponentDetection.Detectors.Maven; using Microsoft.VisualStudio.TestTools.UnitTesting; diff --git a/test/Microsoft.ComponentDetection.Detectors.Tests/Microsoft.ComponentDetection.Detectors.Tests.csproj b/test/Microsoft.ComponentDetection.Detectors.Tests/Microsoft.ComponentDetection.Detectors.Tests.csproj index 03644cbfe..9ca58ea61 100644 --- a/test/Microsoft.ComponentDetection.Detectors.Tests/Microsoft.ComponentDetection.Detectors.Tests.csproj +++ b/test/Microsoft.ComponentDetection.Detectors.Tests/Microsoft.ComponentDetection.Detectors.Tests.csproj @@ -6,7 +6,7 @@ - + diff --git a/test/Microsoft.ComponentDetection.Detectors.Tests/MvnCliDetectorTests.cs b/test/Microsoft.ComponentDetection.Detectors.Tests/MvnCliDetectorTests.cs index 7adf0feed..6f2c4fe15 100644 --- a/test/Microsoft.ComponentDetection.Detectors.Tests/MvnCliDetectorTests.cs +++ b/test/Microsoft.ComponentDetection.Detectors.Tests/MvnCliDetectorTests.cs @@ -4,7 +4,7 @@ namespace Microsoft.ComponentDetection.Detectors.Tests; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using FluentAssertions; +using AwesomeAssertions; using Microsoft.ComponentDetection.Contracts; using Microsoft.ComponentDetection.Contracts.Internal; using Microsoft.ComponentDetection.Contracts.TypedComponent; diff --git a/test/Microsoft.ComponentDetection.Detectors.Tests/NpmDetectorTests.cs b/test/Microsoft.ComponentDetection.Detectors.Tests/NpmDetectorTests.cs index 6ad1c5a36..2010b3b58 100644 --- a/test/Microsoft.ComponentDetection.Detectors.Tests/NpmDetectorTests.cs +++ b/test/Microsoft.ComponentDetection.Detectors.Tests/NpmDetectorTests.cs @@ -3,7 +3,7 @@ namespace Microsoft.ComponentDetection.Detectors.Tests; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using FluentAssertions; +using AwesomeAssertions; using Microsoft.ComponentDetection.Contracts; using Microsoft.ComponentDetection.Contracts.TypedComponent; using Microsoft.ComponentDetection.Detectors.Npm; diff --git a/test/Microsoft.ComponentDetection.Detectors.Tests/NpmDetectorWithRootsTests.cs b/test/Microsoft.ComponentDetection.Detectors.Tests/NpmDetectorWithRootsTests.cs index 547654da8..3037422e1 100644 --- a/test/Microsoft.ComponentDetection.Detectors.Tests/NpmDetectorWithRootsTests.cs +++ b/test/Microsoft.ComponentDetection.Detectors.Tests/NpmDetectorWithRootsTests.cs @@ -5,7 +5,7 @@ namespace Microsoft.ComponentDetection.Detectors.Tests; using System.IO; using System.Linq; using System.Threading.Tasks; -using FluentAssertions; +using AwesomeAssertions; using Microsoft.ComponentDetection.Contracts; using Microsoft.ComponentDetection.Contracts.TypedComponent; using Microsoft.ComponentDetection.Detectors.Npm; diff --git a/test/Microsoft.ComponentDetection.Detectors.Tests/NpmLockfile3DetectorTests.cs b/test/Microsoft.ComponentDetection.Detectors.Tests/NpmLockfile3DetectorTests.cs index 61b08d35d..478235f1e 100644 --- a/test/Microsoft.ComponentDetection.Detectors.Tests/NpmLockfile3DetectorTests.cs +++ b/test/Microsoft.ComponentDetection.Detectors.Tests/NpmLockfile3DetectorTests.cs @@ -4,7 +4,7 @@ namespace Microsoft.ComponentDetection.Detectors.Tests; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using FluentAssertions; +using AwesomeAssertions; using Microsoft.ComponentDetection.Contracts; using Microsoft.ComponentDetection.Contracts.TypedComponent; using Microsoft.ComponentDetection.Detectors.Npm; diff --git a/test/Microsoft.ComponentDetection.Detectors.Tests/NpmUtilitiesTests.cs b/test/Microsoft.ComponentDetection.Detectors.Tests/NpmUtilitiesTests.cs index 580a970c2..94f02bdf5 100644 --- a/test/Microsoft.ComponentDetection.Detectors.Tests/NpmUtilitiesTests.cs +++ b/test/Microsoft.ComponentDetection.Detectors.Tests/NpmUtilitiesTests.cs @@ -1,7 +1,7 @@ namespace Microsoft.ComponentDetection.Detectors.Tests; using System.Linq; -using FluentAssertions; +using AwesomeAssertions; using Microsoft.ComponentDetection.Common.DependencyGraph; using Microsoft.ComponentDetection.Contracts; using Microsoft.ComponentDetection.Contracts.TypedComponent; diff --git a/test/Microsoft.ComponentDetection.Detectors.Tests/NuGetComponentDetectorTests.cs b/test/Microsoft.ComponentDetection.Detectors.Tests/NuGetComponentDetectorTests.cs index c58d74bc2..397b949f7 100644 --- a/test/Microsoft.ComponentDetection.Detectors.Tests/NuGetComponentDetectorTests.cs +++ b/test/Microsoft.ComponentDetection.Detectors.Tests/NuGetComponentDetectorTests.cs @@ -6,7 +6,7 @@ namespace Microsoft.ComponentDetection.Detectors.Tests; using System.Linq; using System.Reactive.Linq; using System.Threading.Tasks; -using FluentAssertions; +using AwesomeAssertions; using Microsoft.ComponentDetection.Common.DependencyGraph; using Microsoft.ComponentDetection.Contracts; using Microsoft.ComponentDetection.Contracts.Internal; diff --git a/test/Microsoft.ComponentDetection.Detectors.Tests/NuGetNuspecUtilitiesTests.cs b/test/Microsoft.ComponentDetection.Detectors.Tests/NuGetNuspecUtilitiesTests.cs index 81a3c85f0..4604f637c 100644 --- a/test/Microsoft.ComponentDetection.Detectors.Tests/NuGetNuspecUtilitiesTests.cs +++ b/test/Microsoft.ComponentDetection.Detectors.Tests/NuGetNuspecUtilitiesTests.cs @@ -4,7 +4,7 @@ namespace Microsoft.ComponentDetection.Detectors.Tests; using System.IO; using System.IO.Compression; using System.Threading.Tasks; -using FluentAssertions; +using AwesomeAssertions; using Microsoft.ComponentDetection.Detectors.NuGet; using Microsoft.VisualStudio.TestTools.UnitTesting; diff --git a/test/Microsoft.ComponentDetection.Detectors.Tests/NuGetProjectModelProjectCentricComponentDetectorTests.cs b/test/Microsoft.ComponentDetection.Detectors.Tests/NuGetProjectModelProjectCentricComponentDetectorTests.cs index 0915ff14d..463728e3c 100644 --- a/test/Microsoft.ComponentDetection.Detectors.Tests/NuGetProjectModelProjectCentricComponentDetectorTests.cs +++ b/test/Microsoft.ComponentDetection.Detectors.Tests/NuGetProjectModelProjectCentricComponentDetectorTests.cs @@ -4,7 +4,7 @@ namespace Microsoft.ComponentDetection.Detectors.Tests; using System.Linq; using System.Runtime.InteropServices; using System.Threading.Tasks; -using FluentAssertions; +using AwesomeAssertions; using Microsoft.ComponentDetection.Contracts; using Microsoft.ComponentDetection.Contracts.TypedComponent; using Microsoft.ComponentDetection.Detectors.NuGet; diff --git a/test/Microsoft.ComponentDetection.Detectors.Tests/PipCommandServiceTests.cs b/test/Microsoft.ComponentDetection.Detectors.Tests/PipCommandServiceTests.cs index 60b39f926..43c8fe4d8 100644 --- a/test/Microsoft.ComponentDetection.Detectors.Tests/PipCommandServiceTests.cs +++ b/test/Microsoft.ComponentDetection.Detectors.Tests/PipCommandServiceTests.cs @@ -6,7 +6,7 @@ namespace Microsoft.ComponentDetection.Detectors.Tests; using System.Linq; using System.Threading; using System.Threading.Tasks; -using FluentAssertions; +using AwesomeAssertions; using Microsoft.ComponentDetection.Common; using Microsoft.ComponentDetection.Contracts; using Microsoft.ComponentDetection.Detectors.Pip; diff --git a/test/Microsoft.ComponentDetection.Detectors.Tests/PipComponentDetectorTests.cs b/test/Microsoft.ComponentDetection.Detectors.Tests/PipComponentDetectorTests.cs index 944e47c33..956ed2f8b 100644 --- a/test/Microsoft.ComponentDetection.Detectors.Tests/PipComponentDetectorTests.cs +++ b/test/Microsoft.ComponentDetection.Detectors.Tests/PipComponentDetectorTests.cs @@ -5,7 +5,7 @@ namespace Microsoft.ComponentDetection.Detectors.Tests; using System.IO; using System.Linq; using System.Threading.Tasks; -using FluentAssertions; +using AwesomeAssertions; using Microsoft.ComponentDetection.Contracts; using Microsoft.ComponentDetection.Contracts.TypedComponent; using Microsoft.ComponentDetection.Detectors.Pip; diff --git a/test/Microsoft.ComponentDetection.Detectors.Tests/PipDependencySpecifierTests.cs b/test/Microsoft.ComponentDetection.Detectors.Tests/PipDependencySpecifierTests.cs index b9340e8cb..e400e716b 100644 --- a/test/Microsoft.ComponentDetection.Detectors.Tests/PipDependencySpecifierTests.cs +++ b/test/Microsoft.ComponentDetection.Detectors.Tests/PipDependencySpecifierTests.cs @@ -1,7 +1,7 @@ namespace Microsoft.ComponentDetection.Detectors.Tests; using System.Collections.Generic; -using FluentAssertions; +using AwesomeAssertions; using Microsoft.ComponentDetection.Detectors.Pip; using Microsoft.VisualStudio.TestTools.UnitTesting; diff --git a/test/Microsoft.ComponentDetection.Detectors.Tests/PipReportComponentDetectorTests.cs b/test/Microsoft.ComponentDetection.Detectors.Tests/PipReportComponentDetectorTests.cs index e0a212d95..dfe44ab98 100644 --- a/test/Microsoft.ComponentDetection.Detectors.Tests/PipReportComponentDetectorTests.cs +++ b/test/Microsoft.ComponentDetection.Detectors.Tests/PipReportComponentDetectorTests.cs @@ -6,7 +6,7 @@ namespace Microsoft.ComponentDetection.Detectors.Tests; using System.Linq; using System.Threading; using System.Threading.Tasks; -using FluentAssertions; +using AwesomeAssertions; using Microsoft.ComponentDetection.Common; using Microsoft.ComponentDetection.Contracts; using Microsoft.ComponentDetection.Contracts.TypedComponent; diff --git a/test/Microsoft.ComponentDetection.Detectors.Tests/PipReportUtilitiesTests.cs b/test/Microsoft.ComponentDetection.Detectors.Tests/PipReportUtilitiesTests.cs index a8cfcdfe9..378f6da79 100644 --- a/test/Microsoft.ComponentDetection.Detectors.Tests/PipReportUtilitiesTests.cs +++ b/test/Microsoft.ComponentDetection.Detectors.Tests/PipReportUtilitiesTests.cs @@ -1,6 +1,6 @@ namespace Microsoft.ComponentDetection.Detectors.Tests; -using FluentAssertions; +using AwesomeAssertions; using Microsoft.ComponentDetection.Detectors.Pip; using Microsoft.VisualStudio.TestTools.UnitTesting; diff --git a/test/Microsoft.ComponentDetection.Detectors.Tests/PipResolverTests.cs b/test/Microsoft.ComponentDetection.Detectors.Tests/PipResolverTests.cs index 9dcb19972..4a169f078 100644 --- a/test/Microsoft.ComponentDetection.Detectors.Tests/PipResolverTests.cs +++ b/test/Microsoft.ComponentDetection.Detectors.Tests/PipResolverTests.cs @@ -4,7 +4,7 @@ namespace Microsoft.ComponentDetection.Detectors.Tests; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using FluentAssertions; +using AwesomeAssertions; using Microsoft.ComponentDetection.Contracts; using Microsoft.ComponentDetection.Contracts.TypedComponent; using Microsoft.ComponentDetection.Detectors.Pip; diff --git a/test/Microsoft.ComponentDetection.Detectors.Tests/PnpmDetectorTests.cs b/test/Microsoft.ComponentDetection.Detectors.Tests/PnpmDetectorTests.cs index afc17655e..ce464df0b 100644 --- a/test/Microsoft.ComponentDetection.Detectors.Tests/PnpmDetectorTests.cs +++ b/test/Microsoft.ComponentDetection.Detectors.Tests/PnpmDetectorTests.cs @@ -4,7 +4,7 @@ namespace Microsoft.ComponentDetection.Detectors.Tests; using System.IO; using System.Linq; using System.Threading.Tasks; -using FluentAssertions; +using AwesomeAssertions; using Microsoft.ComponentDetection.Common.DependencyGraph; using Microsoft.ComponentDetection.Contracts; using Microsoft.ComponentDetection.Contracts.TypedComponent; diff --git a/test/Microsoft.ComponentDetection.Detectors.Tests/PnpmParsingUtilitiesTest.cs b/test/Microsoft.ComponentDetection.Detectors.Tests/PnpmParsingUtilitiesTest.cs index 6f87db271..e09c8fa41 100644 --- a/test/Microsoft.ComponentDetection.Detectors.Tests/PnpmParsingUtilitiesTest.cs +++ b/test/Microsoft.ComponentDetection.Detectors.Tests/PnpmParsingUtilitiesTest.cs @@ -1,7 +1,7 @@ namespace Microsoft.ComponentDetection.Detectors.Tests; using System; -using FluentAssertions; +using AwesomeAssertions; using Microsoft.ComponentDetection.Contracts.TypedComponent; using Microsoft.ComponentDetection.Detectors.Pnpm; using Microsoft.VisualStudio.TestTools.UnitTesting; diff --git a/test/Microsoft.ComponentDetection.Detectors.Tests/PodDetectorTest.cs b/test/Microsoft.ComponentDetection.Detectors.Tests/PodDetectorTest.cs index 82142065a..fb31297a3 100644 --- a/test/Microsoft.ComponentDetection.Detectors.Tests/PodDetectorTest.cs +++ b/test/Microsoft.ComponentDetection.Detectors.Tests/PodDetectorTest.cs @@ -5,7 +5,7 @@ namespace Microsoft.ComponentDetection.Detectors.Tests; using System.IO; using System.Linq; using System.Threading.Tasks; -using FluentAssertions; +using AwesomeAssertions; using Microsoft.ComponentDetection.Contracts; using Microsoft.ComponentDetection.Contracts.TypedComponent; using Microsoft.ComponentDetection.Detectors.CocoaPods; diff --git a/test/Microsoft.ComponentDetection.Detectors.Tests/PoetryComponentDetectorTests.cs b/test/Microsoft.ComponentDetection.Detectors.Tests/PoetryComponentDetectorTests.cs index 155e28582..d2d04b7cf 100644 --- a/test/Microsoft.ComponentDetection.Detectors.Tests/PoetryComponentDetectorTests.cs +++ b/test/Microsoft.ComponentDetection.Detectors.Tests/PoetryComponentDetectorTests.cs @@ -3,7 +3,7 @@ namespace Microsoft.ComponentDetection.Detectors.Tests; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using FluentAssertions; +using AwesomeAssertions; using Microsoft.ComponentDetection.Contracts; using Microsoft.ComponentDetection.Contracts.TypedComponent; using Microsoft.ComponentDetection.Detectors.Poetry; diff --git a/test/Microsoft.ComponentDetection.Detectors.Tests/PyPiClientTests.cs b/test/Microsoft.ComponentDetection.Detectors.Tests/PyPiClientTests.cs index 08529c4e5..643e3ba97 100644 --- a/test/Microsoft.ComponentDetection.Detectors.Tests/PyPiClientTests.cs +++ b/test/Microsoft.ComponentDetection.Detectors.Tests/PyPiClientTests.cs @@ -8,7 +8,7 @@ namespace Microsoft.ComponentDetection.Detectors.Tests; using System.Net.Http; using System.Threading; using System.Threading.Tasks; -using FluentAssertions; +using AwesomeAssertions; using Microsoft.ComponentDetection.Common; using Microsoft.ComponentDetection.Contracts; using Microsoft.ComponentDetection.Detectors.Pip; diff --git a/test/Microsoft.ComponentDetection.Detectors.Tests/PythonCommandServiceTests.cs b/test/Microsoft.ComponentDetection.Detectors.Tests/PythonCommandServiceTests.cs index 6bcc357a5..68bbf0fbd 100644 --- a/test/Microsoft.ComponentDetection.Detectors.Tests/PythonCommandServiceTests.cs +++ b/test/Microsoft.ComponentDetection.Detectors.Tests/PythonCommandServiceTests.cs @@ -5,7 +5,7 @@ namespace Microsoft.ComponentDetection.Detectors.Tests; using System.IO; using System.Linq; using System.Threading.Tasks; -using FluentAssertions; +using AwesomeAssertions; using Microsoft.ComponentDetection.Common; using Microsoft.ComponentDetection.Contracts; using Microsoft.ComponentDetection.Contracts.TypedComponent; diff --git a/test/Microsoft.ComponentDetection.Detectors.Tests/PythonVersionTests.cs b/test/Microsoft.ComponentDetection.Detectors.Tests/PythonVersionTests.cs index 3b57b6fbd..9b105eabb 100644 --- a/test/Microsoft.ComponentDetection.Detectors.Tests/PythonVersionTests.cs +++ b/test/Microsoft.ComponentDetection.Detectors.Tests/PythonVersionTests.cs @@ -3,7 +3,7 @@ namespace Microsoft.ComponentDetection.Detectors.Tests; using System; using System.Collections.Generic; using System.Linq; -using FluentAssertions; +using AwesomeAssertions; using Microsoft.ComponentDetection.Detectors.Pip; using Microsoft.VisualStudio.TestTools.UnitTesting; diff --git a/test/Microsoft.ComponentDetection.Detectors.Tests/RubyDetectorTest.cs b/test/Microsoft.ComponentDetection.Detectors.Tests/RubyDetectorTest.cs index b35379bd8..b726e9cf6 100644 --- a/test/Microsoft.ComponentDetection.Detectors.Tests/RubyDetectorTest.cs +++ b/test/Microsoft.ComponentDetection.Detectors.Tests/RubyDetectorTest.cs @@ -4,7 +4,7 @@ namespace Microsoft.ComponentDetection.Detectors.Tests; using System.IO; using System.Linq; using System.Threading.Tasks; -using FluentAssertions; +using AwesomeAssertions; using Microsoft.ComponentDetection.Common.DependencyGraph; using Microsoft.ComponentDetection.Contracts; using Microsoft.ComponentDetection.Contracts.TypedComponent; diff --git a/test/Microsoft.ComponentDetection.Detectors.Tests/RustCargoLockParserTests.cs b/test/Microsoft.ComponentDetection.Detectors.Tests/RustCargoLockParserTests.cs index 4a2c398b7..8201578be 100644 --- a/test/Microsoft.ComponentDetection.Detectors.Tests/RustCargoLockParserTests.cs +++ b/test/Microsoft.ComponentDetection.Detectors.Tests/RustCargoLockParserTests.cs @@ -6,7 +6,7 @@ namespace Microsoft.ComponentDetection.Detectors.Tests; using System.Text; using System.Threading; using System.Threading.Tasks; -using FluentAssertions; +using AwesomeAssertions; using Microsoft.ComponentDetection.Common; using Microsoft.ComponentDetection.Contracts; using Microsoft.ComponentDetection.Detectors.Rust; @@ -188,7 +188,7 @@ public async Task LocalParentDependsOnRemoteChild_ChildMarkedExplicitThroughEdge var (usages, explicitRoots, edges, failures) = Analyze(recorder); // child initial + explicit (from local parent edge) =2 usages, no Pass3 root (child is dependency) - usages.Should().BeGreaterOrEqualTo(2); + usages.Should().BeGreaterThanOrEqualTo(2); explicitRoots.Should().Be(1); // the explicit edge registration edges.Should().Be(0); // edge from local parent recorded as root usage (no parentComponentId) failures.Should().Be(0); @@ -590,8 +590,8 @@ public async Task MixedLocalAndRemote_ComplexGraph() // remote-dep: initial + explicit (from local-root) = 2 // remote-leaf: initial (local-intermediate ignored as parent) = 1 // remote-leaf should be marked as root since local parent edge doesn't count - usages.Should().BeGreaterOrEqualTo(3); - explicitRoots.Should().BeGreaterOrEqualTo(1); + usages.Should().BeGreaterThanOrEqualTo(3); + explicitRoots.Should().BeGreaterThanOrEqualTo(1); failures.Should().Be(0); } diff --git a/test/Microsoft.ComponentDetection.Detectors.Tests/RustCliParserTests.cs b/test/Microsoft.ComponentDetection.Detectors.Tests/RustCliParserTests.cs index 18e75b9d4..03f5ca896 100644 --- a/test/Microsoft.ComponentDetection.Detectors.Tests/RustCliParserTests.cs +++ b/test/Microsoft.ComponentDetection.Detectors.Tests/RustCliParserTests.cs @@ -7,7 +7,7 @@ namespace Microsoft.ComponentDetection.Detectors.Tests; using System.Text; using System.Threading; using System.Threading.Tasks; -using FluentAssertions; +using AwesomeAssertions; using Microsoft.ComponentDetection.Common; using Microsoft.ComponentDetection.Contracts; using Microsoft.ComponentDetection.Contracts.BcdeModels; @@ -591,7 +591,7 @@ public async Task ParseAsync_MultipleTransitiveLevels_CorrectParentChildRelation var registrations = recorder.Invocations.Where(i => i.Method.Name == "RegisterUsage").ToList(); // Should have registrations with proper parent relationships - registrations.Should().HaveCountGreaterOrEqualTo(3); + registrations.Should().HaveCountGreaterThanOrEqualTo(3); // Verify at least one registration has a parent component ID registrations.Should().Contain(r => r.Arguments[2] != null && !string.IsNullOrEmpty((string)r.Arguments[2])); @@ -646,7 +646,7 @@ public async Task ParseAsync_DiamondDependency_HandledCorrectly() var sharedRegistrations = registrations.Where(r => ((CargoComponent)((DetectedComponent)r.Arguments[0]).Component).Name == "shared").ToList(); - sharedRegistrations.Should().HaveCountGreaterOrEqualTo(1); + sharedRegistrations.Should().HaveCountGreaterThanOrEqualTo(1); } [TestMethod] @@ -1001,7 +1001,7 @@ public async Task ApplyOwners_EmptyOwnersSet_UsesFallback() result.Success.Should().BeTrue(); // Should use fallback for childA since owners set is empty - fallback.Invocations.Count(i => i.Method.Name == "RegisterUsage").Should().BeGreaterOrEqualTo(1); + fallback.Invocations.Count(i => i.Method.Name == "RegisterUsage").Should().BeGreaterThanOrEqualTo(1); } [TestMethod] diff --git a/test/Microsoft.ComponentDetection.Detectors.Tests/RustDependencySpecifierTest.cs b/test/Microsoft.ComponentDetection.Detectors.Tests/RustDependencySpecifierTest.cs index 54e79451a..a3d45a945 100644 --- a/test/Microsoft.ComponentDetection.Detectors.Tests/RustDependencySpecifierTest.cs +++ b/test/Microsoft.ComponentDetection.Detectors.Tests/RustDependencySpecifierTest.cs @@ -1,7 +1,7 @@ namespace Microsoft.ComponentDetection.Detectors.Tests; using System.Collections.Generic; -using FluentAssertions; +using AwesomeAssertions; using Microsoft.ComponentDetection.Detectors.Rust; using Microsoft.ComponentDetection.Detectors.Rust.Contracts; using Microsoft.VisualStudio.TestTools.UnitTesting; diff --git a/test/Microsoft.ComponentDetection.Detectors.Tests/RustMetadataContextBuilderTests.cs b/test/Microsoft.ComponentDetection.Detectors.Tests/RustMetadataContextBuilderTests.cs index 7dfbd3657..e107c4a87 100644 --- a/test/Microsoft.ComponentDetection.Detectors.Tests/RustMetadataContextBuilderTests.cs +++ b/test/Microsoft.ComponentDetection.Detectors.Tests/RustMetadataContextBuilderTests.cs @@ -2,7 +2,7 @@ namespace Microsoft.ComponentDetection.Detectors.Tests; using System.Threading; using System.Threading.Tasks; -using FluentAssertions; +using AwesomeAssertions; using Microsoft.ComponentDetection.Common; using Microsoft.ComponentDetection.Contracts; using Microsoft.ComponentDetection.Detectors.Rust; diff --git a/test/Microsoft.ComponentDetection.Detectors.Tests/RustSbomDetectorTests.cs b/test/Microsoft.ComponentDetection.Detectors.Tests/RustSbomDetectorTests.cs index 7ff86a497..980eaeafc 100644 --- a/test/Microsoft.ComponentDetection.Detectors.Tests/RustSbomDetectorTests.cs +++ b/test/Microsoft.ComponentDetection.Detectors.Tests/RustSbomDetectorTests.cs @@ -6,7 +6,7 @@ namespace Microsoft.ComponentDetection.Detectors.Tests; using System.Linq; using System.Threading; using System.Threading.Tasks; -using FluentAssertions; +using AwesomeAssertions; using Microsoft.ComponentDetection.Common; using Microsoft.ComponentDetection.Contracts; using Microsoft.ComponentDetection.Contracts.TypedComponent; diff --git a/test/Microsoft.ComponentDetection.Detectors.Tests/RustSbomParserTests.cs b/test/Microsoft.ComponentDetection.Detectors.Tests/RustSbomParserTests.cs index 9b0d5fcaa..65f66274d 100644 --- a/test/Microsoft.ComponentDetection.Detectors.Tests/RustSbomParserTests.cs +++ b/test/Microsoft.ComponentDetection.Detectors.Tests/RustSbomParserTests.cs @@ -6,7 +6,7 @@ namespace Microsoft.ComponentDetection.Detectors.Tests; using System.Linq; using System.Text; using System.Threading.Tasks; -using FluentAssertions; +using AwesomeAssertions; using Microsoft.ComponentDetection.Common; using Microsoft.ComponentDetection.Contracts; using Microsoft.ComponentDetection.Contracts.TypedComponent; @@ -667,7 +667,7 @@ public async Task ParseAsync_DiamondDependency_HandledCorrectly() var sharedRegistrations = registrations.Where(r => ((CargoComponent)((DetectedComponent)r.Arguments[0]).Component).Name == "shared").ToList(); - sharedRegistrations.Should().HaveCountGreaterOrEqualTo(1); + sharedRegistrations.Should().HaveCountGreaterThanOrEqualTo(1); } [TestMethod] diff --git a/test/Microsoft.ComponentDetection.Detectors.Tests/SPDX22ComponentDetectorTests.cs b/test/Microsoft.ComponentDetection.Detectors.Tests/SPDX22ComponentDetectorTests.cs index eccbd4194..ac52fb60c 100644 --- a/test/Microsoft.ComponentDetection.Detectors.Tests/SPDX22ComponentDetectorTests.cs +++ b/test/Microsoft.ComponentDetection.Detectors.Tests/SPDX22ComponentDetectorTests.cs @@ -7,7 +7,7 @@ namespace Microsoft.ComponentDetection.Detectors.Tests; using System.Security.Cryptography; using System.Text; using System.Threading.Tasks; -using FluentAssertions; +using AwesomeAssertions; using Microsoft.ComponentDetection.Common.DependencyGraph; using Microsoft.ComponentDetection.Contracts; using Microsoft.ComponentDetection.Contracts.TypedComponent; diff --git a/test/Microsoft.ComponentDetection.Detectors.Tests/SimplePipComponentDetectorTests.cs b/test/Microsoft.ComponentDetection.Detectors.Tests/SimplePipComponentDetectorTests.cs index fb0505129..e5d389808 100644 --- a/test/Microsoft.ComponentDetection.Detectors.Tests/SimplePipComponentDetectorTests.cs +++ b/test/Microsoft.ComponentDetection.Detectors.Tests/SimplePipComponentDetectorTests.cs @@ -5,7 +5,7 @@ namespace Microsoft.ComponentDetection.Detectors.Tests; using System.IO; using System.Linq; using System.Threading.Tasks; -using FluentAssertions; +using AwesomeAssertions; using Microsoft.ComponentDetection.Contracts; using Microsoft.ComponentDetection.Contracts.TypedComponent; using Microsoft.ComponentDetection.Detectors.Pip; diff --git a/test/Microsoft.ComponentDetection.Detectors.Tests/SimplePypiClientTests.cs b/test/Microsoft.ComponentDetection.Detectors.Tests/SimplePypiClientTests.cs index f46ccb74d..3bdf0f28e 100644 --- a/test/Microsoft.ComponentDetection.Detectors.Tests/SimplePypiClientTests.cs +++ b/test/Microsoft.ComponentDetection.Detectors.Tests/SimplePypiClientTests.cs @@ -6,7 +6,7 @@ namespace Microsoft.ComponentDetection.Detectors.Tests; using System.Net.Http; using System.Threading; using System.Threading.Tasks; -using FluentAssertions; +using AwesomeAssertions; using Microsoft.ComponentDetection.Common; using Microsoft.ComponentDetection.Contracts; using Microsoft.ComponentDetection.Detectors.Pip; diff --git a/test/Microsoft.ComponentDetection.Detectors.Tests/SimplePythonResolverTests.cs b/test/Microsoft.ComponentDetection.Detectors.Tests/SimplePythonResolverTests.cs index 71201aa8d..0657a0aff 100644 --- a/test/Microsoft.ComponentDetection.Detectors.Tests/SimplePythonResolverTests.cs +++ b/test/Microsoft.ComponentDetection.Detectors.Tests/SimplePythonResolverTests.cs @@ -7,7 +7,7 @@ namespace Microsoft.ComponentDetection.Detectors.Tests; using System.Linq; using System.Text; using System.Threading.Tasks; -using FluentAssertions; +using AwesomeAssertions; using Microsoft.ComponentDetection.Contracts; using Microsoft.ComponentDetection.Contracts.TypedComponent; using Microsoft.ComponentDetection.Detectors.Pip; diff --git a/test/Microsoft.ComponentDetection.Detectors.Tests/SwiftComponentTests.cs b/test/Microsoft.ComponentDetection.Detectors.Tests/SwiftComponentTests.cs index 09a13274a..9ce167af9 100644 --- a/test/Microsoft.ComponentDetection.Detectors.Tests/SwiftComponentTests.cs +++ b/test/Microsoft.ComponentDetection.Detectors.Tests/SwiftComponentTests.cs @@ -2,7 +2,7 @@ namespace Microsoft.ComponentDetection.Detectors.Tests.Swift; using System; using System.Collections.Generic; -using FluentAssertions; +using AwesomeAssertions; using Microsoft.ComponentDetection.Contracts.TypedComponent; using Microsoft.VisualStudio.TestTools.UnitTesting; using PackageUrl; diff --git a/test/Microsoft.ComponentDetection.Detectors.Tests/SwiftResolvedDetectorTests.cs b/test/Microsoft.ComponentDetection.Detectors.Tests/SwiftResolvedDetectorTests.cs index 6cfb54f78..8248cf8b7 100644 --- a/test/Microsoft.ComponentDetection.Detectors.Tests/SwiftResolvedDetectorTests.cs +++ b/test/Microsoft.ComponentDetection.Detectors.Tests/SwiftResolvedDetectorTests.cs @@ -3,7 +3,7 @@ namespace Microsoft.ComponentDetection.Detectors.Tests.Swift; using System; using System.Linq; using System.Threading.Tasks; -using FluentAssertions; +using AwesomeAssertions; using Microsoft.ComponentDetection.Contracts; using Microsoft.ComponentDetection.Contracts.TypedComponent; using Microsoft.ComponentDetection.Detectors.Swift; diff --git a/test/Microsoft.ComponentDetection.Detectors.Tests/Utilities/ComponentRecorderTestUtilities.cs b/test/Microsoft.ComponentDetection.Detectors.Tests/Utilities/ComponentRecorderTestUtilities.cs index bcd189b9c..6efffdc17 100644 --- a/test/Microsoft.ComponentDetection.Detectors.Tests/Utilities/ComponentRecorderTestUtilities.cs +++ b/test/Microsoft.ComponentDetection.Detectors.Tests/Utilities/ComponentRecorderTestUtilities.cs @@ -3,7 +3,7 @@ namespace Microsoft.ComponentDetection.Detectors.Tests.Utilities; using System; using System.Collections.Generic; using System.Linq; -using FluentAssertions; +using AwesomeAssertions; using Microsoft.ComponentDetection.Contracts; using Microsoft.ComponentDetection.Contracts.TypedComponent; using Newtonsoft.Json; diff --git a/test/Microsoft.ComponentDetection.Detectors.Tests/UvLockDetectorTests.cs b/test/Microsoft.ComponentDetection.Detectors.Tests/UvLockDetectorTests.cs index 19cf0cc7a..2e9d2a413 100644 --- a/test/Microsoft.ComponentDetection.Detectors.Tests/UvLockDetectorTests.cs +++ b/test/Microsoft.ComponentDetection.Detectors.Tests/UvLockDetectorTests.cs @@ -3,7 +3,7 @@ namespace Microsoft.ComponentDetection.Detectors.Tests; using System; using System.Linq; using System.Threading.Tasks; -using FluentAssertions; +using AwesomeAssertions; using Microsoft.ComponentDetection.Contracts; using Microsoft.ComponentDetection.Contracts.TypedComponent; using Microsoft.ComponentDetection.Detectors.Uv; diff --git a/test/Microsoft.ComponentDetection.Detectors.Tests/UvLockTests.cs b/test/Microsoft.ComponentDetection.Detectors.Tests/UvLockTests.cs index fea14df3d..9ebc6731d 100644 --- a/test/Microsoft.ComponentDetection.Detectors.Tests/UvLockTests.cs +++ b/test/Microsoft.ComponentDetection.Detectors.Tests/UvLockTests.cs @@ -4,7 +4,7 @@ namespace Microsoft.ComponentDetection.Detectors.Tests using System.IO; using System.Linq; using System.Text; - using FluentAssertions; + using AwesomeAssertions; using Microsoft.ComponentDetection.Detectors.Uv; using Microsoft.VisualStudio.TestTools.UnitTesting; using Tomlyn.Model; diff --git a/test/Microsoft.ComponentDetection.Detectors.Tests/VcpkgComponentDetectorTests.cs b/test/Microsoft.ComponentDetection.Detectors.Tests/VcpkgComponentDetectorTests.cs index 6a3cc07d2..1ebafb59f 100644 --- a/test/Microsoft.ComponentDetection.Detectors.Tests/VcpkgComponentDetectorTests.cs +++ b/test/Microsoft.ComponentDetection.Detectors.Tests/VcpkgComponentDetectorTests.cs @@ -5,7 +5,7 @@ namespace Microsoft.ComponentDetection.Detectors.Tests; using System.IO; using System.Linq; using System.Threading.Tasks; -using FluentAssertions; +using AwesomeAssertions; using Microsoft.ComponentDetection.Common.DependencyGraph; using Microsoft.ComponentDetection.Contracts; using Microsoft.ComponentDetection.Contracts.TypedComponent; diff --git a/test/Microsoft.ComponentDetection.Detectors.Tests/Yarn/YarnBerryTypeConverterTests.cs b/test/Microsoft.ComponentDetection.Detectors.Tests/Yarn/YarnBerryTypeConverterTests.cs index 2638b05b0..d36d805d8 100644 --- a/test/Microsoft.ComponentDetection.Detectors.Tests/Yarn/YarnBerryTypeConverterTests.cs +++ b/test/Microsoft.ComponentDetection.Detectors.Tests/Yarn/YarnBerryTypeConverterTests.cs @@ -1,6 +1,6 @@ namespace Microsoft.ComponentDetection.Detectors.Tests.Yarn; -using FluentAssertions; +using AwesomeAssertions; using Microsoft.ComponentDetection.Detectors.Yarn.Contracts; using Microsoft.VisualStudio.TestTools.UnitTesting; using YamlDotNet.Serialization; diff --git a/test/Microsoft.ComponentDetection.Detectors.Tests/YarnBlockFileTests.cs b/test/Microsoft.ComponentDetection.Detectors.Tests/YarnBlockFileTests.cs index 868db27cd..a4adf4a51 100644 --- a/test/Microsoft.ComponentDetection.Detectors.Tests/YarnBlockFileTests.cs +++ b/test/Microsoft.ComponentDetection.Detectors.Tests/YarnBlockFileTests.cs @@ -4,7 +4,7 @@ namespace Microsoft.ComponentDetection.Detectors.Tests; using System.IO; using System.Linq; using System.Threading.Tasks; -using FluentAssertions; +using AwesomeAssertions; using Microsoft.ComponentDetection.Detectors.Yarn; using Microsoft.ComponentDetection.Detectors.Yarn.Parsers; using Microsoft.VisualStudio.TestTools.UnitTesting; diff --git a/test/Microsoft.ComponentDetection.Detectors.Tests/YarnLockDetectorTests.cs b/test/Microsoft.ComponentDetection.Detectors.Tests/YarnLockDetectorTests.cs index e8d1cd7ed..5fbc5de3d 100644 --- a/test/Microsoft.ComponentDetection.Detectors.Tests/YarnLockDetectorTests.cs +++ b/test/Microsoft.ComponentDetection.Detectors.Tests/YarnLockDetectorTests.cs @@ -6,7 +6,7 @@ namespace Microsoft.ComponentDetection.Detectors.Tests; using System.Linq; using System.Text; using System.Threading.Tasks; -using FluentAssertions; +using AwesomeAssertions; using Microsoft.ComponentDetection.Common; using Microsoft.ComponentDetection.Contracts; using Microsoft.ComponentDetection.Contracts.TypedComponent; diff --git a/test/Microsoft.ComponentDetection.Detectors.Tests/YarnParserTests.cs b/test/Microsoft.ComponentDetection.Detectors.Tests/YarnParserTests.cs index f4e835406..d8b68370c 100644 --- a/test/Microsoft.ComponentDetection.Detectors.Tests/YarnParserTests.cs +++ b/test/Microsoft.ComponentDetection.Detectors.Tests/YarnParserTests.cs @@ -3,7 +3,7 @@ namespace Microsoft.ComponentDetection.Detectors.Tests; using System; using System.Collections.Generic; using System.Linq; -using FluentAssertions; +using AwesomeAssertions; using Microsoft.ComponentDetection.Contracts; using Microsoft.ComponentDetection.Detectors.Yarn; using Microsoft.ComponentDetection.Detectors.Yarn.Parsers; diff --git a/test/Microsoft.ComponentDetection.Detectors.Tests/nuget/NuGetPackagesConfigDetectorTests.cs b/test/Microsoft.ComponentDetection.Detectors.Tests/nuget/NuGetPackagesConfigDetectorTests.cs index 29281a1cb..e06d62413 100644 --- a/test/Microsoft.ComponentDetection.Detectors.Tests/nuget/NuGetPackagesConfigDetectorTests.cs +++ b/test/Microsoft.ComponentDetection.Detectors.Tests/nuget/NuGetPackagesConfigDetectorTests.cs @@ -1,7 +1,7 @@ namespace Microsoft.ComponentDetection.Detectors.Tests.NuGet; using System.Threading.Tasks; -using FluentAssertions; +using AwesomeAssertions; using Microsoft.ComponentDetection.Contracts; using Microsoft.ComponentDetection.Contracts.TypedComponent; using Microsoft.ComponentDetection.Detectors.NuGet; diff --git a/test/Microsoft.ComponentDetection.Orchestrator.Tests/Commands/BaseSettingsTests.cs b/test/Microsoft.ComponentDetection.Orchestrator.Tests/Commands/BaseSettingsTests.cs index 0c129fe0a..fa6b20aed 100644 --- a/test/Microsoft.ComponentDetection.Orchestrator.Tests/Commands/BaseSettingsTests.cs +++ b/test/Microsoft.ComponentDetection.Orchestrator.Tests/Commands/BaseSettingsTests.cs @@ -1,7 +1,7 @@ namespace Microsoft.ComponentDetection.Orchestrator.Tests.Commands; using System.IO; -using FluentAssertions; +using AwesomeAssertions; using Microsoft.ComponentDetection.Orchestrator.Commands; using Microsoft.VisualStudio.TestTools.UnitTesting; diff --git a/test/Microsoft.ComponentDetection.Orchestrator.Tests/Commands/InterceptorTests.cs b/test/Microsoft.ComponentDetection.Orchestrator.Tests/Commands/InterceptorTests.cs index ef1f2f8fb..932e2a73c 100644 --- a/test/Microsoft.ComponentDetection.Orchestrator.Tests/Commands/InterceptorTests.cs +++ b/test/Microsoft.ComponentDetection.Orchestrator.Tests/Commands/InterceptorTests.cs @@ -1,7 +1,7 @@ namespace Microsoft.ComponentDetection.Orchestrator.Tests.Commands; using System.Collections.Generic; -using FluentAssertions; +using AwesomeAssertions; using Microsoft.ComponentDetection.Common.Telemetry; using Microsoft.ComponentDetection.Orchestrator.Commands; using Microsoft.VisualStudio.TestTools.UnitTesting; diff --git a/test/Microsoft.ComponentDetection.Orchestrator.Tests/Commands/ListDetectorCommandTests.cs b/test/Microsoft.ComponentDetection.Orchestrator.Tests/Commands/ListDetectorCommandTests.cs index 1855e7dea..8236c9444 100644 --- a/test/Microsoft.ComponentDetection.Orchestrator.Tests/Commands/ListDetectorCommandTests.cs +++ b/test/Microsoft.ComponentDetection.Orchestrator.Tests/Commands/ListDetectorCommandTests.cs @@ -3,7 +3,7 @@ namespace Microsoft.ComponentDetection.Orchestrator.Tests.Commands; using System.Collections.Generic; using System.Linq; using System.Threading; -using FluentAssertions; +using AwesomeAssertions; using Microsoft.ComponentDetection.Contracts; using Microsoft.ComponentDetection.Orchestrator.Commands; using Microsoft.VisualStudio.TestTools.UnitTesting; diff --git a/test/Microsoft.ComponentDetection.Orchestrator.Tests/Commands/ScanCommandTests.cs b/test/Microsoft.ComponentDetection.Orchestrator.Tests/Commands/ScanCommandTests.cs index ca96692ef..77687ec32 100644 --- a/test/Microsoft.ComponentDetection.Orchestrator.Tests/Commands/ScanCommandTests.cs +++ b/test/Microsoft.ComponentDetection.Orchestrator.Tests/Commands/ScanCommandTests.cs @@ -4,7 +4,7 @@ namespace Microsoft.ComponentDetection.Orchestrator.Tests.Commands; using System.IO; using System.Threading; using System.Threading.Tasks; -using FluentAssertions; +using AwesomeAssertions; using Microsoft.ComponentDetection.Common; using Microsoft.ComponentDetection.Contracts.BcdeModels; using Microsoft.ComponentDetection.Orchestrator.Commands; diff --git a/test/Microsoft.ComponentDetection.Orchestrator.Tests/Commands/ScanSettingsTests.cs b/test/Microsoft.ComponentDetection.Orchestrator.Tests/Commands/ScanSettingsTests.cs index 8d5ee8205..018f3baff 100644 --- a/test/Microsoft.ComponentDetection.Orchestrator.Tests/Commands/ScanSettingsTests.cs +++ b/test/Microsoft.ComponentDetection.Orchestrator.Tests/Commands/ScanSettingsTests.cs @@ -2,7 +2,7 @@ namespace Microsoft.ComponentDetection.Orchestrator.Tests.Commands; using System.IO; using System.Text.Json; -using FluentAssertions; +using AwesomeAssertions; using Microsoft.ComponentDetection.Orchestrator.Commands; using Microsoft.VisualStudio.TestTools.UnitTesting; diff --git a/test/Microsoft.ComponentDetection.Orchestrator.Tests/Experiments/ExperimentConfigTests.cs b/test/Microsoft.ComponentDetection.Orchestrator.Tests/Experiments/ExperimentConfigTests.cs index b2d06a9ad..b28909f40 100644 --- a/test/Microsoft.ComponentDetection.Orchestrator.Tests/Experiments/ExperimentConfigTests.cs +++ b/test/Microsoft.ComponentDetection.Orchestrator.Tests/Experiments/ExperimentConfigTests.cs @@ -3,7 +3,7 @@ namespace Microsoft.ComponentDetection.Orchestrator.Tests.Experiments; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using FluentAssertions; +using AwesomeAssertions; using Microsoft.ComponentDetection.Contracts; using Microsoft.ComponentDetection.Orchestrator.Experiments.Configs; using Microsoft.ComponentDetection.Orchestrator.Extensions; diff --git a/test/Microsoft.ComponentDetection.Orchestrator.Tests/Experiments/ExperimentDiffTests.cs b/test/Microsoft.ComponentDetection.Orchestrator.Tests/Experiments/ExperimentDiffTests.cs index d5d2c4dec..a9021a7e9 100644 --- a/test/Microsoft.ComponentDetection.Orchestrator.Tests/Experiments/ExperimentDiffTests.cs +++ b/test/Microsoft.ComponentDetection.Orchestrator.Tests/Experiments/ExperimentDiffTests.cs @@ -1,7 +1,7 @@ namespace Microsoft.ComponentDetection.Orchestrator.Tests.Experiments; using System.Linq; -using FluentAssertions; +using AwesomeAssertions; using Microsoft.ComponentDetection.Contracts.BcdeModels; using Microsoft.ComponentDetection.Orchestrator.Experiments.Models; using Microsoft.VisualStudio.TestTools.UnitTesting; diff --git a/test/Microsoft.ComponentDetection.Orchestrator.Tests/Experiments/ExperimentResultsTests.cs b/test/Microsoft.ComponentDetection.Orchestrator.Tests/Experiments/ExperimentResultsTests.cs index c9a610e15..78ff54e04 100644 --- a/test/Microsoft.ComponentDetection.Orchestrator.Tests/Experiments/ExperimentResultsTests.cs +++ b/test/Microsoft.ComponentDetection.Orchestrator.Tests/Experiments/ExperimentResultsTests.cs @@ -1,7 +1,7 @@ namespace Microsoft.ComponentDetection.Orchestrator.Tests.Experiments; using System.Linq; -using FluentAssertions; +using AwesomeAssertions; using Microsoft.ComponentDetection.Contracts.BcdeModels; using Microsoft.ComponentDetection.Orchestrator.Experiments.Models; using Microsoft.VisualStudio.TestTools.UnitTesting; diff --git a/test/Microsoft.ComponentDetection.Orchestrator.Tests/Experiments/ExperimentServiceTests.cs b/test/Microsoft.ComponentDetection.Orchestrator.Tests/Experiments/ExperimentServiceTests.cs index 5921ef039..55bb5a45a 100644 --- a/test/Microsoft.ComponentDetection.Orchestrator.Tests/Experiments/ExperimentServiceTests.cs +++ b/test/Microsoft.ComponentDetection.Orchestrator.Tests/Experiments/ExperimentServiceTests.cs @@ -4,7 +4,7 @@ namespace Microsoft.ComponentDetection.Orchestrator.Tests.Experiments; using System.Collections.Generic; using System.IO; using System.Threading.Tasks; -using FluentAssertions; +using AwesomeAssertions; using Microsoft.ComponentDetection.Common.DependencyGraph; using Microsoft.ComponentDetection.Contracts; using Microsoft.ComponentDetection.Contracts.BcdeModels; diff --git a/test/Microsoft.ComponentDetection.Orchestrator.Tests/Experiments/UvLockDetectorExperimentTests.cs b/test/Microsoft.ComponentDetection.Orchestrator.Tests/Experiments/UvLockDetectorExperimentTests.cs index a3d78c9b9..edc424e28 100644 --- a/test/Microsoft.ComponentDetection.Orchestrator.Tests/Experiments/UvLockDetectorExperimentTests.cs +++ b/test/Microsoft.ComponentDetection.Orchestrator.Tests/Experiments/UvLockDetectorExperimentTests.cs @@ -1,6 +1,6 @@ namespace Microsoft.ComponentDetection.Orchestrator.Tests.Experiments; -using FluentAssertions; +using AwesomeAssertions; using Microsoft.ComponentDetection.Detectors.Pip; using Microsoft.ComponentDetection.Detectors.Uv; using Microsoft.ComponentDetection.Orchestrator.Experiments.Configs; diff --git a/test/Microsoft.ComponentDetection.Orchestrator.Tests/Extensions/CommaDelimitedConverterTests.cs b/test/Microsoft.ComponentDetection.Orchestrator.Tests/Extensions/CommaDelimitedConverterTests.cs index e1f5daf86..431b96210 100644 --- a/test/Microsoft.ComponentDetection.Orchestrator.Tests/Extensions/CommaDelimitedConverterTests.cs +++ b/test/Microsoft.ComponentDetection.Orchestrator.Tests/Extensions/CommaDelimitedConverterTests.cs @@ -1,7 +1,7 @@ namespace Microsoft.ComponentDetection.Orchestrator.Tests.Extensions; using System; -using FluentAssertions; +using AwesomeAssertions; using Microsoft.ComponentDetection.Orchestrator.Extensions; using Microsoft.VisualStudio.TestTools.UnitTesting; diff --git a/test/Microsoft.ComponentDetection.Orchestrator.Tests/Extensions/KeyValueDelimitedConverterTests.cs b/test/Microsoft.ComponentDetection.Orchestrator.Tests/Extensions/KeyValueDelimitedConverterTests.cs index f71c9d64b..3ae93ad2c 100644 --- a/test/Microsoft.ComponentDetection.Orchestrator.Tests/Extensions/KeyValueDelimitedConverterTests.cs +++ b/test/Microsoft.ComponentDetection.Orchestrator.Tests/Extensions/KeyValueDelimitedConverterTests.cs @@ -2,7 +2,7 @@ namespace Microsoft.ComponentDetection.Orchestrator.Tests.Extensions; using System; using System.Collections.Generic; -using FluentAssertions; +using AwesomeAssertions; using Microsoft.ComponentDetection.Orchestrator.Extensions; using Microsoft.VisualStudio.TestTools.UnitTesting; diff --git a/test/Microsoft.ComponentDetection.Orchestrator.Tests/Extensions/SemicolonDelimitedConverterTests.cs b/test/Microsoft.ComponentDetection.Orchestrator.Tests/Extensions/SemicolonDelimitedConverterTests.cs index 38b577d5e..6045bb729 100644 --- a/test/Microsoft.ComponentDetection.Orchestrator.Tests/Extensions/SemicolonDelimitedConverterTests.cs +++ b/test/Microsoft.ComponentDetection.Orchestrator.Tests/Extensions/SemicolonDelimitedConverterTests.cs @@ -1,7 +1,7 @@ namespace Microsoft.ComponentDetection.Orchestrator.Tests.Extensions; using System; -using FluentAssertions; +using AwesomeAssertions; using Microsoft.ComponentDetection.Orchestrator.Extensions; using Microsoft.VisualStudio.TestTools.UnitTesting; diff --git a/test/Microsoft.ComponentDetection.Orchestrator.Tests/Extensions/TypeRegistrarTests.cs b/test/Microsoft.ComponentDetection.Orchestrator.Tests/Extensions/TypeRegistrarTests.cs index e965f573b..6a6aab4f0 100644 --- a/test/Microsoft.ComponentDetection.Orchestrator.Tests/Extensions/TypeRegistrarTests.cs +++ b/test/Microsoft.ComponentDetection.Orchestrator.Tests/Extensions/TypeRegistrarTests.cs @@ -2,7 +2,7 @@ namespace Microsoft.ComponentDetection.Orchestrator.Tests.Extensions; using System; using System.Diagnostics.CodeAnalysis; -using FluentAssertions; +using AwesomeAssertions; using Microsoft.ComponentDetection.Orchestrator.Extensions; using Microsoft.Extensions.DependencyInjection; using Microsoft.VisualStudio.TestTools.UnitTesting; diff --git a/test/Microsoft.ComponentDetection.Orchestrator.Tests/GraphTranslationUtilityTests.cs b/test/Microsoft.ComponentDetection.Orchestrator.Tests/GraphTranslationUtilityTests.cs index 69cc459ce..01688681c 100644 --- a/test/Microsoft.ComponentDetection.Orchestrator.Tests/GraphTranslationUtilityTests.cs +++ b/test/Microsoft.ComponentDetection.Orchestrator.Tests/GraphTranslationUtilityTests.cs @@ -1,7 +1,7 @@ namespace Microsoft.ComponentDetection.Orchestrator.Tests; using System.Collections.Generic; -using FluentAssertions; +using AwesomeAssertions; using Microsoft.ComponentDetection.Common.DependencyGraph; using Microsoft.ComponentDetection.Contracts; using Microsoft.ComponentDetection.Contracts.TypedComponent; diff --git a/test/Microsoft.ComponentDetection.Orchestrator.Tests/LoggingEnricherTests.cs b/test/Microsoft.ComponentDetection.Orchestrator.Tests/LoggingEnricherTests.cs index 7de2e67a2..f7d67c4dc 100644 --- a/test/Microsoft.ComponentDetection.Orchestrator.Tests/LoggingEnricherTests.cs +++ b/test/Microsoft.ComponentDetection.Orchestrator.Tests/LoggingEnricherTests.cs @@ -1,7 +1,7 @@ namespace Microsoft.ComponentDetection.Orchestrator.Tests; using System; -using FluentAssertions; +using AwesomeAssertions; using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; using Serilog.Core; diff --git a/test/Microsoft.ComponentDetection.Orchestrator.Tests/Microsoft.ComponentDetection.Orchestrator.Tests.csproj b/test/Microsoft.ComponentDetection.Orchestrator.Tests/Microsoft.ComponentDetection.Orchestrator.Tests.csproj index 6b82c81f4..f5c35566d 100644 --- a/test/Microsoft.ComponentDetection.Orchestrator.Tests/Microsoft.ComponentDetection.Orchestrator.Tests.csproj +++ b/test/Microsoft.ComponentDetection.Orchestrator.Tests/Microsoft.ComponentDetection.Orchestrator.Tests.csproj @@ -13,7 +13,7 @@ - + diff --git a/test/Microsoft.ComponentDetection.Orchestrator.Tests/Services/BcdeScanExecutionServiceTests.cs b/test/Microsoft.ComponentDetection.Orchestrator.Tests/Services/BcdeScanExecutionServiceTests.cs index b07d88b8c..e55ec78b0 100644 --- a/test/Microsoft.ComponentDetection.Orchestrator.Tests/Services/BcdeScanExecutionServiceTests.cs +++ b/test/Microsoft.ComponentDetection.Orchestrator.Tests/Services/BcdeScanExecutionServiceTests.cs @@ -5,7 +5,7 @@ namespace Microsoft.ComponentDetection.Orchestrator.Tests.Services; using System.IO; using System.Linq; using System.Threading.Tasks; -using FluentAssertions; +using AwesomeAssertions; using Microsoft.ComponentDetection.Common.DependencyGraph; using Microsoft.ComponentDetection.Contracts; using Microsoft.ComponentDetection.Contracts.BcdeModels; diff --git a/test/Microsoft.ComponentDetection.Orchestrator.Tests/Services/DefaultGraphTranslationServiceTests.cs b/test/Microsoft.ComponentDetection.Orchestrator.Tests/Services/DefaultGraphTranslationServiceTests.cs index 6979806f8..c33be1804 100644 --- a/test/Microsoft.ComponentDetection.Orchestrator.Tests/Services/DefaultGraphTranslationServiceTests.cs +++ b/test/Microsoft.ComponentDetection.Orchestrator.Tests/Services/DefaultGraphTranslationServiceTests.cs @@ -3,7 +3,7 @@ namespace Microsoft.ComponentDetection.Orchestrator.Tests.Services; using System.Collections.Generic; using System.IO; using System.Linq; -using FluentAssertions; +using AwesomeAssertions; using Microsoft.ComponentDetection.Common.DependencyGraph; using Microsoft.ComponentDetection.Contracts; using Microsoft.ComponentDetection.Contracts.BcdeModels; diff --git a/test/Microsoft.ComponentDetection.Orchestrator.Tests/Services/DetectorProcessingServiceTests.cs b/test/Microsoft.ComponentDetection.Orchestrator.Tests/Services/DetectorProcessingServiceTests.cs index a0918267c..d363e686b 100644 --- a/test/Microsoft.ComponentDetection.Orchestrator.Tests/Services/DetectorProcessingServiceTests.cs +++ b/test/Microsoft.ComponentDetection.Orchestrator.Tests/Services/DetectorProcessingServiceTests.cs @@ -7,7 +7,7 @@ namespace Microsoft.ComponentDetection.Orchestrator.Tests.Services; using System.Runtime.InteropServices; using System.Threading; using System.Threading.Tasks; -using FluentAssertions; +using AwesomeAssertions; using Microsoft.ComponentDetection.Common.DependencyGraph; using Microsoft.ComponentDetection.Common.Telemetry.Records; using Microsoft.ComponentDetection.Contracts; diff --git a/test/Microsoft.ComponentDetection.Orchestrator.Tests/Services/DetectorRestrictionServiceTests.cs b/test/Microsoft.ComponentDetection.Orchestrator.Tests/Services/DetectorRestrictionServiceTests.cs index 4a5355508..d07460f16 100644 --- a/test/Microsoft.ComponentDetection.Orchestrator.Tests/Services/DetectorRestrictionServiceTests.cs +++ b/test/Microsoft.ComponentDetection.Orchestrator.Tests/Services/DetectorRestrictionServiceTests.cs @@ -2,7 +2,7 @@ namespace Microsoft.ComponentDetection.Orchestrator.Tests.Services; using System; using System.Linq; -using FluentAssertions; +using AwesomeAssertions; using Microsoft.ComponentDetection.Contracts; using Microsoft.ComponentDetection.Orchestrator.Exceptions; using Microsoft.ComponentDetection.Orchestrator.Services; diff --git a/test/Microsoft.ComponentDetection.VerificationTests/ComponentDetectionIntegrationTests.cs b/test/Microsoft.ComponentDetection.VerificationTests/ComponentDetectionIntegrationTests.cs index 8dda90017..5aeae7cbf 100644 --- a/test/Microsoft.ComponentDetection.VerificationTests/ComponentDetectionIntegrationTests.cs +++ b/test/Microsoft.ComponentDetection.VerificationTests/ComponentDetectionIntegrationTests.cs @@ -5,8 +5,8 @@ namespace Microsoft.ComponentDetection.VerificationTests; using System.IO; using System.Linq; using System.Text.RegularExpressions; -using FluentAssertions; -using FluentAssertions.Execution; +using AwesomeAssertions; +using AwesomeAssertions.Execution; using Microsoft.ComponentDetection.Contracts.BcdeModels; using Microsoft.VisualStudio.TestTools.UnitTesting; using Newtonsoft.Json; @@ -182,7 +182,7 @@ public void CheckDetectorsRunTimesAndCounts() var oldMatches = Regex.Matches(this.oldLogFileContents, regexPattern); var newMatches = Regex.Matches(this.newLogFileContents, regexPattern); - newMatches.Should().HaveCountGreaterOrEqualTo(oldMatches.Count, "A detector was lost, make sure this was intentional."); + newMatches.Should().HaveCountGreaterThanOrEqualTo(oldMatches.Count, "A detector was lost, make sure this was intentional."); var detectorTimes = new Dictionary(); var detectorCounts = new Dictionary(); @@ -219,7 +219,7 @@ public void CheckDetectorsRunTimesAndCounts() var newCount = int.Parse(match.Groups[4].Value); if (detectorCounts.TryGetValue(detectorId, out var oldCount) && detectorId != "Total") { - newCount.Should().BeGreaterOrEqualTo(oldCount, $"{oldCount - newCount} Components were lost for detector {detectorId}. Verify this is expected behavior. \n Old Count: {oldCount}, PPE Count: {newCount}"); + newCount.Should().BeGreaterThanOrEqualTo(oldCount, $"{oldCount - newCount} Components were lost for detector {detectorId}. Verify this is expected behavior. \n Old Count: {oldCount}, PPE Count: {newCount}"); (newCount > oldCount && !this.bumpedDetectorVersions.Contains(detectorId)).Should().BeFalse($"{newCount - oldCount} New Components were found for detector {detectorId}, but the detector version was not updated."); } @@ -243,7 +243,7 @@ private void ProcessDetectorVersions() continue; } - newDetector.Version.Should().BeGreaterOrEqualTo(cd.Version, $"the version for detector {cd.DetectorId} was unexpectedly reduced. please check all detector versions and verify this behavior."); + newDetector.Version.Should().BeGreaterThanOrEqualTo(cd.Version, $"the version for detector {cd.DetectorId} was unexpectedly reduced. please check all detector versions and verify this behavior."); if (newDetector.Version > cd.Version) { diff --git a/test/Microsoft.ComponentDetection.VerificationTests/JsonSchemaTests.cs b/test/Microsoft.ComponentDetection.VerificationTests/JsonSchemaTests.cs index 2b34d6792..071d3fa1b 100644 --- a/test/Microsoft.ComponentDetection.VerificationTests/JsonSchemaTests.cs +++ b/test/Microsoft.ComponentDetection.VerificationTests/JsonSchemaTests.cs @@ -5,7 +5,7 @@ namespace Microsoft.ComponentDetection.VerificationTests; using System.IO; using System.Linq; using System.Threading.Tasks; -using FluentAssertions; +using AwesomeAssertions; using Microsoft.ComponentDetection.Contracts.BcdeModels; using Microsoft.VisualStudio.TestTools.UnitTesting; using Newtonsoft.Json.Linq; diff --git a/test/Microsoft.ComponentDetection.VerificationTests/Microsoft.ComponentDetection.VerificationTests.csproj b/test/Microsoft.ComponentDetection.VerificationTests/Microsoft.ComponentDetection.VerificationTests.csproj index 03c6f6d7d..f24655220 100644 --- a/test/Microsoft.ComponentDetection.VerificationTests/Microsoft.ComponentDetection.VerificationTests.csproj +++ b/test/Microsoft.ComponentDetection.VerificationTests/Microsoft.ComponentDetection.VerificationTests.csproj @@ -19,7 +19,7 @@ - + From 424c83a605664e8ec103ccd3e5fdcefe208ff75c Mon Sep 17 00:00:00 2001 From: Jamie Magee Date: Thu, 30 Oct 2025 08:03:44 -0700 Subject: [PATCH 2/2] BeLessOrEqualTo -> BeLessThanOrEqualTo --- .../ComponentDetectionIntegrationTests.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/Microsoft.ComponentDetection.VerificationTests/ComponentDetectionIntegrationTests.cs b/test/Microsoft.ComponentDetection.VerificationTests/ComponentDetectionIntegrationTests.cs index 5aeae7cbf..1fa32a560 100644 --- a/test/Microsoft.ComponentDetection.VerificationTests/ComponentDetectionIntegrationTests.cs +++ b/test/Microsoft.ComponentDetection.VerificationTests/ComponentDetectionIntegrationTests.cs @@ -211,7 +211,7 @@ public void CheckDetectorsRunTimesAndCounts() var newTime = float.Parse(match.Groups[1].Value); var maxTimeThreshold = (float)(oldTime + Math.Max(5, oldTime * this.allowedTimeDriftRatio)); - newTime.Should().BeLessOrEqualTo(maxTimeThreshold, $"Total Time take increased by a large amount. Please verify before continuing. old time: {oldTime}, new time: {newTime}"); + newTime.Should().BeLessThanOrEqualTo(maxTimeThreshold, $"Total Time take increased by a large amount. Please verify before continuing. old time: {oldTime}, new time: {newTime}"); } else { @@ -250,7 +250,7 @@ private void ProcessDetectorVersions() this.bumpedDetectorVersions.Add(cd.DetectorId); } - cd.SupportedComponentTypes.Should().OnlyContain(type => newDetector.SupportedComponentTypes.Contains(type), "the detector {cd.DetectorId} has lost suppported component types. Verify this is expected behavior."); + cd.SupportedComponentTypes.Should().OnlyContain(type => newDetector.SupportedComponentTypes.Contains(type), $"the detector {cd.DetectorId} has lost suppported component types. Verify this is expected behavior."); } }