test: resource definition discovery test

Author: maurei

src/JsonApiDotNetCore/Builders/JsonApiApplicationBuilder.cs

@@ -124,7 +124,7 @@ public void ConfigureServices(Type dbContextType)
             if (dbContextType != null)
             {
                 var contextResolverType = typeof(DbContextResolver<>).MakeGenericType(dbContextType);
-                _services.AddScoped(typeof(IDbContextResolver), contextResolverType);
+                _services.TryAddScoped(typeof(IDbContextResolver), contextResolverType);
             }
             else
             {

test/DiscoveryTests/ServiceDiscoveryFacadeTests.cs

@@ -58,12 +58,12 @@ public ServiceDiscoveryFacadeTests()
         [Fact]
         public void AddAssembly_Adds_All_Resources_To_Graph()
         {
-            // Arrange, act
+            // Arrange
             IServiceDiscoveryFacade facade = new ServiceDiscoveryFacade(_services, _resourceGraphBuilder);
             facade.AddAssembly(typeof(Person).Assembly);
             facade.DiscoverResources();
 
-            // Assert
+            // Act
             var resourceGraph = _resourceGraphBuilder.Build();
             var personResource = resourceGraph.GetResourceContext(typeof(Person));
             var articleResource = resourceGraph.GetResourceContext(typeof(Article));
@@ -75,8 +75,10 @@ public void AddAssembly_Adds_All_Resources_To_Graph()
         [Fact]
         public void AddCurrentAssembly_Adds_Resources_To_Graph()
         {
-            // Arrange, act
+            // Arrange
             IServiceDiscoveryFacade facade = new ServiceDiscoveryFacade(_services, _resourceGraphBuilder);
+            
+            // Act
             facade.AddCurrentAssembly();
             facade.DiscoverResources();
 
@@ -89,8 +91,10 @@ public void AddCurrentAssembly_Adds_Resources_To_Graph()
         [Fact]
         public void AddCurrentAssembly_Adds_Services_To_Container()
         {
-            // Arrange, act
+            // Arrange
             IServiceDiscoveryFacade facade = new ServiceDiscoveryFacade(_services, _resourceGraphBuilder);
+            
+            // Act
             facade.AddCurrentAssembly();
             facade.DiscoverServices();
 
@@ -103,8 +107,10 @@ public void AddCurrentAssembly_Adds_Services_To_Container()
         [Fact]
         public void AddCurrentAssembly_Adds_Repositories_To_Container()
         {
-            // Arrange, act
+            // Arrange
             IServiceDiscoveryFacade facade = new ServiceDiscoveryFacade(_services, _resourceGraphBuilder);
+            
+            // Act
             facade.AddCurrentAssembly();
             facade.DiscoverServices();
 
@@ -113,6 +119,20 @@ public void AddCurrentAssembly_Adds_Repositories_To_Container()
             Assert.IsType<TestModelRepository>(services.GetService<IResourceRepository<TestModel>>());
         }
 
+        [Fact]
+        public void AddCurrentAssembly_Adds_ResourceDefinitions_To_Container()
+        {
+            // Arrange
+            IServiceDiscoveryFacade facade = new ServiceDiscoveryFacade(_services, _resourceGraphBuilder);
+            
+            // Act
+            facade.AddCurrentAssembly();
+            facade.DiscoverServices();
+
+            // Assert
+            var services = _services.BuildServiceProvider();
+            Assert.IsType<TestModelResourceDefinition>(services.GetService<ResourceDefinition<TestModel>>());
+        }
         public sealed class TestModel : Identifiable { }
 
         public class TestModelService : JsonApiResourceService<TestModel>
@@ -147,5 +167,10 @@ public TestModelRepository(
                 : base(targetedFields, _dbContextResolver, resourceGraph, genericServiceFactory, resourceFactory, constraintProviders, loggerFactory)
             { }
         }
+        
+        public class TestModelResourceDefinition : ResourceDefinition<TestModel>
+        {
+            public TestModelResourceDefinition(IResourceGraph resourceGraph) : base(resourceGraph) { }
+        }
     }
 }