exp

Azure · Jun 13, 2024 · 0bf8494 · 0bf8494
1 parent 3fa36f5
commit 0bf8494
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 27 deletions.
diff --git a/src/Bicep.Cli.IntegrationTests/TestBase.cs b/src/Bicep.Cli.IntegrationTests/TestBase.cs
@@ -31,7 +31,7 @@ private static BicepCompiler CreateCompiler(IContainerRegistryClientFactory clie
                         .AddSingleton(clientFactory)
                         .AddSingleton(templateSpecRepositoryFactory)
                         .AddSingleton<IPublicRegistryModuleMetadataProvider, PublicRegistryModuleMetadataProvider>();
-                    IServiceCollectionExtensions.AddMockHttpClientIfNonNull(services, moduleMetadataClient); //asdfg does this work?
+                    //IServiceCollectionExtensions.AddMockHttpClientIfNotNull(services, moduleMetadataClient); //asdfg does this work?
 
                 }
                 ).GetCompiler();
@@ -78,12 +78,12 @@ protected static Task<CliResult> Bicep(InvocationSettings settings, Action<IServ
                         }
 
                         //asdfg does this work?
-                        IServiceCollectionExtensions.AddMockHttpClientIfNonNull(services, settings.ModuleMetadataClient);
+                        //IServiceCollectionExtensions.AddMockHttpClientIfNotNull(services, settings.ModuleMetadataClient);
 
                         services
-                            .AddSingletonIfNonNull(settings.Environment ?? BicepTestConstants.EmptyEnvironment)
-                            .AddSingletonIfNonNull(settings.ClientFactory)
-                            .AddSingletonIfNonNull(settings.TemplateSpecRepositoryFactory);
+                            .AddSingletonIfNotNull(settings.Environment ?? BicepTestConstants.EmptyEnvironment)
+                            .AddSingletonIfNotNull(settings.ClientFactory)
+                            .AddSingletonIfNotNull(settings.TemplateSpecRepositoryFactory);
 
                         registerAction?.Invoke(services);
                     }

diff --git a/src/Bicep.Core.UnitTests/IServiceCollectionExtensions.cs b/src/Bicep.Core.UnitTests/IServiceCollectionExtensions.cs
@@ -50,8 +50,6 @@ public static IServiceCollection AddBicepCore(this IServiceCollection services)
             .AddPublicRegistryModuleMetadataProviderServices()
             .AddSingleton<BicepCompiler>();
 
-        //AddMockHttpClient(services, PublicRegistryModuleMetadataClientMock.Create([]));//asdfg not working?
-
         return services;
     }
 
@@ -132,7 +130,7 @@ public static IServiceCollection WithDeploymentHelper(this IServiceCollection se
     public static IServiceCollection WithEmptyAzResources(this IServiceCollection services)
         => services.WithAzResources([]);
 
-    public static IServiceCollection AddSingletonIfNonNull<TService>(this IServiceCollection services, TService? instance)
+    public static IServiceCollection AddSingletonIfNotNull<TService>(this IServiceCollection services, TService? instance)
         where TService : class
     {
         if (instance is not null)
@@ -142,22 +140,4 @@ public static IServiceCollection AddSingletonIfNonNull<TService>(this IServiceCo
 
         return services;
     }
-
-    public static IServiceCollection AddMockHttpClient<TClient>(IServiceCollection services, TClient? httpClient) where TClient : class
-    {
-        return AddMockHttpClientIfNonNull(services, httpClient);
-    }
-
-    public static IServiceCollection AddMockHttpClientIfNonNull<TClient>(IServiceCollection services, TClient? httpClient) where TClient : class
-    {
-        if (httpClient is { })
-        {
-            services.AddHttpClient(typeof(IPublicRegistryModuleMetadataClient).Name /*asdfg?*/, httpClient =>
-            {
-            })
-                .AddTypedClient(c => httpClient);
-        }
-
-        return services;
-    }
 }
diff --git a/src/Bicep.LangServer.UnitTests/BicepCompilationManagerHelper.cs b/src/Bicep.LangServer.UnitTests/BicepCompilationManagerHelper.cs
@@ -91,7 +91,7 @@ public static ICompilationProvider CreateEmptyCompilationProvider(IConfiguration
         {
             var helper = ServiceBuilder.Create(services => services
                 .AddSingleton(TestTypeHelper.CreateEmptyResourceTypeLoader())
-                .AddSingletonIfNonNull<IConfigurationManager>(configurationManager)
+                .AddSingletonIfNotNull<IConfigurationManager>(configurationManager)
                 .AddSingleton<BicepCompilationProvider>());
 
             return helper.Construct<BicepCompilationProvider>();