Filtering out samples in tests

defrag · defrag · commit 9ffc28f5eae9 · 2023-06-02T07:39:25.000+02:00
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -36,4 +36,4 @@ jobs:
         run: dotnet build --configuration Release --no-restore
       
       - name: Test
-        run: dotnet test --no-restore
+        run: dotnet test --no-restore --filter Category!=Samples
diff --git a/NMatcher.sln b/NMatcher.sln
@@ -50,11 +50,9 @@ Global
 		{0DF37F7A-4722-4873-B00F-C8A280F8FADA}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0DF37F7A-4722-4873-B00F-C8A280F8FADA}.Release|Any CPU.Build.0 = Release|Any CPU
 		{E6718A10-90BF-4A12-9F62-A41EA160029B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E6718A10-90BF-4A12-9F62-A41EA160029B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E6718A10-90BF-4A12-9F62-A41EA160029B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E6718A10-90BF-4A12-9F62-A41EA160029B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B23EE86F-B5EB-43DA-BCDA-133579782271}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B23EE86F-B5EB-43DA-BCDA-133579782271}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B23EE86F-B5EB-43DA-BCDA-133579782271}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B23EE86F-B5EB-43DA-BCDA-133579782271}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
diff --git a/samples/NMatcher.Samples.Api.Tests/Integration/WeatherForecastControllerTests.cs b/samples/NMatcher.Samples.Api.Tests/Integration/WeatherForecastControllerTests.cs
@@ -3,6 +3,8 @@
 
 namespace NMatcher.Samples.Api.Tests.Integration;
 
+
+[Trait("Category", "Sample")]
 public class WeatherForecastControllerTests
 {
     [Fact]
diff --git a/samples/NMatcher.Samples.Api.Tests/NMatcher.Samples.Api.Tests.csproj b/samples/NMatcher.Samples.Api.Tests/NMatcher.Samples.Api.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
     <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net6.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
 
@@ -10,7 +10,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="7.0.5" />
+        <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="6.0.16" />
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
         <PackageReference Include="NMatcher.FluentAssertions" Version="2.2.2" />
         <PackageReference Include="xunit" Version="2.4.2" />
diff --git a/samples/NMatcher.Samples.Api/Controllers/WeatherForecastController.cs b/samples/NMatcher.Samples.Api/Controllers/WeatherForecastController.cs
@@ -23,7 +23,7 @@ public IEnumerable<WeatherForecast> Get()
     {
         return Enumerable.Range(1, 5).Select(index => new WeatherForecast
             {
-                Date = DateOnly.FromDateTime(DateTime.Now.AddDays(index)),
+                Date = DateTime.Now.AddDays(index),
                 TemperatureC = Random.Shared.Next(-20, 55),
                 Summary = Summaries[Random.Shared.Next(Summaries.Length)]
             })
diff --git a/samples/NMatcher.Samples.Api/NMatcher.Samples.Api.csproj b/samples/NMatcher.Samples.Api/NMatcher.Samples.Api.csproj
@@ -1,14 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
     <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFrameworks>net6.0;</TargetFrameworks>
         <Nullable>enable</Nullable>
         <ImplicitUsings>enable</ImplicitUsings>
+        <LangVersion>11</LangVersion>
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="7.0.4"/>
-        <PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0"/>
+        <PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/samples/NMatcher.Samples.Api/WeatherForecast.cs b/samples/NMatcher.Samples.Api/WeatherForecast.cs
@@ -2,7 +2,7 @@ namespace NMatcher.Samples.Api;
 
 public class WeatherForecast
 {
-    public DateOnly Date { get; set; }
+    public DateTime Date { get; set; }
 
     public int TemperatureC { get; set; }
 

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,8 @@`
`3`	`3`
`4`	`4`	`namespace NMatcher.Samples.Api.Tests.Integration;`
`5`	`5`
	`6`	`+`
	`7`	`+[Trait("Category", "Sample")]`
`6`	`8`	`public class WeatherForecastControllerTests`
`7`	`9`	`{`
`8`	`10`	`[Fact]`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ public IEnumerable<WeatherForecast> Get()`
`23`	`23`	`{`
`24`	`24`	`return Enumerable.Range(1, 5).Select(index => new WeatherForecast`
`25`	`25`	`{`
`26`		`- Date = DateOnly.FromDateTime(DateTime.Now.AddDays(index)),`
	`26`	`+ Date = DateTime.Now.AddDays(index),`
`27`	`27`	`TemperatureC = Random.Shared.Next(-20, 55),`
`28`	`28`	`Summary = Summaries[Random.Shared.Next(Summaries.Length)]`
`29`	`29`	`})`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ namespace NMatcher.Samples.Api;`
`2`	`2`
`3`	`3`	`public class WeatherForecast`
`4`	`4`	`{`
`5`		`- public DateOnly Date { get; set; }`
	`5`	`+ public DateTime Date { get; set; }`
`6`	`6`
`7`	`7`	`public int TemperatureC { get; set; }`
`8`	`8`