refactor: tests, bump target to netstandard2.0;net462;net6.0, move test data into sqlite. (#274)

jafin · web-flow · commit c4a743948fa0 · 2022-06-30T19:44:51.000+04:00
* refactor: tests, bump target to netstandard2.0;net462;net6.0, move test data into sqlite.

- Target netstandard2.0;net462;net6.0 (supported versions) (drop net40;net46)
- Update testing dependencies
- Migrate MDB data to sqlite (easier to run multiplatform/CI)

* Task: Update appveyor image to VS2022
diff --git a/ClosedXML.Report.sln b/ClosedXML.Report.sln
@@ -1,7 +1,7 @@
 ﻿
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27004.2006
+# Visual Studio Version 17
+VisualStudioVersion = 17.1.32414.318
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ClosedXML.Report", "ClosedXML.Report\ClosedXML.Report.csproj", "{DEF4A219-D1CF-42A2-A5AC-FE7F2F005AB0}"
 EndProject
@@ -11,8 +11,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{8438BAA8
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ClosedXML.Report.Tests", "tests\ClosedXML.Report.Tests\ClosedXML.Report.Tests.csproj", "{D529A371-3AEA-4D02-9A0D-308A6276D411}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestRunner", "tests\TestRunner\TestRunner.csproj", "{43C972B0-8F93-474E-AD9C-E54FEEB71A9A}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -32,20 +30,13 @@ Global
 		{D529A371-3AEA-4D02-9A0D-308A6276D411}.Release.Signed|Any CPU.Build.0 = Release.Signed|Any CPU
 		{D529A371-3AEA-4D02-9A0D-308A6276D411}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D529A371-3AEA-4D02-9A0D-308A6276D411}.Release|Any CPU.Build.0 = Release|Any CPU
-		{43C972B0-8F93-474E-AD9C-E54FEEB71A9A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{43C972B0-8F93-474E-AD9C-E54FEEB71A9A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{43C972B0-8F93-474E-AD9C-E54FEEB71A9A}.Release.Signed|Any CPU.ActiveCfg = Release.Signed|Any CPU
-		{43C972B0-8F93-474E-AD9C-E54FEEB71A9A}.Release.Signed|Any CPU.Build.0 = Release.Signed|Any CPU
-		{43C972B0-8F93-474E-AD9C-E54FEEB71A9A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{43C972B0-8F93-474E-AD9C-E54FEEB71A9A}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{DEF4A219-D1CF-42A2-A5AC-FE7F2F005AB0} = {885EF47A-C124-45F0-B979-303B30FB586B}
 		{D529A371-3AEA-4D02-9A0D-308A6276D411} = {8438BAA8-E968-4C14-9500-E3A52434E32A}
-		{43C972B0-8F93-474E-AD9C-E54FEEB71A9A} = {8438BAA8-E968-4C14-9500-E3A52434E32A}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {42DA0EC5-D733-4746-9613-413A64EEDC4B}
diff --git a/ClosedXML.Report/ClosedXML.Report.csproj b/ClosedXML.Report/ClosedXML.Report.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net40;net46</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net462;net6.0</TargetFrameworks>
     <LangVersion>Latest</LangVersion>
     <AssemblyName>ClosedXML.Report</AssemblyName>
     <PackageId>ClosedXML.Report</PackageId>
@@ -60,9 +60,9 @@
 
   <ItemGroup>
     <PackageReference Include="ClosedXML.Signed" Version="0.95.0" Condition="'$(Configuration)'=='Release.Signed'" />
-    <PackageReference Include="ClosedXML" Version="0.95.0" Condition="'$(Configuration)'!='Release.Signed'" />
-    <PackageReference Include="morelinq" Version="2.10.0" />
-    <PackageReference Include="System.Linq.Dynamic.Core" Version="1.2.10" />
+    <PackageReference Include="ClosedXML" Version="0.95.4" Condition="'$(Configuration)'!='Release.Signed'" />
+    <PackageReference Include="morelinq" Version="3.3.2" />
+    <PackageReference Include="System.Linq.Dynamic.Core" Version="1.2.18" />
   </ItemGroup>
 
 </Project>
diff --git a/ClosedXML.Report/Utils/StringExtensions.cs b/ClosedXML.Report/Utils/StringExtensions.cs
@@ -25,7 +25,7 @@ public static string ReplaceLast(this string source, string find, string replace
         }
 
         /// <summary>
-        /// Matching all capital letters in the input and seperate them with spaces to form a sentence.
+        /// Matching all capital letters in the input and separate them with spaces to form a sentence.
         /// If the input is an abbreviation text, no space will be added and returns the same input.
         /// </summary>
         /// <example>
@@ -156,4 +156,4 @@ public static string Format(this string stringFormat, params object[] pars)
             return string.Format(stringFormat, pars);
         }
     }
-}
+}
diff --git a/appveyor.yml b/appveyor.yml
@@ -5,8 +5,8 @@ version: 0.2.0.{build}
 pull_requests:
   do_not_increment_build_number: true
 
