All tests are working again

jgauffin · jgauffin · commit c86a6ece64f2 · 2018-04-04T12:01:08.000+02:00
diff --git a/src/Server/Coderr.Server.Api.Client.Tests/Coderr.Server.Api.Client.Tests.csproj b/src/Server/Coderr.Server.Api.Client.Tests/Coderr.Server.Api.Client.Tests.csproj
@@ -1,6 +1,6 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>net461</TargetFramework>
     <RootNamespace>Coderr.Server.Api.Client.Tests</RootNamespace>
     <AssemblyName>Coderr.Server.Api.Client.Tests</AssemblyName>
   </PropertyGroup>
diff --git a/src/Server/Coderr.Server.Api.Client/ServerApiClient.cs b/src/Server/Coderr.Server.Api.Client/ServerApiClient.cs
@@ -23,28 +23,12 @@ public class ServerApiClient : IMessageBus, IQueryBus
             ReferenceLoopHandling = ReferenceLoopHandling.Ignore,
             ContractResolver = new IncludeNonPublicMembersContractResolver()
         };
+
         private string _apiKey;
         private string _sharedSecret;
         private Uri _uri;
 
-        async Task<TResult> IQueryBus.QueryAsync<TResult>(ClaimsPrincipal user, Query<TResult> query)
-        {
-            //TODO: Unwrap the cqs object to query parameters instead
-            //to allow caching in the server
-            var response = await RequestAsync("POST", "query", query);
-            return await DeserializeResponse<TResult>(response);
-
-        }
 
-        public async Task<TResult> QueryAsync<TResult>(Query<TResult> query)
-        {
-            //TODO: Unwrap the cqs object to query parameters instead
-            //to allow caching in the server
-            var response = await RequestAsync("POST", "query", query);
-            return await DeserializeResponse<TResult>(response);
-        }
-
-        
         async Task IMessageBus.SendAsync(ClaimsPrincipal principal, object message)
         {
             await RequestAsync("POST", "send", message);
@@ -60,11 +44,38 @@ async Task IMessageBus.SendAsync(Message message)
             await RequestAsync("POST", "send", message.Body);
         }
 
+        /// <summary>
+        ///     Send a command or event
+        /// </summary>
+        /// <param name="message">message</param>
+        /// <returns>task</returns>
         public async Task SendAsync(object message)
         {
             await RequestAsync("POST", "send", message);
         }
 
+        async Task<TResult> IQueryBus.QueryAsync<TResult>(ClaimsPrincipal user, Query<TResult> query)
+        {
+            //TODO: Unwrap the cqs object to query parameters instead
+            //to allow caching in the server
+            var response = await RequestAsync("POST", "query", query);
+            return await DeserializeResponse<TResult>(response);
+        }
+
+        /// <summary>
+        ///     Make a query
+        /// </summary>
+        /// <typeparam name="TResult">Type of result that the query returns</typeparam>
+        /// <param name="query">query to invoke</param>
+        /// <returns>task</returns>
+        public async Task<TResult> QueryAsync<TResult>(Query<TResult> query)
+        {
+            //TODO: Unwrap the cqs object to query parameters instead
+            //to allow caching in the server
+            var response = await RequestAsync("POST", "query", query);
+            return await DeserializeResponse<TResult>(response);
+        }
+
 
         /// <summary>
         ///     Open a channel
@@ -78,7 +89,7 @@ public void Open(Uri uri, string apiKey, string sharedSecret)
             _sharedSecret = sharedSecret ?? throw new ArgumentNullException(nameof(sharedSecret));
             _uri = uri ?? throw new ArgumentNullException(nameof(uri));
         }
