Migrate from NUnit to xUnit

FredrikAugust · Kpaubert · commit 6b8b06271290 · 2021-03-05T14:03:50.000+01:00
diff --git a/Backend.sln b/Backend.sln
@@ -2,7 +2,7 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Backend", "Backend.csproj", "{07A4DC6F-5677-4088-8095-6048D06A0934}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BackendTests", "BackendTests\BackendTests.csproj", "{5D584475-4CD1-4FE6-98AB-D44429403B5C}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BackendTests", "BackendTests\BackendTests.csproj", "{4CCDDE27-DDF4-4F6C-9689-C300F362EF9A}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -14,9 +14,9 @@ Global
 		{07A4DC6F-5677-4088-8095-6048D06A0934}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{07A4DC6F-5677-4088-8095-6048D06A0934}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{07A4DC6F-5677-4088-8095-6048D06A0934}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5D584475-4CD1-4FE6-98AB-D44429403B5C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5D584475-4CD1-4FE6-98AB-D44429403B5C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5D584475-4CD1-4FE6-98AB-D44429403B5C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5D584475-4CD1-4FE6-98AB-D44429403B5C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4CCDDE27-DDF4-4F6C-9689-C300F362EF9A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4CCDDE27-DDF4-4F6C-9689-C300F362EF9A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4CCDDE27-DDF4-4F6C-9689-C300F362EF9A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4CCDDE27-DDF4-4F6C-9689-C300F362EF9A}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 EndGlobal
diff --git a/BackendTests/BackendTests.csproj b/BackendTests/BackendTests.csproj
@@ -7,10 +7,16 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Bogus" Version="33.0.2" />
-        <PackageReference Include="NUnit" Version="3.13.1" />
-        <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
+        <PackageReference Include="xunit" Version="2.4.1" />
+        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+            <PrivateAssets>all</PrivateAssets>
+        </PackageReference>
+        <PackageReference Include="coverlet.collector" Version="1.3.0">
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+            <PrivateAssets>all</PrivateAssets>
+        </PackageReference>
     </ItemGroup>
 
     <ItemGroup>
diff --git a/BackendTests/UnitTests/MetAPITests.cs b/BackendTests/UnitTests/MetAPITests.cs
@@ -3,7 +3,7 @@
 using Backend.Mocks.MetAPI;
 using Backend.Models.MetAPI.POCO;
 using Backend.utils;
