#774 Testing

Author: sjh37

Generator.Tests.Integration/SingleDatabaseTestBase.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
+using System.Linq;
 using Efrpg;
 using Efrpg.FileManagement;
 using Efrpg.Filtering;
@@ -118,7 +119,7 @@ protected static void CompareAgainstFolderTestComparison(string subFolder)
 
             Assert.AreEqual(testComparisonFiles.Length, generatedFiles.Length);
 
-            foreach (var comparisonFile in testComparisonFiles)
+            foreach (var comparisonFile in testComparisonFiles.Where(x => x.ToLower().EndsWith("Audit")))
             {
                 var filename = Path.GetFileName(comparisonFile);
                 var generatedPath = Path.Combine(Settings.Root, filename);

Generator.Tests.Integration/SingleDatabaseTestSqlCeServer.cs

@@ -66,7 +66,7 @@ public void ReverseEngineerSqlCe_EfCore(bool separateFiles, TemplateType templat
 
             // Act
             var filename = "Northwind";
-            var subFolder = templateType == TemplateType.EfCore2 ? "TestComparison\\EfCore2NorthwindSqlCe40" : "TestComparison\\EfCore3NorthwindSqlCe40";
+            var subFolder = $"TestComparison\\{templateType}NorthwindSqlCe40";
             Run(filename, ".SqlCE", typeof(EfCoreFileManager), subFolder);
 
             // Assert

Generator.Tests.Integration/TestComparison/EfrpgTestIncludeFilter_SqlServer_EfCore3_FkLegacy.cs

@@ -186,6 +186,9 @@ public interface IEfrpgDbContext : IDisposable
         List<TestReturnStringReturnModel> TestReturnString(out int procResult);
         Task<List<TestReturnStringReturnModel>> TestReturnStringAsync();
 
+        int ThisHasMixedOutParameters(DateTime? foo, out int? firstOutParam, DateTime? bar, out int? secondOutParam, DateTime? baz);
+        // ThisHasMixedOutParametersAsync() cannot be created due to having out parameters, or is relying on the procedure result (int)
+
         int UserDefinedTypeSampleStoredProc(int? a, DataTable type, int? b);
         // UserDefinedTypeSampleStoredProcAsync() cannot be created due to having out parameters, or is relying on the procedure result (int)
 

Generator.Tests.Integration/TestComparison/Northwind_PostgreSQL_EfCore3_FkLegacy.cs

@@ -246,7 +246,7 @@ public int CustOrderHist(string x)
 
         // CustOrderHistAsync() cannot be created due to having out parameters, or is relying on the procedure result (int)
 
-        public int CustOrdersDetail(int? p1)
+        public int CustOrdersDetail(int? p1 = null)
         {
             var p1Param = new NpgsqlParameter { ParameterName = "p1", SqlDbType = SqlDbType.integer, Direction = ParameterDirection.Input, Value = p1.GetValueOrDefault() };
             if (!p1.HasValue)
@@ -276,7 +276,7 @@ public int CustOrdersOrders(string p1)
 
         // CustOrdersOrdersAsync() cannot be created due to having out parameters, or is relying on the procedure result (int)
 
-        public int EmployeeSalesByCountry(DateTime? p1, DateTime? p2)
+        public int EmployeeSalesByCountry(DateTime? p1 = null, DateTime? p2 = null)
         {
             var p1Param = new NpgsqlParameter { ParameterName = "p1", SqlDbType = SqlDbType.date, Direction = ParameterDirection.Input, Value = p1.GetValueOrDefault() };
             if (!p1.HasValue)
@@ -314,7 +314,7 @@ public int SalesByCategory(string cn, string ordYear)
 
         // SalesByCategoryAsync() cannot be created due to having out parameters, or is relying on the procedure result (int)
 
-        public int SalesByYear(DateTime? p1, DateTime? p2)
+        public int SalesByYear(DateTime? p1 = null, DateTime? p2 = null)
         {
             var p1Param = new NpgsqlParameter { ParameterName = "p1", SqlDbType = SqlDbType.date, Direction = ParameterDirection.Input, Value = p1.GetValueOrDefault() };
             if (!p1.HasValue)
@@ -632,7 +632,7 @@ public int CustOrderHist(string x)
 
         // CustOrderHistAsync() cannot be created due to having out parameters, or is relying on the procedure result (int)
 
-        public int CustOrdersDetail(int? p1)
+        public int CustOrdersDetail(int? p1 = null)
         {
             return 0;
         }
@@ -646,7 +646,7 @@ public int CustOrdersOrders(string p1)
 
         // CustOrdersOrdersAsync() cannot be created due to having out parameters, or is relying on the procedure result (int)
 
-        public int EmployeeSalesByCountry(DateTime? p1, DateTime? p2)
+        public int EmployeeSalesByCountry(DateTime? p1 = null, DateTime? p2 = null)
         {
             return 0;
         }
@@ -660,7 +660,7 @@ public int SalesByCategory(string cn, string ordYear)
 
         // SalesByCategoryAsync() cannot be created due to having out parameters, or is relying on the procedure result (int)
 
-        public int SalesByYear(DateTime? p1, DateTime? p2)
+        public int SalesByYear(DateTime? p1 = null, DateTime? p2 = null)
         {
             return 0;
         }