Upgraded to ABP 0.9.7, AspNet Core 1.0. Also made test working properly.

hikalkan · hikalkan · commit 284c7e7ac0e8 · 2016-06-29T19:16:32.000+03:00
diff --git a/src/AbpCompanyName.AbpProjectName.Application/project.json b/src/AbpCompanyName.AbpProjectName.Application/project.json
@@ -2,7 +2,7 @@
   "version": "1.0.0.0-*",
 
   "dependencies": {
-    "Abp.AutoMapper": "0.9.6",
+    "Abp.AutoMapper": "0.9.7",
     "AbpCompanyName.AbpProjectName.Core": "1.0.0.0-*"
   },
 
diff --git a/src/AbpCompanyName.AbpProjectName.Core/project.json b/src/AbpCompanyName.AbpProjectName.Core/project.json
@@ -2,7 +2,7 @@
   "version": "1.0.0.0-*",
 
   "dependencies": {
-    "Abp": "0.9.6"
+    "Abp": "0.9.7"
   },
 
   "frameworks": {
diff --git a/src/AbpCompanyName.AbpProjectName.EntityFrameworkCore/EntityFrameworkCore/AbpProjectNameDbContextFactory.cs b/src/AbpCompanyName.AbpProjectName.EntityFrameworkCore/EntityFrameworkCore/AbpProjectNameDbContextFactory.cs
@@ -7,7 +7,7 @@ namespace AbpCompanyName.AbpProjectName.EntityFrameworkCore
      */
     public class AbpProjectNameDbContextFactory : IDbContextFactory<AbpProjectNameDbContext>
     {
-        public AbpProjectNameDbContext Create()
+        public AbpProjectNameDbContext Create(DbContextFactoryOptions options)
         {
             var builder = new DbContextOptionsBuilder<AbpProjectNameDbContext>();
             builder.UseSqlServer("Server=localhost; Database=AbpProjectNameDb; Trusted_Connection=True;");
diff --git a/src/AbpCompanyName.AbpProjectName.EntityFrameworkCore/project.json b/src/AbpCompanyName.AbpProjectName.EntityFrameworkCore/project.json
@@ -2,23 +2,13 @@
   "version": "1.0.0.0-*",
 
   "dependencies": {
-    "Abp.EntityFrameworkCore": "0.9.6",
+    "Abp.EntityFrameworkCore": "0.9.7",
     "AbpCompanyName.AbpProjectName.Core": "1.0.0.0-*",
-    "Microsoft.EntityFrameworkCore.SqlServer": "1.0.0-rc2-final",
-    "Microsoft.EntityFrameworkCore.Tools": {
-      "version": "1.0.0-preview1-final",
-      "type": "build"
-    }
+    "Microsoft.EntityFrameworkCore.SqlServer": "1.0.0",
+    "Microsoft.EntityFrameworkCore.Tools": "1.0.0-preview2-final"
   },
 
   "tools": {
-    "Microsoft.EntityFrameworkCore.Tools": {
-      "version": "1.0.0-preview1-final",
-      "imports": [
-        "portable-net45+win8+dnxcore50",
-        "portable-net45+win8"
-      ]
-    }
   },
 
   "buildOptions": {
diff --git a/src/AbpCompanyName.AbpProjectName.Web/Controllers/HomeController.cs b/src/AbpCompanyName.AbpProjectName.Web/Controllers/HomeController.cs
@@ -1,6 +1,6 @@
+using System;
 using System.Threading.Tasks;
 using Abp.AspNetCore.Mvc.Controllers;
-using Abp.Json;
 using Abp.UI;
 using AbpCompanyName.AbpProjectName.Products;
 using Microsoft.AspNetCore.Mvc;
@@ -19,16 +19,10 @@ public HomeController(IProductAppService productAppService)
         public async Task<ActionResult> Index()
         {
             var model = await _productAppService.GetAllProducts();
-            //return Content(model.ToJsonString());
             return View(model);
         }
 
-        public ActionResult Exception1()
-        {
-            throw new UserFriendlyException("Test User Friendly Exception", "This is a user friendly exception directly shown to the user.");
-        }
-
-        public JsonResult Exception2()
+        public JsonResult GetUserFriendlyException()
         {
             throw new UserFriendlyException("Test User Friendly Exception", "This is a user friendly exception directly shown to the user.");
         }
diff --git a/src/AbpCompanyName.AbpProjectName.Web/Startup.cs b/src/AbpCompanyName.AbpProjectName.Web/Startup.cs
@@ -34,8 +34,8 @@ public IServiceProvider ConfigureServices(IServiceCollection services)
 
             services.AddMvc(options =>
             {
-                options.AddAbp(); //Add ABP infrastructure to MVC
-            }).AddControllersAsServices();
+                options.AddAbp(services); //Add ABP infrastructure to MVC
+            });
 
             //Configure Abp and Dependency Injection
             return services.AddAbp(abpBootstrapper =>
diff --git a/src/AbpCompanyName.AbpProjectName.Web/project.json b/src/AbpCompanyName.AbpProjectName.Web/project.json
@@ -1,62 +1,28 @@
 {
   "dependencies": {
-    "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-rc2-final",
-    "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-rc2-final",
-    "Microsoft.AspNetCore.Mvc": "1.0.0-rc2-final",
-    "Microsoft.AspNetCore.Razor.Tools": {
-      "version": "1.0.0-preview1-final",
-      "type": "build"
-    },
-    "Microsoft.AspNetCore.StaticFiles": "1.0.0-rc2-final",
-    "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.0.0-rc2-final",
-    "Microsoft.Extensions.Configuration.Json": "1.0.0-rc2-final",
-    "Microsoft.AspNetCore.Diagnostics": "1.0.0-rc2-final",
-    "Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore": "1.0.0-rc2-final",
-    "Microsoft.Extensions.Logging": "1.0.0-rc2-final",
-    "Microsoft.VisualStudio.Web.BrowserLink.Loader": "14.0.0-rc2-final",
-    "Microsoft.VisualStudio.Web.CodeGeneration.Tools": {
-      "version": "1.0.0-preview1-final",
-      "type": "build"
-    },
-    "Microsoft.VisualStudio.Web.CodeGenerators.Mvc": {
-      "version": "1.0.0-preview1-final",
-      "type": "build"
-    },
-    "Microsoft.EntityFrameworkCore.SqlServer": "1.0.0-rc2-final",
-    "Microsoft.EntityFrameworkCore.Tools": {
-      "version": "1.0.0-preview1-final",
-      "type": "build"
-    },
     "Castle.Windsor-log4net": "3.3.0",
     "AbpCompanyName.AbpProjectName.Application": "1.0.0.0-*",
     "AbpCompanyName.AbpProjectName.EntityFrameworkCore": "1.0.0.0-*",
     "Castle.LoggingFacility.MsLogging": "0.1.0",
-    "Abp.AspNetCore": "0.9.6"
+    "Abp.AspNetCore": "0.9.7",
+    "Microsoft.AspNetCore.Diagnostics": "1.0.0",
+    "Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore": "1.0.0",
+    "Microsoft.AspNetCore.Mvc": "1.0.0",
+    "Microsoft.AspNetCore.Razor.Tools": "1.0.0-preview2-final",
+    "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0",
+    "Microsoft.AspNetCore.Server.Kestrel": "1.0.0",
+    "Microsoft.AspNetCore.StaticFiles": "1.0.0",
+    "Microsoft.EntityFrameworkCore.SqlServer": "1.0.0",
+    "Microsoft.EntityFrameworkCore.Tools": "1.0.0-preview2-final",
+    "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.0.0",
+    "Microsoft.Extensions.Configuration.Json": "1.0.0",
+    "Microsoft.Extensions.Logging": "1.0.0",
+    "Microsoft.VisualStudio.Web.BrowserLink.Loader": "14.0.0",
+    "Microsoft.VisualStudio.Web.CodeGeneration.Tools": "1.0.0-preview2-final",
+    "Microsoft.VisualStudio.Web.CodeGenerators.Mvc": "1.0.0-preview2-final"
   },
 
   "tools": {
-    "Microsoft.AspNetCore.Razor.Tools": {
-      "version": "1.0.0-preview1-final",
-      "imports": "portable-net45+win8+dnxcore50"
-    },
-    "Microsoft.AspNetCore.Server.IISIntegration.Tools": {
-      "version": "1.0.0-preview1-final",
-      "imports": "portable-net45+win8+dnxcore50"
-    },
-    "Microsoft.EntityFrameworkCore.Tools": {
-      "version": "1.0.0-preview1-final",
-      "imports": [
-        "portable-net45+win8+dnxcore50",
-        "portable-net45+win8"
-      ]
-    },
-    "Microsoft.VisualStudio.Web.CodeGeneration.Tools": {
-      "version": "1.0.0-preview1-final",
-      "imports": [
-        "portable-net45+win8+dnxcore50",
-        "portable-net45+win8"
-      ]
-    }
   },
 
   "frameworks": {
diff --git a/test/AbpCompanyName.AbpProjectName.Tests/project.json b/test/AbpCompanyName.AbpProjectName.Tests/project.json
@@ -4,17 +4,17 @@
   "testRunner": "xunit",
 
   "dependencies": {
-    "Microsoft.EntityFrameworkCore.InMemory": "1.0.0-rc2-final",
-    "xunit": "2.1.0",
-    "xunit.runner.visualstudio": "2.1.0",
-    "xunit.extensibility.execution": "2.1.0",
-    "dotnet-test-xunit": "1.0.0-rc2-build10025",
     "NSubstitute": "1.10.0",
     "AbpCompanyName.AbpProjectName.Application": "1.0.0.0-*",
     "AbpCompanyName.AbpProjectName.EntityFrameworkCore": "1.0.0.0-*",
     "Shouldly": "2.8.0",
-    "Abp.TestBase": "0.9.6",
-    "Castle.Windsor.MsDependencyInjection": "0.2.0"
+    "Castle.Windsor.MsDependencyInjection": "0.2.0",
+    "Abp.TestBase": "0.9.7",
+    "dotnet-test-xunit": "2.2.0-preview2-build1029",
+    "Microsoft.EntityFrameworkCore.InMemory": "1.0.0",
+    "xunit": "2.2.0-beta2-build3300",
+    "xunit.extensibility.execution": "2.2.0-beta2-build3300",
+    "xunit.runner.visualstudio": "2.2.0-beta2-build1149"
   },
 
   "frameworks": {
diff --git a/test/AbpCompanyName.AbpProjectName.Web.Tests/AbpProjectNameWebTestBase.cs b/test/AbpCompanyName.AbpProjectName.Web.Tests/AbpProjectNameWebTestBase.cs
@@ -1,24 +1,104 @@
 ﻿using System;
+using System.IO;
+using System.Linq;
 using System.Net;
 using System.Net.Http;
 using System.Threading.Tasks;
-using Abp.AspNetCore.TestBase;
+using Abp.Dependency;
+using Abp.Extensions;
+using Abp.TestBase.Runtime.Session;
 using AbpCompanyName.AbpProjectName.EntityFrameworkCore;
 using AbpCompanyName.AbpProjectName.Tests.TestDatas;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.AspNetCore.TestHost;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Serialization;
 using Shouldly;
+using Microsoft.Extensions.DependencyInjection;
+using Abp.Collections.Extensions;
 
 namespace AbpCompanyName.AbpProjectName.Web.Tests
 {
-    public abstract class AbpProjectNameWebTestBase : AbpAspNetCoreIntegratedTestBase<Startup>
+    public abstract class AbpProjectNameWebTestBase
     {
+        protected TestServer Server { get; private set; }
+
+        protected HttpClient Client { get; private set; }
+
+        protected IServiceProvider ServiceProvider { get; private set; }
+
+        protected IIocManager IocManager { get; private set; }
+
+        protected TestAbpSession AbpSession { get; private set; }
+
+        protected static readonly Lazy<string> ContentRootFolder;
+
+        static AbpProjectNameWebTestBase()
+        {
+            ContentRootFolder = new Lazy<string>(CalculateContentRootFolder, true);
+        }
+
         protected AbpProjectNameWebTestBase()
         {
+            
+
+            var builder = new WebHostBuilder()
+                .UseContentRoot(ContentRootFolder.Value)
+                .UseStartup<Startup>();
+
+            Server = new TestServer(builder);
+            Client = Server.CreateClient();
+
+            ServiceProvider = Server.Host.Services;
+            IocManager = ServiceProvider.GetRequiredService<IIocManager>();
+            AbpSession = ServiceProvider.GetRequiredService<TestAbpSession>();
+
             UsingDbContext(context => new TestDataBuilder(context).Build());
         }
 
-        protected virtual async Task<T> GetResponseAsObjectAsync<T>(string url, HttpStatusCode expectedStatusCode = HttpStatusCode.OK)
+        private static bool DirectoryContains(string directory, string fileName)
+        {
+            return Directory.GetFiles(directory).Any(filePath => string.Equals(Path.GetFileName(filePath), fileName));
+        }
+
+        #region GetUrl
+
+        protected virtual string GetUrl<TController>()
+        {
+            var controllerName = typeof(TController).Name;
+            if (controllerName.EndsWith("Controller"))
+            {
+                controllerName = controllerName.Left(controllerName.Length - "Controller".Length);
+            }
+
+            return "/" + controllerName;
+        }
+
+        protected virtual string GetUrl<TController>(string actionName)
+        {
+            return GetUrl<TController>() + "/" + actionName;
+        }
+
+        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
+
+        #region Get response
+
+        protected async Task<T> GetResponseAsObjectAsync<T>(string url,
+            HttpStatusCode expectedStatusCode = HttpStatusCode.OK)
         {
             var strResponse = await GetResponseAsStringAsync(url, expectedStatusCode);
             return JsonConvert.DeserializeObject<T>(strResponse, new JsonSerializerSettings
@@ -27,20 +107,26 @@ protected virtual async Task<T> GetResponseAsObjectAsync<T>(string url, HttpStat
             });
         }
 
-        protected virtual async Task<string> GetResponseAsStringAsync(string url, HttpStatusCode expectedStatusCode = HttpStatusCode.OK)
+        protected 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)
+        protected async Task<HttpResponseMessage> GetResponseAsync(string url,
+            HttpStatusCode expectedStatusCode = HttpStatusCode.OK)
         {
             var response = await Client.GetAsync(url);
             response.StatusCode.ShouldBe(expectedStatusCode);
             return response;
         }
 
-        protected virtual void UsingDbContext(Action<AbpProjectNameDbContext> action)
+        #endregion
+
+        #region UsingDbContext
+
+        protected void UsingDbContext(Action<AbpProjectNameDbContext> action)
         {
             using (var context = IocManager.Resolve<AbpProjectNameDbContext>())
             {
@@ -49,7 +135,7 @@ protected virtual void UsingDbContext(Action<AbpProjectNameDbContext> action)
             }
         }
 
-        protected virtual T UsingDbContext<T>(Func<AbpProjectNameDbContext, T> func)
+        protected T UsingDbContext<T>(Func<AbpProjectNameDbContext, T> func)
         {
             T result;
 
@@ -62,7 +148,7 @@ protected virtual T UsingDbContext<T>(Func<AbpProjectNameDbContext, T> func)
             return result;
         }
 
-        protected virtual async Task UsingDbContextAsync(Func<AbpProjectNameDbContext, Task> action)
+        protected async Task UsingDbContextAsync(Func<AbpProjectNameDbContext, Task> action)
         {
             using (var context = IocManager.Resolve<AbpProjectNameDbContext>())
             {
@@ -71,7 +157,7 @@ protected virtual async Task UsingDbContextAsync(Func<AbpProjectNameDbContext, T
             }
         }
 
-        protected virtual async Task<T> UsingDbContextAsync<T>(Func<AbpProjectNameDbContext, Task<T>> func)
+        protected async Task<T> UsingDbContextAsync<T>(Func<AbpProjectNameDbContext, Task<T>> func)
         {
             T result;
 
@@ -83,5 +169,27 @@ protected virtual async Task<T> UsingDbContextAsync<T>(Func<AbpProjectNameDbCont
 
             return result;
         }
+
+        #endregion
+
+        #region Other private methods
+
+        private static string CalculateContentRootFolder()
+        {
+            var directoryInfo = new DirectoryInfo(Path.GetDirectoryName(typeof(AbpProjectNameWebTestBase).Assembly.Location));
+            while (!DirectoryContains(directoryInfo.FullName, "AbpCompanyName.AbpProjectName.sln"))
+            {
+                if (directoryInfo.Parent == null)
+                {
+                    throw new Exception("Could not find content root folder!");
+                }
+
+                directoryInfo = directoryInfo.Parent;
+            }
+
+            return Path.Combine(directoryInfo.FullName, @"src\AbpCompanyName.AbpProjectName.Web");
+        }
+
+        #endregion
     }
 }
diff --git a/test/AbpCompanyName.AbpProjectName.Web.Tests/Controllers/HomeController_Tests.cs b/test/AbpCompanyName.AbpProjectName.Web.Tests/Controllers/HomeController_Tests.cs
diff --git a/test/AbpCompanyName.AbpProjectName.Web.Tests/Startup.cs b/test/AbpCompanyName.AbpProjectName.Web.Tests/Startup.cs
diff --git a/test/AbpCompanyName.AbpProjectName.Web.Tests/project.json b/test/AbpCompanyName.AbpProjectName.Web.Tests/project.json

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ namespace AbpCompanyName.AbpProjectName.EntityFrameworkCore`
`7`	`7`	`*/`
`8`	`8`	`public class AbpProjectNameDbContextFactory : IDbContextFactory<AbpProjectNameDbContext>`
`9`	`9`	`{`
`10`		`- public AbpProjectNameDbContext Create()`
	`10`	`+ public AbpProjectNameDbContext Create(DbContextFactoryOptions options)`
`11`	`11`	`{`
`12`	`12`	`var builder = new DbContextOptionsBuilder<AbpProjectNameDbContext>();`
`13`	`13`	`builder.UseSqlServer("Server=localhost; Database=AbpProjectNameDb; Trusted_Connection=True;");`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
	`1`	`+using System;`
`1`	`2`	`using System.Threading.Tasks;`
`2`	`3`	`using Abp.AspNetCore.Mvc.Controllers;`
`3`		`-using Abp.Json;`
`4`	`4`	`using Abp.UI;`
`5`	`5`	`using AbpCompanyName.AbpProjectName.Products;`
`6`	`6`	`using Microsoft.AspNetCore.Mvc;`
`@@ -19,16 +19,10 @@ public HomeController(IProductAppService productAppService)`
`19`	`19`	`public async Task<ActionResult> Index()`
`20`	`20`	`{`
`21`	`21`	`var model = await _productAppService.GetAllProducts();`
`22`		`- //return Content(model.ToJsonString());`
`23`	`22`	`return View(model);`
`24`	`23`	`}`
`25`	`24`
`26`		`- public ActionResult Exception1()`
`27`		`- {`
`28`		`- throw new UserFriendlyException("Test User Friendly Exception", "This is a user friendly exception directly shown to the user.");`
`29`		`- }`
`30`		`-`
`31`		`- public JsonResult Exception2()`
	`25`	`+ public JsonResult GetUserFriendlyException()`
`32`	`26`	`{`
`33`	`27`	`throw new UserFriendlyException("Test User Friendly Exception", "This is a user friendly exception directly shown to the user.");`
`34`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,8 +34,8 @@ public IServiceProvider ConfigureServices(IServiceCollection services)`
`34`	`34`
`35`	`35`	`services.AddMvc(options =>`
`36`	`36`	`{`
`37`		`- options.AddAbp(); //Add ABP infrastructure to MVC`
`38`		`- }).AddControllersAsServices();`
	`37`	`+ options.AddAbp(services); //Add ABP infrastructure to MVC`
	`38`	`+ });`
`39`	`39`
`40`	`40`	`//Configure Abp and Dependency Injection`
`41`	`41`	`return services.AddAbp(abpBootstrapper =>`