-using NUnit.Framework;
+using Xunit;
 
 namespace BackendTests.UnitTests
 {
@@ -15,30 +15,29 @@ public class MetAPITests
         private float _lon;
         private Random _random;
 
-        [SetUp]
-        public void Setup()
+        public MetAPITests()
         {
             _random = new Random();
             _lon = (float) _random.NextDouble() * (63.433f - 63.42f) + 63.42f;
             _lat = (float) _random.NextDouble() * (10.4f - 10.38f) + 10.38f;
             _forecast = Compact.GenerateSampleForecast(_lon, _lat);
         }
 
-        [Test]
+        [Fact]
         public void MetAPIShouldReturnData()
         {
             Assert.NotNull(_forecast);
         }
 
-        [Test]
+        [Fact]
         public void MetAPIShouldReturnCorrectCoordinates()
         {
-            Assert.That("Feature", Is.EqualTo(_forecast.Type).NoClip);
-            Assert.That(_lon, Is.EqualTo(_forecast.ForecastGeometry.Coordinates[0]).Within(0.0001).Percent);
-            Assert.That(_lat, Is.EqualTo(_forecast.ForecastGeometry.Coordinates[1]).Within(0.0001).Percent);
+            Assert.Equal("Feature", _forecast.Type);
+            Assert.Equal(_lon, _forecast.ForecastGeometry.Coordinates[0], 3);
+            Assert.Equal(_lat, _forecast.ForecastGeometry.Coordinates[1], 3);
         }
 
-        [Test]
+        [Fact]
         public void MetAPIShouldReturnCorrectSymbolCode()
         {
             Assert.Contains(_forecast.ForecastProperties.Timeseries[0].ForecastData.Next1Hours.Summary.SymbolCode,
diff --git a/BackendTests/UnitTests/PopulationInNorwayTests.cs b/BackendTests/UnitTests/PopulationInNorwayTests.cs
@@ -2,52 +2,52 @@
 using Backend.Mocks.SSB;
 using Backend.Models.SSB.POCO;
 using Backend.utils;
-using NUnit.Framework;
+using Xunit;
 
 namespace BackendTests.UnitTests
 {
     public class PopulationInNorwayTests
     {
-        private Random _r;
+        private readonly Random _r;
         private readonly int _numMunicipalities = NorwayTools.MunicipalityCodeToIndex.Count;
         private readonly int _numYears = NorwayTools.YearToIndex.Count;
-        private PopulationPerMunicipalityNorway _population;
+        private readonly PopulationPerMunicipalityNorway _population;
 
-        [SetUp]
-        public void Setup()
+        public PopulationInNorwayTests()
         {
             _r = new Random();
             _population = MockPopulationInNorway.GenerateSamplePopulationsInNorway();
         }
 
-        [Test]
+        [Fact]
         public void PopulationInNorwayAPIShouldReturnData()
         {
             Assert.NotNull(_population);
         }
 
-        [Test]
+        [Fact]
         public void PopulationInNorwayShouldIncreasePerMunicipality()
         {
             var randomSample = _r.Next(_numMunicipalities, _population.Dataset.Value.Count - 1);
             var currYearPopulation = _population.Dataset.Value[randomSample];
             var prevYearPopulation = _population.Dataset.Value[randomSample - _numMunicipalities];
-            Assert.Greater(currYearPopulation, prevYearPopulation);
-            Assert.That(currYearPopulation - prevYearPopulation <= 500);
-            Assert.That(currYearPopulation - prevYearPopulation >= 1);
+            
+            Assert.True(currYearPopulation > prevYearPopulation);
+            Assert.True(currYearPopulation - prevYearPopulation <= 500);
+            Assert.True(currYearPopulation - prevYearPopulation >= 1);
         }
 
-        [Test]
+        [Fact]
         public void PopulationInNorwayCorrectLabelAndSource()
         {
-            Assert.AreEqual("07459: Befolkning, etter region, år og statistikkvariabel", _population.Dataset.Label);
-            Assert.AreEqual("Statistisk sentralbyrå", _population.Dataset.Source);
+            Assert.Equal("07459: Befolkning, etter region, år og statistikkvariabel", _population.Dataset.Label);
+            Assert.Equal("Statistisk sentralbyrå", _population.Dataset.Source);
         }
 
-        [Test]
+        [Fact]
         public void PopulationInNorwayGeneratesCorrectAmountOfData()
         {
-            Assert.AreEqual(_numMunicipalities * _numYears, _population.Dataset.Value.Count);
+            Assert.Equal(_numMunicipalities * _numYears, _population.Dataset.Value.Count);
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`using Backend.Mocks.MetAPI;`
`4`	`4`	`using Backend.Models.MetAPI.POCO;`
`5`	`5`	`using Backend.utils;`
`6`		`-using NUnit.Framework;`
	`6`	`+using Xunit;`
`7`	`7`
`8`	`8`	`namespace BackendTests.UnitTests`
`9`	`9`	`{`
`@@ -15,30 +15,29 @@ public class MetAPITests`
`15`	`15`	`private float _lon;`
`16`	`16`	`private Random _random;`
`17`	`17`
`18`		`- [SetUp]`
`19`		`- public void Setup()`
	`18`	`+ public MetAPITests()`
`20`	`19`	`{`
`21`	`20`	`_random = new Random();`
`22`	`21`	`_lon = (float) _random.NextDouble() * (63.433f - 63.42f) + 63.42f;`
`23`	`22`	`_lat = (float) _random.NextDouble() * (10.4f - 10.38f) + 10.38f;`
`24`	`23`	`_forecast = Compact.GenerateSampleForecast(_lon, _lat);`
`25`	`24`	`}`
`26`	`25`
`27`		`- [Test]`
	`26`	`+ [Fact]`
`28`	`27`	`public void MetAPIShouldReturnData()`
`29`	`28`	`{`
`30`	`29`	`Assert.NotNull(_forecast);`
`31`	`30`	`}`
`32`	`31`
`33`		`- [Test]`
	`32`	`+ [Fact]`
`34`	`33`	`public void MetAPIShouldReturnCorrectCoordinates()`
`35`	`34`	`{`
`36`		`- Assert.That("Feature", Is.EqualTo(_forecast.Type).NoClip);`
`37`		`- Assert.That(_lon, Is.EqualTo(_forecast.ForecastGeometry.Coordinates[0]).Within(0.0001).Percent);`
`38`		`- Assert.That(_lat, Is.EqualTo(_forecast.ForecastGeometry.Coordinates[1]).Within(0.0001).Percent);`
	`35`	`+ Assert.Equal("Feature", _forecast.Type);`
	`36`	`+ Assert.Equal(_lon, _forecast.ForecastGeometry.Coordinates[0], 3);`
	`37`	`+ Assert.Equal(_lat, _forecast.ForecastGeometry.Coordinates[1], 3);`
`39`	`38`	`}`
`40`	`39`
`41`		`- [Test]`
	`40`	`+ [Fact]`
`42`	`41`	`public void MetAPIShouldReturnCorrectSymbolCode()`
`43`	`42`	`{`
`44`	`43`	`Assert.Contains(_forecast.ForecastProperties.Timeseries[0].ForecastData.Next1Hours.Summary.SymbolCode,`
Original file line number	Diff line number	Diff line change
`@@ -2,52 +2,52 @@`
`2`	`2`	`using Backend.Mocks.SSB;`
`3`	`3`	`using Backend.Models.SSB.POCO;`
`4`	`4`	`using Backend.utils;`
`5`		`-using NUnit.Framework;`
	`5`	`+using Xunit;`
`6`	`6`
`7`	`7`	`namespace BackendTests.UnitTests`
`8`	`8`	`{`
`9`	`9`	`public class PopulationInNorwayTests`
`10`	`10`	`{`
`11`		`- private Random _r;`
	`11`	`+ private readonly Random _r;`
`12`	`12`	`private readonly int _numMunicipalities = NorwayTools.MunicipalityCodeToIndex.Count;`
`13`	`13`	`private readonly int _numYears = NorwayTools.YearToIndex.Count;`
`14`		`- private PopulationPerMunicipalityNorway _population;`
	`14`	`+ private readonly PopulationPerMunicipalityNorway _population;`
`15`	`15`
`16`		`- [SetUp]`
`17`		`- public void Setup()`
	`16`	`+ public PopulationInNorwayTests()`
`18`	`17`	`{`
`19`	`18`	`_r = new Random();`
`20`	`19`	`_population = MockPopulationInNorway.GenerateSamplePopulationsInNorway();`
`21`	`20`	`}`
`22`	`21`
`23`		`- [Test]`
	`22`	`+ [Fact]`
`24`	`23`	`public void PopulationInNorwayAPIShouldReturnData()`
`25`	`24`	`{`
`26`	`25`	`Assert.NotNull(_population);`
`27`	`26`	`}`
`28`	`27`
`29`		`- [Test]`
	`28`	`+ [Fact]`
`30`	`29`	`public void PopulationInNorwayShouldIncreasePerMunicipality()`
`31`	`30`	`{`
`32`	`31`	`var randomSample = _r.Next(_numMunicipalities, _population.Dataset.Value.Count - 1);`
`33`	`32`	`var currYearPopulation = _population.Dataset.Value[randomSample];`
`34`	`33`	`var prevYearPopulation = _population.Dataset.Value[randomSample - _numMunicipalities];`
`35`		`- Assert.Greater(currYearPopulation, prevYearPopulation);`
`36`		`- Assert.That(currYearPopulation - prevYearPopulation <= 500);`
`37`		`- Assert.That(currYearPopulation - prevYearPopulation >= 1);`
	`34`	`+`
	`35`	`+ Assert.True(currYearPopulation > prevYearPopulation);`
	`36`	`+ Assert.True(currYearPopulation - prevYearPopulation <= 500);`
	`37`	`+ Assert.True(currYearPopulation - prevYearPopulation >= 1);`
`38`	`38`	`}`
`39`	`39`
`40`		`- [Test]`
	`40`	`+ [Fact]`
`41`	`41`	`public void PopulationInNorwayCorrectLabelAndSource()`
`42`	`42`	`{`
`43`		`- Assert.AreEqual("07459: Befolkning, etter region, år og statistikkvariabel", _population.Dataset.Label);`
`44`		`- Assert.AreEqual("Statistisk sentralbyrå", _population.Dataset.Source);`
	`43`	`+ Assert.Equal("07459: Befolkning, etter region, år og statistikkvariabel", _population.Dataset.Label);`
	`44`	`+ Assert.Equal("Statistisk sentralbyrå", _population.Dataset.Source);`
`45`	`45`	`}`
`46`	`46`
`47`		`- [Test]`
	`47`	`+ [Fact]`
`48`	`48`	`public void PopulationInNorwayGeneratesCorrectAmountOfData()`
`49`	`49`	`{`
`50`		`- Assert.AreEqual(_numMunicipalities * _numYears, _population.Dataset.Value.Count);`
	`50`	`+ Assert.Equal(_numMunicipalities * _numYears, _population.Dataset.Value.Count);`
`51`	`51`	`}`
`52`	`52`	`}`
`53`	`53`	`}`