-        
+
 
         private async Task<TResult> DeserializeResponse<TResult>(HttpWebResponse response)
         {
diff --git a/src/Server/Coderr.Server.App.Tests/Coderr.Server.App.Tests.csproj b/src/Server/Coderr.Server.App.Tests/Coderr.Server.App.Tests.csproj
@@ -1,6 +1,6 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>net461</TargetFramework>
     <RootNamespace>Coderr.Server.App.Tests</RootNamespace>
     <AssemblyName>Coderr.Server.App.Tests</AssemblyName>
   </PropertyGroup>
diff --git a/src/Server/Coderr.Server.ReportAnalyzer.Tests/app.config b/src/Server/Coderr.Server.ReportAnalyzer.Tests/app.config
diff --git a/src/Server/Coderr.Server.ReportAnalyzer.Tests/codeRR.Server.ReportAnalyzer.Tests.csproj b/src/Server/Coderr.Server.ReportAnalyzer.Tests/codeRR.Server.ReportAnalyzer.Tests.csproj
@@ -1,20 +1,23 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
-    <RootNamespace>Coderr.Server.ReportAnalyzer.Tests</RootNamespace>
-    <AssemblyName>Coderr.Server.ReportAnalyzer.Tests</AssemblyName>
+    <TargetFramework>net461</TargetFramework>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
   </PropertyGroup>
+
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.6.1" />
     <PackageReference Include="xunit" Version="2.3.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
     <PackageReference Include="FluentAssertions" Version="5.2.0" />
     <PackageReference Include="NSubstitute" Version="3.1.0" />
   </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\Coderr.Server.Domain\Coderr.Server.Domain.csproj" />
     <ProjectReference Include="..\Coderr.Server.ReportAnalyzer\Coderr.Server.ReportAnalyzer.csproj" />
   </ItemGroup>
+
   <ItemGroup>
     <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}"></Service>
   </ItemGroup>
diff --git a/src/Server/Coderr.Server.ReportAnalyzer/Boot/Bootstrapper.cs b/src/Server/Coderr.Server.ReportAnalyzer/Boot/Bootstrapper.cs
@@ -6,10 +6,7 @@
 using Coderr.Server.Abstractions.Config;
 using Coderr.Server.Abstractions.Security;
 using Coderr.Server.Infrastructure.Configuration.Database;
-using Coderr.Server.ReportAnalyzer.Abstractions.Incidents;
 using Coderr.Server.ReportAnalyzer.Boot.Adapters;
-using DotNetCqs;
-using DotNetCqs.Queues;
 using Griffin.Data;
 using Microsoft.Extensions.DependencyInjection;
 
@@ -18,7 +15,6 @@ namespace Coderr.Server.ReportAnalyzer.Boot
     public class Bootstrapper : IAppModule
     {
         private readonly ModuleStarter _moduleStarter;
-        private DomainQueueWrapper _domainQueue;
         private ServiceProvider _serviceProvider;
         private readonly ClaimsPrincipal _systemPrincipal;
 
diff --git a/src/Server/Coderr.Server.ReportAnalyzer/ErrorReports/HashcodeGenerators/FileNotFoundHttpErrorGenerator.cs b/src/Server/Coderr.Server.ReportAnalyzer/ErrorReports/HashcodeGenerators/FileNotFoundHttpErrorGenerator.cs
@@ -2,8 +2,6 @@
 using System.Linq;
 using Coderr.Server.Abstractions.Boot;
 using Coderr.Server.Domain.Core.ErrorReports;
-using Coderr.Server.Abstractions.Boot;
-using Coderr.Server.ReportAnalyzer.Abstractions.Boot;
 using log4net;
 
 namespace Coderr.Server.ReportAnalyzer.ErrorReports.HashcodeGenerators
@@ -45,8 +43,7 @@ public string GenerateHashCode(ErrorReportEntity entity)
                 return null;
             }
 
-            string value;
-            if (!props.Properties.TryGetValue("HttpCode", out value))
+            if (!props.Properties.TryGetValue("HttpCode", out var value))
                 return null;
             var statusCode = int.Parse(value);
 
diff --git a/src/Server/Coderr.Server.ReportAnalyzer/Inbound/Handlers/Reports/ReportAnalyzer.cs b/src/Server/Coderr.Server.ReportAnalyzer/Inbound/Handlers/Reports/ReportAnalyzer.cs
@@ -1,15 +1,11 @@
 ﻿using System;
 using System.Diagnostics;
 using System.Linq;
-using System.Threading;
 using System.Threading.Tasks;
 using Coderr.Server.Abstractions.Boot;
 using Coderr.Server.Domain.Core.ErrorReports;
