Added tests.

Volo.Abp.sln

@@ -48,6 +48,8 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Volo.Abp.MultiTenancy.Tests
 EndProject
 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Volo.Abp.AspNetCore.MultiTenancy", "src\Volo.Abp.AspNetCore.MultiTenancy\Volo.Abp.AspNetCore.MultiTenancy.xproj", "{7CC7946B-E026-4F66-8D4F-4F78F4801D43}"
 EndProject
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Volo.Abp.AspNetCore.MultiTenancy.Tests", "test\Volo.Abp.AspNetCore.MultiTenancy.Tests\Volo.Abp.AspNetCore.MultiTenancy.Tests.xproj", "{2C282467-2CD5-4750-BE1F-CA8BD8ECC6EA}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -106,6 +108,10 @@ Global
 		{7CC7946B-E026-4F66-8D4F-4F78F4801D43}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7CC7946B-E026-4F66-8D4F-4F78F4801D43}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7CC7946B-E026-4F66-8D4F-4F78F4801D43}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2C282467-2CD5-4750-BE1F-CA8BD8ECC6EA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2C282467-2CD5-4750-BE1F-CA8BD8ECC6EA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2C282467-2CD5-4750-BE1F-CA8BD8ECC6EA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2C282467-2CD5-4750-BE1F-CA8BD8ECC6EA}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -129,5 +135,6 @@ Global
 		{58FA9F8F-216D-4C93-8929-D40D22B11CA7} = {4C753F64-0C93-4D65-96C2-A40893AFC1E8}
 		{05271341-7A15-484C-9FD6-802A4193F4DE} = {37087D1B-3693-4E96-983D-A69F210BDE53}
 		{7CC7946B-E026-4F66-8D4F-4F78F4801D43} = {4C753F64-0C93-4D65-96C2-A40893AFC1E8}
+		{2C282467-2CD5-4750-BE1F-CA8BD8ECC6EA} = {37087D1B-3693-4E96-983D-A69F210BDE53}
 	EndGlobalSection
 EndGlobal

src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/AbpAspNetMultiTenancyModule.cs

@@ -0,0 +1,15 @@
+using Microsoft.Extensions.DependencyInjection;
+using Volo.Abp.Modularity;
+using Volo.Abp.MultiTenancy;
+
+namespace Volo.Abp.AspNetCore.MultiTenancy
+{
+    [DependsOn(typeof(AbpMultiTenancyModule), typeof(AbpAspNetCoreModule))]
+    public class AbpAspNetMultiTenancyModule : AbpModule
+    {
+        public override void ConfigureServices(IServiceCollection services)
+        {
+            services.AddAssemblyOf<AbpAspNetMultiTenancyModule>();
+        }
+    }
+}

src/Volo.Abp.AspNetCore.MultiTenancy/project.json

