Adds test generation unit test that instantiates and validates all sc…

…enario generators
DEFRA · Jan 2, 2025 · cbe21c4 · cbe21c4
1 parent c962eec
commit cbe21c4
Show file tree

Hide file tree

Showing 9 changed files with 48 additions and 23 deletions.
diff --git a/TestDataGenerator.Tests/ScenarioTests.cs b/TestDataGenerator.Tests/ScenarioTests.cs
@@ -1,29 +1,39 @@
 using Btms.BlobService;
 using Btms.BlobService.Extensions;
+using FluentAssertions;
 using Microsoft.Extensions.DependencyInjection;
 using TestDataGenerator.Extensions;
+using TestDataGenerator.Scenarios;
 using Xunit;
 
 namespace TestDataGenerator.Tests;
 
 public class ScenarioTests
 {
-    [Fact]
-    public void EnsureAllScenarioDefaultsAreValid()
+    ServiceProvider _serviceProvider = BuilderExtensions.GetDefaultServiceProvider();
+
+    public static IEnumerable<object[]> GetAllScenarios()
+    {
+        return BuilderExtensions
+            .GetAllScenarios()
+            .Select(s => new object[] { s });
+    }
+
+    [Theory]
+    [MemberData(nameof(GetAllScenarios))]
+    public void EnsureAllScenarioDefaultsAreValid(Type scenarioType)
     {
-        // var (configuration, _) = BuilderExtensions.GetConfig("Scenarios/Samples");
-        //
-        // var sp = new ServiceCollection()
-        //     .AddBlobStorage(configuration)
-        //     .AddSingleton<CachingBlobService>()
-        //     .ConfigureTestGenerationServices()
-        //     .BuildServiceProvider();
-
         var scenarioTypes = BuilderExtensions.GetAllScenarios();
 
-        foreach (var scenarioType in scenarioTypes)
+        var scenario = (ScenarioGenerator)_serviceProvider.GetRequiredService(scenarioType);
+        var config = new ScenarioConfig()
         {
-
-        }
+            Name = "Test", ArrivalDateRange = 1, Count = 1, Generator = scenario, CreationDateRange = 1
+        };
+
+        var messages = scenario.Generate(1, 1, DateTime.Today,  config);
+
+        messages.Should().NotBeNull();
+        messages.Should().NotBeEmpty();
     }
 }
diff --git a/TestDataGenerator/Extensions/BuilderExtensions.cs b/TestDataGenerator/Extensions/BuilderExtensions.cs
@@ -55,6 +55,17 @@ public static IEnumerable<Type> GetAllScenarios()
                      && !p.IsAbstract
                      && p != scenarioService);
     }
+
+    public static ServiceProvider GetDefaultServiceProvider()
+    {
+        var (configuration, _) = BuilderExtensions.GetConfig("Scenarios/Samples");
+
+        return new ServiceCollection()
+            .AddBlobStorage(configuration)
+            .AddSingleton<CachingBlobService>()
+            .ConfigureTestGenerationServices()
+            .BuildServiceProvider();
+    }
 
     public static IServiceCollection ConfigureTestGenerationServices(this IServiceCollection services)
     {

diff --git a/TestDataGenerator/ImportNotificationBuilder.cs b/TestDataGenerator/ImportNotificationBuilder.cs
@@ -199,10 +199,10 @@ protected override ImportNotificationBuilder<T> Validate()
             n.Version.AssertHasValue("Import Notification Version missing");
 
             // NB - this may not be correct...
-            if (n.ImportNotificationType != ImportNotificationTypeEnum.Cveda)
-            {
-                n.PartTwo!.InspectionRequired.AssertHasValue("Import Notification PartTwo InspectionRequired missing");    
-            }
+            // if (n.ImportNotificationType != ImportNotificationTypeEnum.Cveda && n.PartTwo.HasValue())
+            // {
+            //     n.PartTwo!.InspectionRequired.AssertHasValue("Import Notification PartTwo InspectionRequired missing");    
+            // }
 
         });
     }

