Skip to content

Remove mocks of setting services for unit tests #69160

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Remove mocks of setting services for unit tests #69160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
105 changes: 0 additions & 105 deletions src/EditorFeatures/TestUtilities/StubLocalRegistry.cs
View file
Open in desktop

This file was deleted.

183 changes: 0 additions & 183 deletions src/EditorFeatures/TestUtilities/StubSettingsManagerHost.cs
View file
Open in desktop

This file was deleted.

18 changes: 0 additions & 18 deletions src/VisualStudio/TestUtilities2/MockServiceProvider.vb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,6 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests

Private ReadOnly _exportProvider As Composition.ExportProvider
Private ReadOnly _fileChangeEx As New MockVsFileChangeEx
Private ReadOnly _localRegistry As New StubLocalRegistry
Private _settingsManager As ISettingsManager

Public MockMonitorSelection As IVsMonitorSelection

Expand Down Expand Up @@ -61,22 +59,6 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests
Case GetType(SVsFileChangeEx)
Return _fileChangeEx

Case GetType(SLocalRegistry)
Return _localRegistry

Case GetType(SVsSettingsPersistenceManager)
If _settingsManager Is Nothing Then
LoggerFactory.Reset()
_settingsManager = SettingsManagerFactory.CreateInstance(New StubSettingsManagerHost())
End If

Return _settingsManager

Case GetType(SVsFeatureFlags)
' The only places that we consume this treat it as optional, so we can skip it here, and remove this in
' https://github.com/dotnet/roslyn/pull/69160.
Return Nothing

Case Else
Throw New Exception($"{NameOf(MockServiceProvider)} does not implement {serviceType.FullName}.")
End Select
Expand Down
4 changes: 2 additions & 2 deletions src/VisualStudio/TestUtilities2/VisualStudioTestCompositions.vb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

Imports Microsoft.CodeAnalysis.Editor.Host
Imports Microsoft.CodeAnalysis.Editor.UnitTests
Imports Microsoft.CodeAnalysis.Notification
Imports Microsoft.CodeAnalysis.Test.Utilities
Imports Microsoft.VisualStudio.LanguageServices.CSharp
Imports Microsoft.VisualStudio.LanguageServices.Remote
Expand All @@ -26,6 +25,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests
GetType(VisualStudioRemoteHostClientProvider.Factory), ' Do not use ServiceHub in VS unit tests, run services locally.
GetType(IStreamingFindUsagesPresenter), ' TODO: should we be using the actual implementation (https://github.com/dotnet/roslyn/issues/46380)?
GetType(HACK_ThemeColorFixer),
GetType(Implementation.Notification.VSNotificationServiceFactory))
GetType(Implementation.Notification.VSNotificationServiceFactory),
GetType(Options.VisualStudioOptionPersisterProvider)) ' Unit tests shouldn't depend on environmental user settings that might be set (even if we could read them)
End Class
End Namespace