@@ -1,8 +1,9 @@
-{
+{
   "version": "1.0.0-*",
 
   "dependencies": {
     "NETStandard.Library": "1.6.1",
+    "Volo.Abp.AspNetCore": "1.0.0-*",
     "Volo.Abp.MultiTenancy": "1.0.0-*"
   },
 

src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/AbpMultiTenancyModule.cs

@@ -0,0 +1,13 @@
+using Microsoft.Extensions.DependencyInjection;
+using Volo.Abp.Modularity;
+
+namespace Volo.Abp.MultiTenancy
+{
+    public class AbpMultiTenancyModule : AbpModule
+    {
+        public override void ConfigureServices(IServiceCollection services)
+        {
+            services.AddAssemblyOf<AbpMultiTenancyModule>();
+        }
+    }
+}

src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/MultiTenancyManager.cs

@@ -1,9 +1,10 @@
 using System;
 using System.Collections.Generic;
+using Volo.DependencyInjection;
 
 namespace Volo.Abp.MultiTenancy
 {
-    public class MultiTenancyManager : IMultiTenancyManager
+    public class MultiTenancyManager : IMultiTenancyManager, IScopedDependency
     {
         public TenantInfo CurrentTenant => GetCurrentTenant();
 

src/Volo.Abp/Volo/Abp/Json/JsonExtensions.cs

@@ -0,0 +1,31 @@
+using Newtonsoft.Json;
+using Newtonsoft.Json.Serialization;
+
+namespace Volo.Abp.Json
+{
+    public static class JsonExtensions
+    {
+        /// <summary>
+        /// Converts given object to JSON string.
+        /// </summary>
+        /// <returns></returns>
+        public static string ToJsonString(this object obj, bool camelCase = false, bool indented = false)
+        {
+            var options = new JsonSerializerSettings();
+
+            if (camelCase)
+            {
+                options.ContractResolver = new CamelCasePropertyNamesContractResolver();
+            }
+
+            if (indented)
+            {
+                options.Formatting = Formatting.Indented;
+            }
+
+            //options.Converters.Insert(0, new AbpDateTimeConverter()); //TODO: AbpDateTimeConverter?
+
+            return JsonConvert.SerializeObject(obj, options);
+        }
+    }
+}

src/Volo.Abp/project.json

@@ -5,7 +5,8 @@
     "NETStandard.Library": "1.6.1",
     "Volo.DependencyInjection": "1.0.0-*",
     "System.Collections.Immutable": "1.3.0",
-    "Volo.ExtensionMethods": "1.0.0-*"
+    "Volo.ExtensionMethods": "1.0.0-*",
+    "Newtonsoft.Json": "9.0.1"
   },
 
   "frameworks": {

test/Volo.Abp.AspNetCore.MultiTenancy.Tests/Properties/AssemblyInfo.cs

@@ -0,0 +1,19 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("Volo.Abp.AspNetCore.MultiTenancy.Tests")]
+[assembly: AssemblyTrademark("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components.  If you need to access a type in this assembly from
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("2c282467-2cd5-4750-be1f-ca8bd8ecc6ea")]

test/Volo.Abp.AspNetCore.MultiTenancy.Tests/Volo.Abp.AspNetCore.MultiTenancy.Tests.xproj

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+  </PropertyGroup>
+  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>2c282467-2cd5-4750-be1f-ca8bd8ecc6ea</ProjectGuid>
+    <RootNamespace>
+    </RootNamespace>
+    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
+    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+  </PropertyGroup>
+  <PropertyGroup>
+    <SchemaVersion>2.0</SchemaVersion>
+  </PropertyGroup>
+  <ItemGroup>
+    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
+  </ItemGroup>
+  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
+</Project>

test/Volo.Abp.AspNetCore.MultiTenancy.Tests/Volo/Abp/AspNetCore/App/AppModule.cs

@@ -0,0 +1,33 @@
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.DependencyInjection;
+using Volo.Abp.AspNetCore.Modularity;
+using Volo.Abp.AspNetCore.MultiTenancy;
+using Volo.Abp.Json;
+using Volo.Abp.Modularity;
+using Volo.Abp.MultiTenancy;
+
+namespace Volo.Abp.AspNetCore.App
+{
+    [DependsOn(typeof(AbpAspNetMultiTenancyModule))]
+    public class AppModule : AbpModule
+    {
+        public override void OnApplicationInitialization(ApplicationInitializationContext context)
+        {
+            var app = context.GetApplicationBuilder();
+
+            app.Run(async (ctx) =>
+            {
+                var manager = ctx.RequestServices.GetRequiredService<IMultiTenancyManager>();
+
+                var dictionary = new Dictionary<string, string>
+                {
+                    ["TenantName"] = manager.CurrentTenant?.Name ?? "<host>"
+                };
+                
+                await ctx.Response.WriteAsync(dictionary.ToJsonString());
+            });
+        }
+    }
+}

test/Volo.Abp.AspNetCore.MultiTenancy.Tests/Volo/Abp/AspNetCore/App/AppTestBase.cs

@@ -0,0 +1,35 @@
+using System.Net;
+using System.Net.Http;
+using System.Threading.Tasks;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Serialization;
+using Shouldly;
+using Volo.Abp.AspNetCore.TestBase;
+
+namespace Volo.Abp.AspNetCore.App
+{
+    public abstract class AppTestBase : AbpAspNetCoreIntegratedTestBase<Startup>
+    {
+        protected virtual async Task<T> GetResponseAsObjectAsync<T>(string url, HttpStatusCode expectedStatusCode = HttpStatusCode.OK)
+        {
+            var strResponse = await GetResponseAsStringAsync(url, expectedStatusCode);
+            return JsonConvert.DeserializeObject<T>(strResponse, new JsonSerializerSettings
+            {
+                ContractResolver = new CamelCasePropertyNamesContractResolver()
+            });
+        }
+
+        protected virtual async Task<string> GetResponseAsStringAsync(string url, HttpStatusCode expectedStatusCode = HttpStatusCode.OK)
+        {
+            var response = await GetResponseAsync(url, expectedStatusCode);
+            return await response.Content.ReadAsStringAsync();
+        }
+
+        protected virtual async Task<HttpResponseMessage> GetResponseAsync(string url, HttpStatusCode expectedStatusCode = HttpStatusCode.OK)
+        {
+            var response = await Client.GetAsync(url);
+            response.StatusCode.ShouldBe(expectedStatusCode);
+            return response;
+        }
+    }
+}

test/Volo.Abp.AspNetCore.MultiTenancy.Tests/Volo/Abp/AspNetCore/App/Startup.cs

@@ -0,0 +1,20 @@
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+
+namespace Volo.Abp.AspNetCore.App
+{
+    public class Startup
+    {
+        public void ConfigureServices(IServiceCollection services)
+        {
+            services.AddApplication<AppModule>();
+        }
+
+        public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory)
+        {
+            app.InitializeApplication();
+        }
+    }
+}

test/Volo.Abp.AspNetCore.MultiTenancy.Tests/Volo/Abp/AspNetCore/MultiTenancy/AspNetCoreMultiTenancy_Tests.cs

@@ -0,0 +1,22 @@
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Shouldly;
+using Volo.Abp.AspNetCore.App;
+using Xunit;
+
+namespace Volo.Abp.AspNetCore.MultiTenancy
+{
+    public class AspNetCoreMultiTenancy_Tests : AppTestBase
+    {
+        private const string FakeUrl = "http://abp.io";
+
+        [Fact]
+        public async Task Should_Use_Host_If_Tenant_Is_Not_Specified()
+        {
+            var result = await GetResponseAsObjectAsync<Dictionary<string, string>>(FakeUrl);
+            result["TenantName"].ShouldBe("<host>");
+        }
+
+        //TODO: Specify tenant in the header, cookie, url, querystring and so on...
+    }
+}

test/Volo.Abp.AspNetCore.MultiTenancy.Tests/Volo/Abp/AspNetCore/TestBase/AbpAspNetCoreIntegratedTestBase.cs

@@ -0,0 +1,80 @@
+using System;
+using System.Linq;
+using System.Net.Http;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.AspNetCore.TestHost;
+using Volo.ExtensionMethods;
+using Volo.ExtensionMethods.Collections.Generic;
+
+namespace Volo.Abp.AspNetCore.TestBase
+{
+    public abstract class AbpAspNetCoreIntegratedTestBase<TStartup> 
+        where TStartup : class
+    {
+        protected TestServer Server { get; }
+
+        protected HttpClient Client { get; }
+
+        protected IServiceProvider ServiceProvider { get; }
+
+        protected AbpAspNetCoreIntegratedTestBase()
+        {
+            var builder = CreateWebHostBuilder();
+            Server = CreateTestServer(builder);
+            Client = Server.CreateClient();
+
+            ServiceProvider = Server.Host.Services;
+        }
+
+        protected virtual IWebHostBuilder CreateWebHostBuilder()
+        {
+            return new WebHostBuilder()
+                .UseStartup<TStartup>();
+        }
+
+        protected virtual TestServer CreateTestServer(IWebHostBuilder builder)
+        {
+            return new TestServer(builder);
+        }
+
+        #region GetUrl
+
+        /// <summary>
+        /// Gets default URL for given controller type.
+        /// </summary>
+        /// <typeparam name="TController">The type of the controller.</typeparam>
+        protected virtual string GetUrl<TController>()
+        {
+            return "/" + typeof(TController).Name.RemovePostFix("Controller", "AppService", "ApplicationService", "Service");
+        }
+
+        /// <summary>
+        /// Gets default URL for given controller type's given action.
+        /// </summary>
+        /// <typeparam name="TController">The type of the controller.</typeparam>
+        protected virtual string GetUrl<TController>(string actionName)
+        {
+            return GetUrl<TController>() + "/" + actionName;
+        }
+
+        /// <summary>
+        /// Gets default URL for given controller type's given action with query string parameters (as anonymous object).
+        /// </summary>
+        /// <typeparam name="TController">The type of the controller.</typeparam>
+        protected virtual string GetUrl<TController>(string actionName, object queryStringParamsAsAnonymousObject)
+        {
+            var url = GetUrl<TController>(actionName);
+
+            var dictionary = new RouteValueDictionary(queryStringParamsAsAnonymousObject);
+            if (dictionary.Any())
+            {
+                url += "?" + dictionary.Select(d => $"{d.Key}={d.Value}").JoinAsString("&");
+            }
+
+            return url;
+        }
+
+        #endregion
+    }
+}

test/Volo.Abp.AspNetCore.MultiTenancy.Tests/project.json

@@ -0,0 +1,23 @@
+{
+  "version": "1.0.0-*",
+
+  "testRunner": "xunit",
+
+  "dependencies": {
+    "AbpTestBase": "1.0.0-*",
+    "Volo.Abp.AspNetCore.MultiTenancy": "1.0.0-*",
+    "Microsoft.AspNetCore.TestHost": "1.1.0",
+    "Microsoft.AspNetCore.Routing.Abstractions": "1.1.0"
+  },
+
+  "frameworks": {
+    "netcoreapp1.1": {
+      "dependencies": {
+        "Microsoft.NETCore.App": {
+          "type": "platform",
+          "version": "1.1.0"
+        }
+      }
+    }
+  }
+}