-using Coderr.Server.Domain.Core.Incidents;
 using Coderr.Server.Domain.Core.Incidents.Events;
-using Coderr.Server.Abstractions.Boot;
 using Coderr.Server.ReportAnalyzer.Abstractions;
-using Coderr.Server.ReportAnalyzer.Abstractions.Boot;
 using Coderr.Server.ReportAnalyzer.Abstractions.ErrorReports;
 using Coderr.Server.ReportAnalyzer.Abstractions.Incidents;
 using Coderr.Server.ReportAnalyzer.ErrorReports;
diff --git a/src/Server/Coderr.Server.ReportAnalyzer/ReportSpikes/Handlers/CheckForReportPeak.cs b/src/Server/Coderr.Server.ReportAnalyzer/ReportSpikes/Handlers/CheckForReportPeak.cs
@@ -9,10 +9,8 @@
 using Coderr.Server.Domain.Modules.ReportSpikes;
 using Coderr.Server.Domain.Modules.UserNotifications;
 using Coderr.Server.Infrastructure.Configuration;
-using Coderr.Server.Abstractions.Boot;
 using Coderr.Server.ReportAnalyzer.Abstractions.Incidents;
 using DotNetCqs;
-using Coderr.Server.ReportAnalyzer.Abstractions.Boot;
 
 namespace Coderr.Server.ReportAnalyzer.ReportSpikes.Handlers
 {
diff --git a/src/Server/Coderr.Server.ReportAnalyzer/Tagging/Identifiers/AdoNetIdentifier.cs b/src/Server/Coderr.Server.ReportAnalyzer/Tagging/Identifiers/AdoNetIdentifier.cs
@@ -1,6 +1,5 @@
 ﻿using System;
 using Coderr.Server.Abstractions.Boot;
-using Coderr.Server.Abstractions.Boot;
 
 namespace Coderr.Server.ReportAnalyzer.Tagging.Identifiers
 {
diff --git a/src/Server/Coderr.Server.ReportAnalyzer/Tagging/Identifiers/AspNetMvcAndWebApiIdentifier.cs b/src/Server/Coderr.Server.ReportAnalyzer/Tagging/Identifiers/AspNetMvcAndWebApiIdentifier.cs
@@ -1,6 +1,5 @@
 ﻿using System;
 using Coderr.Server.Abstractions.Boot;
-using Coderr.Server.Abstractions.Boot;
 
 namespace Coderr.Server.ReportAnalyzer.Tagging.Identifiers
 {
diff --git a/src/Server/Coderr.Server.ReportAnalyzer/Tagging/Identifiers/CSharpIdentifier.cs b/src/Server/Coderr.Server.ReportAnalyzer/Tagging/Identifiers/CSharpIdentifier.cs
@@ -1,6 +1,5 @@
 ﻿using System;
 using Coderr.Server.Abstractions.Boot;
-using Coderr.Server.Abstractions.Boot;
 
 namespace Coderr.Server.ReportAnalyzer.Tagging.Identifiers
 {
diff --git a/src/Server/Coderr.Server.ReportAnalyzer/Tagging/Identifiers/ConsoleApplication.cs b/src/Server/Coderr.Server.ReportAnalyzer/Tagging/Identifiers/ConsoleApplication.cs
@@ -1,6 +1,5 @@
 ﻿using System;
 using Coderr.Server.Abstractions.Boot;
-using Coderr.Server.Abstractions.Boot;
 
 namespace Coderr.Server.ReportAnalyzer.Tagging.Identifiers
 {
diff --git a/src/Server/Coderr.Server.ReportAnalyzer/Tagging/Identifiers/Datacontract.cs b/src/Server/Coderr.Server.ReportAnalyzer/Tagging/Identifiers/Datacontract.cs
@@ -1,6 +1,5 @@
 ﻿using System;
 using Coderr.Server.Abstractions.Boot;
-using Coderr.Server.Abstractions.Boot;
 
 namespace Coderr.Server.ReportAnalyzer.Tagging.Identifiers
 {
diff --git a/src/Server/Coderr.Server.ReportAnalyzer/Tagging/Identifiers/LinqIdentifier.cs b/src/Server/Coderr.Server.ReportAnalyzer/Tagging/Identifiers/LinqIdentifier.cs
@@ -1,6 +1,5 @@
 ﻿using System;
 using Coderr.Server.Abstractions.Boot;
-using Coderr.Server.Abstractions.Boot;
 
 namespace Coderr.Server.ReportAnalyzer.Tagging.Identifiers
 {
diff --git a/src/Server/Coderr.Server.ReportAnalyzer/Tagging/Identifiers/NHibernate.cs b/src/Server/Coderr.Server.ReportAnalyzer/Tagging/Identifiers/NHibernate.cs
@@ -1,6 +1,5 @@
 ﻿using System;
 using Coderr.Server.Abstractions.Boot;
-using Coderr.Server.Abstractions.Boot;
 
 namespace Coderr.Server.ReportAnalyzer.Tagging.Identifiers
 {
diff --git a/src/Server/Coderr.Server.ReportAnalyzer/Tagging/Identifiers/SqlServerIdentifier.cs b/src/Server/Coderr.Server.ReportAnalyzer/Tagging/Identifiers/SqlServerIdentifier.cs
@@ -1,6 +1,5 @@
 ﻿using System;
 using Coderr.Server.Abstractions.Boot;
-using Coderr.Server.Abstractions.Boot;
 
 namespace Coderr.Server.ReportAnalyzer.Tagging.Identifiers
 {
diff --git a/src/Server/Coderr.Server.ReportAnalyzer/Tagging/Identifiers/WinFormsIdentifier.cs b/src/Server/Coderr.Server.ReportAnalyzer/Tagging/Identifiers/WinFormsIdentifier.cs
@@ -1,6 +1,5 @@
 ﻿using System;
 using Coderr.Server.Abstractions.Boot;
-using Coderr.Server.Abstractions.Boot;
 
 namespace Coderr.Server.ReportAnalyzer.Tagging.Identifiers
 {
diff --git a/src/Server/Coderr.Server.ReportAnalyzer/Triggers/ServiceLocatorTriggerActionFactory.cs b/src/Server/Coderr.Server.ReportAnalyzer/Triggers/ServiceLocatorTriggerActionFactory.cs
@@ -6,9 +6,6 @@
 using Coderr.Server.Abstractions.Boot;
 using Coderr.Server.ReportAnalyzer.Triggers.Actions;
 using Coderr.Server.ReportAnalyzer.Triggers.Handlers.Actions;
-using DotNetCqs.DependencyInjection;
-using Coderr.Server.Abstractions.Boot;
-using Microsoft.Extensions.DependencyInjection;
 
 namespace Coderr.Server.ReportAnalyzer.Triggers
 {
@@ -45,8 +42,7 @@ public ServiceLocatorTriggerActionFactory(IServiceProvider serviceProvider)
         /// <exception cref="NotSupportedException">Action is not supported</exception>
         public ITriggerAction Create(string actionName)
         {
-            Type type;
-            if (!_actionTypes.TryGetValue(actionName, out type))
+            if (!_actionTypes.TryGetValue(actionName, out var type))
                 throw new NotSupportedException("Do not support action of type " + actionName);
 
             return (ITriggerAction) _serviceProvider.GetService(type);
diff --git a/src/Server/Coderr.Server.ReportAnalyzer/app.config b/src/Server/Coderr.Server.ReportAnalyzer/app.config
diff --git a/src/Server/Coderr.Server.SqlServer.Tests/Coderr.Server.SqlServer.Tests.csproj b/src/Server/Coderr.Server.SqlServer.Tests/Coderr.Server.SqlServer.Tests.csproj
@@ -1,17 +1,16 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <RootNamespace>Coderr.Server.SqlServer.Tests</RootNamespace>
-    <AssemblyName>Coderr.Server.SqlServer.Tests</AssemblyName>
+    <TargetFramework>net461</TargetFramework>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
   </PropertyGroup>
-  <ItemGroup>
-    <None Remove="log4net.config" />
-  </ItemGroup>
+
   <ItemGroup>
     <Content Include="log4net.config">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.6.1" />
     <PackageReference Include="Microsoft.VisualStudio.TestPlatform.ObjectModel" Version="14.0.0" />
@@ -33,8 +32,4 @@
     <Reference Include="System.Configuration" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Folder Include="Core\Invitations\" />
-  </ItemGroup>
-
 </Project>
diff --git a/src/Server/Coderr.Server.SqlServer.Tests/IntegrationTest.cs b/src/Server/Coderr.Server.SqlServer.Tests/IntegrationTest.cs
@@ -20,14 +20,13 @@ public class IntegrationTest : IDisposable
     {
         private static DatabaseManager _databaseManager;
         private TestDataManager _testDataManager;
-        private static bool _isRun = false;
-        private static readonly object _syncLock = new object();
+        private static readonly object SyncLock = new object();
 
         static IntegrationTest()
         {
             var path2 = AppDomain.CurrentDomain.BaseDirectory;
 
-            var logRepository = LogManager.GetRepository(Assembly.GetEntryAssembly());
+            var logRepository = LogManager.GetRepository(Assembly.GetExecutingAssembly());
             XmlConfigurator.ConfigureAndWatch(logRepository, new FileInfo(Path.Combine(path2, "log4net.config")));
             var logger = LogManager.GetLogger(typeof(IntegrationTest));
             logger.Info("Loaded");
@@ -41,7 +40,7 @@ static IntegrationTest()
                 _databaseManager.Dispose();
                 _databaseManager = null;
             };
-            lock (_syncLock)
+            lock (SyncLock)
             {
                 _databaseManager = new DatabaseManager();
                 _databaseManager.CreateEmptyDatabase();
@@ -55,12 +54,14 @@ static IntegrationTest()
 
         public IntegrationTest(ITestOutputHelper output)
         {
-            _testDataManager = new TestDataManager(_databaseManager.OpenConnection);
-            _testDataManager.TestUser = new TestUser()
+            _testDataManager = new TestDataManager(_databaseManager.OpenConnection)
             {
-                Email = "test@somewhere.com",
-                Password = "123456",
-                Username = "admin"
+                TestUser = new TestUser()
+                {
+                    Email = "test@somewhere.com",
+                    Password = "123456",
+                    Username = "admin"
+                }
             };
         }
 
diff --git a/src/Server/Coderr.Server.SqlServer.Tests/app.config b/src/Server/Coderr.Server.SqlServer.Tests/app.config
@@ -4,12 +4,5 @@
   <connectionStrings>
     <add name="Db" connectionString="Data Source=(LocalDB)\MSSQLLocalDB;Initial Catalog={databaseName};Integrated Security=True;Connection Timeout=5" providerName="System.Data.SqlClient" />
   </connectionStrings>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
+
 </configuration>
diff --git a/src/Server/Coderr.Server.SqlServer/Migrations/MigrationScripts.cs b/src/Server/Coderr.Server.SqlServer/Migrations/MigrationScripts.cs
diff --git a/src/Server/Coderr.Server.Web/Boot/Cqs/RegisterCqsServices.cs b/src/Server/Coderr.Server.Web/Boot/Cqs/RegisterCqsServices.cs
diff --git a/src/Server/Coderr.Server.Web/Controllers/ReportReceiverController.cs b/src/Server/Coderr.Server.Web/Controllers/ReportReceiverController.cs
diff --git a/src/Server/Coderr.Server.Web/package.json b/src/Server/Coderr.Server.Web/package.json
diff --git a/src/Server/Coderr.Server.Web/wwwroot/dist/main.js b/src/Server/Coderr.Server.Web/wwwroot/dist/main.js
diff --git a/src/Server/Coderr.Server.Web/wwwroot/dist/main.js.map b/src/Server/Coderr.Server.Web/wwwroot/dist/main.js.map

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`using System;`
`2`	`2`	`using Coderr.Server.Abstractions.Boot;`
`3`		`-using Coderr.Server.Abstractions.Boot;`
`4`	`3`
`5`	`4`	`namespace Coderr.Server.ReportAnalyzer.Tagging.Identifiers`
`6`	`5`	`{`