TestServiceProvider now explictly implements IServiceCOlelction (#40)

* TestServiceProvider now explictly implements IServiceCOlelction

* Tweaks to namespaces

Author: egil

sample/tests/RazorTestComponents/Pages/FetchDataTest.razor

@@ -23,7 +23,7 @@
 
     void Setup()
     {
-        Services.AddService<IWeatherForecastService>(forecastService);
+        Services.AddSingleton<IWeatherForecastService>(forecastService);
     }
 
     void InitialLoadingHtmlRendersCorrectly()

sample/tests/Tests/Pages/FetchDataTest.cs

@@ -8,6 +8,7 @@
 using Xunit;
 using Egil.RazorComponents.Testing.SampleApp.Pages;
 using Shouldly;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace Egil.RazorComponents.Testing.SampleApp.CodeOnlyTests
 {
@@ -17,7 +18,7 @@ public class FetchDataTest : ComponentTestFixture
         public void Test001()
         {
             // Arrange - add the mock forecast service
-            Services.AddService<IWeatherForecastService, MockForecastService>();
+            Services.AddSingleton<IWeatherForecastService, MockForecastService>();
 
             // Act - render the FetchData component
             var cut = RenderComponent<FetchData>();
@@ -35,7 +36,7 @@ public void Test002()
             // Setup the mock forecast service
             var forecasts = new[] { new WeatherForecast { Date = DateTime.Now, Summary = "Testy", TemperatureC = 42 } };
             var mockForecastService = new MockForecastService();
-            Services.AddService<IWeatherForecastService>(mockForecastService);
+            Services.AddSingleton<IWeatherForecastService>(mockForecastService);
 
             // Arrange - render the FetchData component
             var cut = RenderComponent<FetchData>();

sample/tests/Tests/Pages/TodosTest.cs

@@ -10,6 +10,7 @@
 using Egil.RazorComponents.Testing.SampleApp.Data;
 using Egil.RazorComponents.Testing.EventDispatchExtensions;
 using Egil.RazorComponents.Testing.SampleApp.Pages;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace Egil.RazorComponents.Testing.SampleApp.CodeOnlyTests.Pages
 {
@@ -30,7 +31,7 @@ public void Test001()
             var getTask = new TaskCompletionSource<IReadOnlyList<Todo>>();
             var todoSrv = new Mock<ITodoService>();
             todoSrv.Setup(x => x.GetAll()).Returns(getTask.Task);
-            Services.AddService(todoSrv.Object);
+            Services.AddSingleton(todoSrv.Object);
 
             // act
             var page = RenderComponent<Todos>();
@@ -51,7 +52,7 @@ public void Test002()
             var todos = new[] { new Todo { Id = 1, Text = "First" } };
             var todoSrv = new Mock<ITodoService>();
             todoSrv.Setup(x => x.GetAll()).Returns(Task.FromResult<IReadOnlyList<Todo>>(todos));
-            Services.AddService(todoSrv.Object);
+            Services.AddSingleton(todoSrv.Object);
 
             // act
             var page = RenderComponent<Todos>();
@@ -66,7 +67,7 @@ public void Test003()
         {
             // arrange
             var todoSrv = new Mock<ITodoService>();
-            Services.AddService(todoSrv.Object);
+            Services.AddSingleton(todoSrv.Object);
             var page = RenderComponent<Todos>();
 
             // act

sample/tests/_Imports.razor

@@ -1,16 +1,15 @@
 @using Microsoft.AspNetCore.Components.Web
+@using Microsoft.Extensions.DependencyInjection
 
 @using Egil.RazorComponents.Testing
 @using Egil.RazorComponents.Testing.EventDispatchExtensions
 @using Egil.RazorComponents.Testing.Mocking.JSInterop
 @using Egil.RazorComponents.Testing.Asserting
-@using Egil.RazorComponents.Testing.Mocking.JSInterop
 
 @using Egil.RazorComponents.Testing.SampleApp
 @using Egil.RazorComponents.Testing.SampleApp.Data
 @using Egil.RazorComponents.Testing.SampleApp.Components
 @using Egil.RazorComponents.Testing.SampleApp.Pages
 
-
 @using Xunit
 @using Shouldly

src/Mocking/MockHttpExtensions.cs

@@ -6,6 +6,7 @@
 using System.Text.Json;
 using System.Net.Http.Headers;
 using System.Diagnostics.CodeAnalysis;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace Egil.RazorComponents.Testing
 {
@@ -27,7 +28,7 @@ public static MockHttpMessageHandler AddMockHttp(this TestServiceProvider servic
             var mockHttp = new MockHttpMessageHandler();
             var httpClient = mockHttp.ToHttpClient();
             httpClient.BaseAddress = new Uri("http://example.com");
-            serviceProvider.AddService(httpClient);
+            serviceProvider.AddSingleton(httpClient);
             return mockHttp;
         }
 

src/Mocking/MockJsRuntimeExtensions.cs

@@ -1,5 +1,6 @@
 using System;
 using Egil.RazorComponents.Testing.Mocking.JSInterop;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace Egil.RazorComponents.Testing
 {
@@ -18,7 +19,7 @@ public static MockJsRuntimeInvokeHandler AddMockJsRuntime(this TestServiceProvid
 
             var result = new MockJsRuntimeInvokeHandler(mode);
 
-            serviceProvider.AddService(result.ToJsRuntime());
+            serviceProvider.AddSingleton(result.ToJsRuntime());
 
             return result;
         }

src/TestContext.cs

@@ -1,10 +1,12 @@
 using AngleSharp.Dom;
 using Egil.RazorComponents.Testing.Diffing;
+using Egil.RazorComponents.Testing.Mocking.JSInterop;
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.RenderTree;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Abstractions;
+using Microsoft.JSInterop;
 using System;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
@@ -32,9 +34,11 @@ public class TestContext : ITestContext, IDisposable
         /// </summary>
         public TestContext()
         {
+            Services.AddSingleton<IJSRuntime>(new PlaceholderJsRuntime());
+
             _renderer = new Lazy<TestRenderer>(() =>
             {
-                var loggerFactory = Services.GetService<ILoggerFactory>() ?? new NullLoggerFactory();
+                var loggerFactory = Services.GetService<ILoggerFactory>() ?? NullLoggerFactory.Instance;
                 return new TestRenderer(Services, loggerFactory);
             });
             _htmlParser = new Lazy<TestHtmlParser>(() =>