diff --git a/TestDataGenerator/Scenarios/AllChedsNoMatchScenarioGenerator.cs b/TestDataGenerator/Scenarios/AllChedsNoMatchScenarioGenerator.cs
@@ -11,6 +11,7 @@ public override GeneratorResult Generate(int scenario, int item, DateTime entryD
             .WithCreationDate(entryDate)
             .WithRandomArrivalDateTime(config.ArrivalDateRange)
             .WithReferenceNumber(ImportNotificationTypeEnum.Cveda, scenario, entryDate, item)
+            .WithVersionNumber()
             .ValidateAndBuild();
 
         logger.LogInformation("Created {NotificationReferenceNumber}", 
@@ -20,6 +21,7 @@ public override GeneratorResult Generate(int scenario, int item, DateTime entryD
             .WithCreationDate(entryDate)
             .WithRandomArrivalDateTime(config.ArrivalDateRange)
             .WithReferenceNumber(ImportNotificationTypeEnum.Cvedp, scenario, entryDate, item)
+            .WithVersionNumber()
             .ValidateAndBuild();
 
         logger.LogInformation("Created {NotificationReferenceNumber}", 
@@ -29,6 +31,7 @@ public override GeneratorResult Generate(int scenario, int item, DateTime entryD
             .WithCreationDate(entryDate)
             .WithRandomArrivalDateTime(config.ArrivalDateRange)
             .WithReferenceNumber(ImportNotificationTypeEnum.Ced, scenario, entryDate, item)
+            .WithVersionNumber()
             .ValidateAndBuild();
 
         logger.LogInformation("Created {NotificationReferenceNumber}", 
@@ -38,6 +41,7 @@ public override GeneratorResult Generate(int scenario, int item, DateTime entryD
             .WithCreationDate(entryDate)
             .WithRandomArrivalDateTime(config.ArrivalDateRange)
             .WithReferenceNumber(ImportNotificationTypeEnum.Chedpp, scenario, entryDate, item)
+            .WithVersionNumber()
             .ValidateAndBuild();
 
         logger.LogInformation("Created {NotificationReferenceNumber}", 

diff --git a/TestDataGenerator/Scenarios/Samples/cheda-one-commodity.json b/TestDataGenerator/Scenarios/Samples/cheda-one-commodity.json
@@ -1,6 +1,6 @@
 {
   "referenceNumber": null,
-  "version": 1,
+  "version": null,
   "lastUpdated": null,
   "lastUpdatedBy": {
     "displayName": "Percy Inspector-Tester",

diff --git a/TestDataGenerator/Scenarios/Samples/chedd-one-commodity.json b/TestDataGenerator/Scenarios/Samples/chedd-one-commodity.json
@@ -1,7 +1,7 @@
 {
   "id": 3989,
   "referenceNumber": "CHEDD.GB.2024.1003989",
-  "version": 1,
+  "version": null,
   "lastUpdated": "2024-08-19T08:45:36.18Z",
   "lastUpdatedBy": {
     "displayName": "Percy Inspector-Tester",

diff --git a/TestDataGenerator/Scenarios/Samples/chedpp-multiple-commodity.json b/TestDataGenerator/Scenarios/Samples/chedpp-multiple-commodity.json
@@ -1,7 +1,7 @@
 {
   "id": 3991,
   "referenceNumber": "CHEDPP.GB.2024.1003991",
-  "version": 1,
+  "version": null,
   "lastUpdated": "2024-08-19T08:50:00.193Z",
   "lastUpdatedBy": {
     "displayName": "Percy Inspector-Tester",

diff --git a/TestDataGenerator/Scenarios/Samples/cr-one-item.json b/TestDataGenerator/Scenarios/Samples/cr-one-item.json
@@ -7,8 +7,8 @@
   },
   "header": {
     "entryReference": null,
-    "entryVersionNumber": 2,
-    "previousVersionNumber": 1,
+    "entryVersionNumber": null,
+    "previousVersionNumber": null,
     "declarationUCR": null,
     "declarationPartNumber": null,
     "declarationType": null,

diff --git a/TestDataGenerator/Scenarios/Samples/decision-one-item.json b/TestDataGenerator/Scenarios/Samples/decision-one-item.json
@@ -7,7 +7,7 @@
   },
   "header": {
     "entryReference": null,
-    "entryVersionNumber": 1,
+    "entryVersionNumber": null,
     "decisionNumber": null
   },
   "items": [