-os: Visual Studio 2019
-image: Visual Studio 2019
+os: Visual Studio 2022
+image: Visual Studio 2022
 skip_branch_with_pr: true
 
 environment:
diff --git a/tests/ClosedXML.Report.Tests/App.config b/tests/ClosedXML.Report.Tests/App.config
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <connectionStrings>
-    <add name="Default" connectionString="Provider=Microsoft.Jet.OLEDB.4.0;Data Source=..\..\..\..\DB\dbdemos.mdb;Locale Identifier=1033;Jet OLEDB:Engine Type=5;Persist Security Info=True" providerName="Access"/>
-    <!--<add name="DefaultConnection" connectionString="Provider=Microsoft.ACE.OLEDB.12.0;Data Source=..\..\..\DB\dbdemos.mdb;Persist Security Info=False;"
-      providerName="JetEntityFrameworkProvider"/>-->
+    <add name="Default" connectionString="Data Source=..\..\..\..\DB\dbdemos.sqlite;Version=3;" providerName="SQLite"/>
   </connectionStrings>
   <system.data>
     <DbProviderFactories>
     </DbProviderFactories>
   </system.data>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2"/></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/></startup></configuration>
diff --git a/tests/ClosedXML.Report.Tests/ClosedXML.Report.Tests.csproj b/tests/ClosedXML.Report.Tests/ClosedXML.Report.Tests.csproj
@@ -1,6 +1,6 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net452</TargetFrameworks>
+    <TargetFrameworks>net462;net6.0</TargetFrameworks>
     <LangVersion>Latest</LangVersion>
     <Configurations>Debug;Release;Release.Signed</Configurations>
     <PackageLicenseUrl>https://github.com/ClosedXML/ClosedXML.Report/blob/master/LICENSE</PackageLicenseUrl>
@@ -20,7 +20,7 @@
     <DefineConstants>$(DefineConstants);RELEASE;STRONGNAME</DefineConstants>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net452|AnyCPU'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <PlatformTarget>AnyCPU</PlatformTarget>
   </PropertyGroup>
   
@@ -29,19 +29,26 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Bogus" Version="33.0.2" />
-    <PackageReference Include="DocumentFormat.OpenXml" Version="2.7.2" />
-    <PackageReference Include="FluentAssertions" Version="4.18.0" />
-    <PackageReference Include="linq2db" Version="1.0.7.1" />
-    <PackageReference Include="linq2db.Access" Version="1.7.6" />
-    <PackageReference Include="linq2db.t4models" Version="1.0.7.1" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
-    <PackageReference Include="NSubstitute" Version="1.10.0.0" />
-    <PackageReference Include="System.Linq.Dynamic.Core" Version="1.2.10" />
+    <PackageReference Include="Bogus" Version="34.0.2" />
+    <PackageReference Include="DocumentFormat.OpenXml" Version="2.16.0" />
+    <PackageReference Include="FluentAssertions" Version="6.7.0" />
+    <PackageReference Include="linq2db" Version="3.7.0" />
+    <PackageReference Include="linq2db.SQLite" Version="3.7.0" />
+    <PackageReference Include="linq2db.t4models" Version="3.7.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
+    <PackageReference Include="NSubstitute" Version="4.3.0" />
+    <PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.0" />
+    <PackageReference Include="System.Linq.Dynamic.Core" Version="1.2.18" />
+    <PackageReference Include="System.Resources.Extensions" Version="6.0.0" />
+    <PackageReference Include="System.ServiceModel.Primitives" Version="4.9.0" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.assert" Version="2.4.1" />
     <PackageReference Include="xunit.extensibility.execution" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
   </ItemGroup>
 
   <ItemGroup>
