Updated build scripts to use auto-discovery (#683)

* Fixed another cause for random test failures

The problem: NoEntityFrameworkTests project has a reference to UnitTests project, which has a reference to JsonApiDotNetCoreExampleTests project, which has a reference to JsonApiDotNetCoreExample project. The last one contains an appsettings.json file with connection string to JsonApiDotNetCoreExample database. So when building, this file may end up in the output directory of NoEntityFrameworkTests project, overwriting the appsettings.json (containing the connection string to JsonApiDotNetCoreNoEFCoreExample database) from NoEntityFrameworkExample project.

Next, if the NoEntityFrameworkTests testset runs first, it populates the JsonApiDotNetCoreExample database from models intended for the JsonApiDotNetCoreNoEFCoreExample database. And this causes subsequent test projects to fail.

* Updated build scripts to use auto-discovery

* Tried another workaround

Author: Bart Koelman

Build.ps1

@@ -22,23 +22,26 @@ $revision = @{ $true = $env:APPVEYOR_BUILD_NUMBER; $false = 1 }[$env:APPVEYOR_BU
 $revision = "{0:D4}" -f [convert]::ToInt32($revision, 10)
 
 dotnet restore
+CheckLastExitCode
 
-dotnet build ./src/Examples/GettingStarted/GettingStarted.csproj
+dotnet build -c Release
 CheckLastExitCode
 
-dotnet test ./test/UnitTests/UnitTests.csproj
+# Workaround: running 'dotnet test -c Release' fails for yet unknown reasons on AppVeyor, so we run tests one by one.
+
+dotnet test ./test/JsonApiDotNetCoreExampleTests/JsonApiDotNetCoreExampleTests.csproj -c Release --no-build
 CheckLastExitCode
 
-dotnet test ./test/JsonApiDotNetCoreExampleTests/JsonApiDotNetCoreExampleTests.csproj
+dotnet test ./test/DiscoveryTests/DiscoveryTests.csproj -c Release --no-build
 CheckLastExitCode
 
-dotnet test ./test/NoEntityFrameworkTests/NoEntityFrameworkTests.csproj
+dotnet test ./test/IntegrationTests/IntegrationTests.csproj -c Release --no-build
 CheckLastExitCode
 
-dotnet test ./test/DiscoveryTests/DiscoveryTests.csproj
+dotnet test ./test/UnitTests/UnitTests.csproj -c Release --no-build
 CheckLastExitCode
 
-dotnet build ./src/JsonApiDotNetCore/JsonApiDotNetCore.csproj -c Release
+dotnet test ./test/NoEntityFrameworkTests/NoEntityFrameworkTests.csproj -c Release --no-build
 CheckLastExitCode
 
 Write-Output "APPVEYOR_REPO_TAG: $env:APPVEYOR_REPO_TAG"

build.sh

@@ -4,7 +4,5 @@
 set -e
 
 dotnet restore
-
-dotnet test ./test/UnitTests/UnitTests.csproj
-dotnet test ./test/JsonApiDotNetCoreExampleTests/JsonApiDotNetCoreExampleTests.csproj
-dotnet test ./test/NoEntityFrameworkTests/NoEntityFrameworkTests.csproj
+dotnet build -c Release
+dotnet test -c Release --no-build

src/Examples/NoEntityFrameworkExample/Startup.cs

@@ -1,3 +1,4 @@
+using System;
 using JsonApiDotNetCore.Extensions;
 using JsonApiDotNetCore.Services;
 using Microsoft.AspNetCore.Builder;
@@ -37,7 +38,7 @@ public virtual void ConfigureServices(IServiceCollection services)
                 );
             services.AddScoped<IResourceService<TodoItem>, TodoItemService>();
             var optionsBuilder = new DbContextOptionsBuilder<AppDbContext>(); 
-            optionsBuilder.UseNpgsql(GetDbConnectionString()); 
+            optionsBuilder.UseNpgsql(GetDbConnectionString(), options => options.SetPostgresVersion(new Version(9,6)));
             services.AddSingleton<IConfiguration>(Configuration);
             services.AddSingleton(optionsBuilder.Options);
             services.AddScoped<AppDbContext>();

src/JsonApiDotNetCore/JsonApiDotNetCore.sln

@@ -15,7 +15,6 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="../../src/Examples/NoEntityFrameworkExample/NoEntityFrameworkExample.csproj" />
-    <ProjectReference Include="../UnitTests/UnitTests.csproj" />
     <ProjectReference Include="..\..\src\JsonApiDotNetCore\JsonApiDotNetCore.csproj" />
   </ItemGroup>
   <ItemGroup>

test/JsonApiDotNetCoreExampleTests/JsonApiDotNetCoreExampleTests.sln

@@ -0,0 +1,28 @@
+using System;
+using JsonApiDotNetCore.Services;
+using Microsoft.AspNetCore.Http;
+using Moq;
+
+namespace NoEntityFrameworkTests
+{
+    public class TestScopedServiceProvider : IScopedServiceProvider
+    {
+        private readonly IServiceProvider _serviceProvider;
+        private Mock<IHttpContextAccessor> _httpContextAccessorMock = new Mock<IHttpContextAccessor>();
+
+        public TestScopedServiceProvider(IServiceProvider serviceProvider)
+        {
+            _serviceProvider = serviceProvider;
+        }
+
+        public object GetService(Type serviceType)
+        {
+            if (serviceType == typeof(IHttpContextAccessor))
+            {
+                return _httpContextAccessorMock.Object;
+            }
+
+            return _serviceProvider.GetService(serviceType);
+        }
+    }
+}

test/NoEntityFrameworkTests/NoEntityFrameworkTests.csproj

@@ -2,8 +2,6 @@
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.DependencyInjection;
 using NoEntityFrameworkExample;
-using System;
-using UnitTests;
 
 namespace NoEntityFrameworkTests
 {