@@ -50,9 +57,6 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\ClosedXML.Report\ClosedXML.Report.csproj" />
-    <Reference Include="System.ComponentModel.DataAnnotations" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="WindowsBase" />
   </ItemGroup>
 
   <ItemGroup>
@@ -69,4 +73,10 @@
       <LastGenOutput>Resource.Designer.cs</LastGenOutput>
     </EmbeddedResource>
   </ItemGroup>
+
+  <ItemGroup>
+    <None Update="appsettings.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
 </Project>
diff --git a/tests/ClosedXML.Report.Tests/DbContextTests.cs b/tests/ClosedXML.Report.Tests/DbContextTests.cs
@@ -5,6 +5,8 @@
 
 namespace ClosedXML.Report.Tests
 {
+
+    [Collection("Database")]
     public class DbContextTests
     {
         [Fact]
@@ -25,4 +27,4 @@ public void Orders_should_not_be_empty()
             }
         }
     }
-}
+}
diff --git a/tests/ClosedXML.Report.Tests/GroupTagTests.cs b/tests/ClosedXML.Report.Tests/GroupTagTests.cs
@@ -8,6 +8,7 @@
 
 namespace ClosedXML.Report.Tests
 {
+    [Collection("Database")]
     public class GroupTagTests : XlsxTemplateTestsBase
     {
         public GroupTagTests(ITestOutputHelper output) : base(output)
@@ -86,7 +87,7 @@ public void Customers(string templateFile)
                 {
                     using (var db = new DbDemos())
                     {
-                        var orders = db.orders.LoadWith(x => x.Customer);
+                        var orders = db.orders.LoadWith(x => x.Customer).ToList();
                         tpl.AddVariable("Orders", orders);
                     }
                 },
diff --git a/tests/ClosedXML.Report.Tests/PivotTests.cs b/tests/ClosedXML.Report.Tests/PivotTests.cs
@@ -1,13 +1,12 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Linq;
+﻿using System.Linq;
 using ClosedXML.Excel;
 using ClosedXML.Report.Tests.TestModels;
 using Xunit;
 using Xunit.Abstractions;
 
 namespace ClosedXML.Report.Tests
 {
+    [Collection("Database")]
     public class PivotTests : XlsxTemplateTestsBase
     {
         public PivotTests(ITestOutputHelper output) : base(output)
@@ -24,8 +23,16 @@ public void Simple(string templateFile)
                 {
                     using (var db = new DbDemos())
                     {
-                        var rows = from o in db.orders
-                            select new {o.Customer.Company, o.PaymentMethod, OrderNo = o.OrderNo.ToString(), o.ShipDate, o.ItemsTotal, o.TaxRate, o.AmountPaid};
+                        var rows = db.orders.Select(o => new
+                        {
+                            o.Customer.Company,
+                            o.PaymentMethod,
+                            OrderNo = o.OrderNo.ToString(),
+                            o.ShipDate,
+                            o.ItemsTotal,
+                            o.TaxRate,
+                            o.AmountPaid
+                        }).ToList();
                         tpl.AddVariable("Orders", rows);
                     }
                 },
diff --git a/tests/ClosedXML.Report.Tests/SubrangesTests.cs b/tests/ClosedXML.Report.Tests/SubrangesTests.cs
@@ -1,6 +1,5 @@
 ﻿using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Linq;
 using ClosedXML.Report.Tests.TestModels;
 using LinqToDB;
@@ -9,6 +8,8 @@
 
 namespace ClosedXML.Report.Tests
 {
+
+    [Collection("Database")]
     public class SubrangesTests : XlsxTemplateTestsBase
     {
         [Theory,
diff --git a/tests/ClosedXML.Report.Tests/TestModels/DbDemos.cs b/tests/ClosedXML.Report.Tests/TestModels/DbDemos.cs
@@ -32,16 +32,27 @@ public partial class DbDemos : LinqToDB.Data.DataConnection
 
         public DbDemos()
         {
-            InitDataContext();
+            UpdateMappingSchema();
         }
 
         public DbDemos(string configuration)
             : base(configuration)
         {
-            InitDataContext();
+            UpdateMappingSchema();
         }
 
-        partial void InitDataContext();
+        private void UpdateMappingSchema()
+        {
+            this.MappingSchema.SetConverter<long, DateTime?>(ticks => new DateTime(ticks, DateTimeKind.Unspecified));
+            this.MappingSchema.SetConverter<string, DateTime?>(ticks =>
+            {
+                if (string.IsNullOrEmpty(ticks))
+                {
+                    return null;
+                }
+                return DateTime.Parse(ticks);
+            });
+        }
     }
 
     [Table("country")]
diff --git a/tests/ClosedXML.Report.Tests/Utils/Configuration.cs b/tests/ClosedXML.Report.Tests/Utils/Configuration.cs
@@ -0,0 +1,20 @@
+﻿using System;
+using Microsoft.Extensions.Configuration;
+
+namespace ClosedXML.Report.Tests
+{
+    public class Configuration
+    {
+        public IConfigurationRoot Config { get; set; }
+        public Configuration()
+        {
+            Config = new ConfigurationBuilder()
+                .SetBasePath(AppContext.BaseDirectory)
+                .AddJsonFile("appsettings.json", false, true)
+                .Build();
+            
+        }
+
+        public string DefaultConnectionString => Config.GetConnectionString("Default");
+    }
+}
diff --git a/tests/ClosedXML.Report.Tests/Utils/DatabaseCollection.cs b/tests/ClosedXML.Report.Tests/Utils/DatabaseCollection.cs
@@ -0,0 +1,12 @@
+﻿using Xunit;
+
+namespace ClosedXML.Report.Tests.Utils
+{
+    [CollectionDefinition("Database")]
+    public class DatabaseCollection : ICollectionFixture<DatabaseFixture>
+    {
+        // This class has no code, and is never created. Its purpose is simply
+        // to be the place to apply [CollectionDefinition] and all the
+        // ICollectionFixture<> interfaces.
+    }
+}
diff --git a/tests/ClosedXML.Report.Tests/Utils/DatabaseFixture.cs b/tests/ClosedXML.Report.Tests/Utils/DatabaseFixture.cs
@@ -0,0 +1,17 @@
+﻿using System;
+using ClosedXML.Report.Tests.TestModels;
+
+namespace ClosedXML.Report.Tests.Utils
+{
+    public class DatabaseFixture : IDisposable
+    {
+        public DatabaseFixture()
+        {
+            DbDemos.DefaultSettings = new DbSettings();
+        }
+
+        public void Dispose()
+        {
+        }
+    }
+}
diff --git a/tests/ClosedXML.Report.Tests/Utils/DbSettings.cs b/tests/ClosedXML.Report.Tests/Utils/DbSettings.cs
@@ -0,0 +1,38 @@
+﻿using System.Collections.Generic;
+using System.Linq;
+using LinqToDB;
+using LinqToDB.Configuration;
+
+namespace ClosedXML.Report.Tests
+{
+    public class ConnectionStringSettings : IConnectionStringSettings
+    {
+        public string ConnectionString { get; set; }
+        public string Name { get; set; }
+        public string ProviderName { get; set; }
+        public bool IsGlobal => false;
+    }
+
+    public class DbSettings : ILinqToDBSettings
+    {
+        public IEnumerable<IDataProviderSettings> DataProviders => Enumerable.Empty<IDataProviderSettings>();
+        public string DefaultConfiguration => "Default";
+        public string DefaultDataProvider => ProviderName.SQLite;
+
+        private readonly Configuration _configuration = new Configuration();
+
+        public IEnumerable<IConnectionStringSettings> ConnectionStrings
+        {
+            get
+            {
+                yield return
+                    new ConnectionStringSettings
+                    {
+                        Name = "Default",
+                        ProviderName = ProviderName.SQLite,
+                        ConnectionString = _configuration.DefaultConnectionString
+                    };
+            }
+        }
+    }
+}
diff --git a/tests/ClosedXML.Report.Tests/VernoStringReaderTests.cs b/tests/ClosedXML.Report.Tests/VernoStringReaderTests.cs
diff --git a/tests/ClosedXML.Report.Tests/XlsxTemplateTestsBase.cs b/tests/ClosedXML.Report.Tests/XlsxTemplateTestsBase.cs
diff --git a/tests/ClosedXML.Report.Tests/appsettings.json b/tests/ClosedXML.Report.Tests/appsettings.json
diff --git a/tests/DB/dbdemos.sqlite b/tests/DB/dbdemos.sqlite
diff --git a/tests/TestRunner/App.config b/tests/TestRunner/App.config
diff --git a/tests/TestRunner/TestRunner.csproj b/tests/TestRunner/TestRunner.csproj

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ public static string ReplaceLast(this string source, string find, string replace`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`/// <summary>`
`28`		`- /// Matching all capital letters in the input and seperate them with spaces to form a sentence.`
	`28`	`+ /// Matching all capital letters in the input and separate them with spaces to form a sentence.`
`29`	`29`	`/// If the input is an abbreviation text, no space will be added and returns the same input.`
`30`	`30`	`/// </summary>`
`31`	`31`	`/// <example>`
`@@ -156,4 +156,4 @@ public static string Format(this string stringFormat, params object[] pars)`
`156`	`156`	`return string.Format(stringFormat, pars);`
`157`	`157`	`}`
`158`	`158`	`}`
`159`		`-}`
	`159`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,8 @@`
`5`	`5`
`6`	`6`	`namespace ClosedXML.Report.Tests`
`7`	`7`	`{`
	`8`	`+`
	`9`	`+ [Collection("Database")]`
`8`	`10`	`public class DbContextTests`
`9`	`11`	`{`
`10`	`12`	`[Fact]`
`@@ -25,4 +27,4 @@ public void Orders_should_not_be_empty()`
`25`	`27`	`}`
`26`	`28`	`}`
`27`	`29`	`}`
`28`		`-}`
	`30`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@`
`8`	`8`
`9`	`9`	`namespace ClosedXML.Report.Tests`
`10`	`10`	`{`
	`11`	`+ [Collection("Database")]`
`11`	`12`	`public class GroupTagTests : XlsxTemplateTestsBase`
`12`	`13`	`{`
`13`	`14`	`public GroupTagTests(ITestOutputHelper output) : base(output)`
`@@ -86,7 +87,7 @@ public void Customers(string templateFile)`
`86`	`87`	`{`
`87`	`88`	`using (var db = new DbDemos())`
`88`	`89`	`{`
`89`		`- var orders = db.orders.LoadWith(x => x.Customer);`
	`90`	`+ var orders = db.orders.LoadWith(x => x.Customer).ToList();`
`90`	`91`	`tpl.AddVariable("Orders", orders);`
`91`	`92`	`}`
`92`	`93`	`},`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.Collections.Generic;`
`3`		`-using System.IO;`
`4`	`3`	`using System.Linq;`
`5`	`4`	`using ClosedXML.Report.Tests.TestModels;`
`6`	`5`	`using LinqToDB;`
`@@ -9,6 +8,8 @@`
`9`	`8`
`10`	`9`	`namespace ClosedXML.Report.Tests`
`11`	`10`	`{`
	`11`	`+`
	`12`	`+ [Collection("Database")]`
`12`	`13`	`public class SubrangesTests : XlsxTemplateTestsBase`
`13`	`14`	`{`
`14`	`15`	`[Theory,`