* Fix warnings SA1111, SA1028, SA1500, IDE1270 in Umbraco.Web.Website, and updated rules. * Remove warnings: IDE0270: Null check can be simplified * More SqlServer project warnings resolved * CS0105 namespace appeared already * Suppress warning until implementation: #pragma warning disable CS0162 // Unreachable code detected #pragma warning disable CS0618 // Type or member is obsolete CS0162 remove unreachable code SA1028 remove trailing whitespace SA1106 no empty statements CS1570 malformed XML CS1572 corrected xml parameter CS1573 param tag added IDE0007 var not explicit IDE0008 explicit not var IDE0057 simplify substring IDE0074 compound assignment CA1825 array.empty Down to 3479 warnings * - SA1116, SA117 params on same line - IDE0057 substring simplified Specific warnings for Umbraco.Tests.Benchmarks * Fixed IDE0074 compound assignment and added specific warnings for Umbraco.Tests.Common * Specific warnings for Umbraco.Tests.Integration and Umbraco.Tests.Common Fixed: - SA1111, SA1116, SA117 params and line formatting (not all as there are many) - SA1122 string.Empty - IDE0057 simplify substring - IDE0044,IDE0044 make field readonly - IDE1006 naming rule violation (add _) - SA1111 closing parenthesis on line of last parameter - SA1649 filename match type name - SA1312,SA1306 lowercase variable and field names * Fixed various warnings where they are more straight-forward, including: - SA1649 file name match type name - SA111 parenthesis on line of last parameter - IDE0028 simplify collection initializer - SA1306 lower-case letter field - IDE044 readonly field - SA1122 string.Empty - SA1116 params same line - IDE1006 upper casing - IDE0041 simplify null check Updated the following projects to only list their remaining specific warning codes: - Umbraco.Tests.UnitTests Typo in `Umbraco.Web.Website` project * Reverted test change * Now 1556 warnings. Fixed various warnings where they are more straight-forward, including: - SA1111/SA1116/SA1119 parenthesis - SA1117 params - SA1312 lowercase variable - SA1121 built-in type - SA1500/SA1513/SA1503 formatting braces - SA1400 declare access modifier - SA1122 string.Empty - SA1310 no underscore - IDE0049 name simplified - IDE0057 simplify substring - IDE0074 compound assignment - IDE0032 use auto-property - IDE0037 simplify member name - IDE0008 explicit type not var - IDE0016/IDE0270/IDE0041 simplify null checks - IDE0048/SA1407 clarity in arithmetic - IDE1006 correct param names - IDE0042 deconstruct variable - IDE0044 readonly - IDE0018 inline variable declarations - IDE0074/IDE0054 compound assignment - IDE1006 naming - CS1573 param XML - CS0168 unused variable Comment formatting in project files for consistency. Updated all projects to only list remaining specific warning codes as warnings instead of errors (errors is now default). * Type not var, and more warning exceptions * Tweaked merge issue, readded comment about rollback * Readded comment re rollback. * Readded comments * Comment tweak * Comment tweak
121 lines
3.7 KiB
C#
121 lines
3.7 KiB
C#
using System.Net;
|
|
using System.Reflection;
|
|
using System.Threading.Tasks;
|
|
using Microsoft.AspNetCore.Mvc;
|
|
using NUnit.Framework;
|
|
using Umbraco.Cms.Core.Cache;
|
|
using Umbraco.Cms.Core.Logging;
|
|
using Umbraco.Cms.Core.Routing;
|
|
using Umbraco.Cms.Core.Services;
|
|
using Umbraco.Cms.Core.Web;
|
|
using Umbraco.Cms.Infrastructure.Persistence;
|
|
using Umbraco.Cms.Tests.Common.Attributes;
|
|
using Umbraco.Cms.Tests.Integration.TestServerTest;
|
|
using Umbraco.Cms.Web.Common.Attributes;
|
|
using Umbraco.Cms.Web.Website.Controllers;
|
|
using Umbraco.Extensions;
|
|
|
|
namespace Umbraco.Cms.Tests.Integration.Umbraco.Web.Website.Routing;
|
|
|
|
[TestFixture]
|
|
public class SurfaceControllerTests : UmbracoTestServerTestBase
|
|
{
|
|
[Test]
|
|
public async Task Auto_Routes_For_Default_Action()
|
|
{
|
|
var url = PrepareSurfaceControllerUrl<TestSurfaceController>(x => x.Index());
|
|
|
|
// Act
|
|
var response = await Client.GetAsync(url);
|
|
|
|
var body = await response.Content.ReadAsStringAsync();
|
|
|
|
// Assert
|
|
Assert.AreEqual(HttpStatusCode.OK, response.StatusCode);
|
|
}
|
|
|
|
[Test]
|
|
public async Task Auto_Routes_For_Custom_Action()
|
|
{
|
|
var url = PrepareSurfaceControllerUrl<TestSurfaceController>(x => x.News());
|
|
|
|
// Act
|
|
var response = await Client.GetAsync(url);
|
|
|
|
var body = await response.Content.ReadAsStringAsync();
|
|
|
|
// Assert
|
|
Assert.AreEqual(HttpStatusCode.NoContent, response.StatusCode);
|
|
}
|
|
|
|
[Test]
|
|
[LongRunning]
|
|
public async Task Plugin_Controller_Routes_By_Area()
|
|
{
|
|
// Create URL manually, because PrepareSurfaceController URl will prepare whatever the controller is routed as
|
|
var controllerType = typeof(TestPluginController);
|
|
var pluginAttribute =
|
|
CustomAttributeExtensions.GetCustomAttribute<PluginControllerAttribute>(controllerType, false);
|
|
var controllerName = ControllerExtensions.GetControllerName(controllerType);
|
|
var url = $"/umbraco/{pluginAttribute?.AreaName}/{controllerName}";
|
|
PrepareUrl(url);
|
|
|
|
var response = await Client.GetAsync(url);
|
|
|
|
var body = await response.Content.ReadAsStringAsync();
|
|
|
|
Assert.AreEqual(HttpStatusCode.OK, response.StatusCode);
|
|
}
|
|
}
|
|
|
|
// Test controllers must be non-nested, else we need to jump through some hoops with custom
|
|
// IApplicationFeatureProvider<ControllerFeature>
|
|
// For future notes if we want this, some example code of this is here
|
|
// https://tpodolak.com/blog/2020/06/22/asp-net-core-adding-controllers-directly-integration-tests/
|
|
public class TestSurfaceController : SurfaceController
|
|
{
|
|
public TestSurfaceController(
|
|
IUmbracoContextAccessor umbracoContextAccessor,
|
|
IUmbracoDatabaseFactory databaseFactory,
|
|
ServiceContext services,
|
|
AppCaches appCaches,
|
|
IProfilingLogger profilingLogger,
|
|
IPublishedUrlProvider publishedUrlProvider)
|
|
: base(
|
|
umbracoContextAccessor,
|
|
databaseFactory,
|
|
services,
|
|
appCaches,
|
|
profilingLogger,
|
|
publishedUrlProvider)
|
|
{
|
|
}
|
|
|
|
public IActionResult Index() => Ok();
|
|
|
|
public IActionResult News() => NoContent();
|
|
}
|
|
|
|
[PluginController("TestArea")]
|
|
public class TestPluginController : SurfaceController
|
|
{
|
|
public TestPluginController(
|
|
IUmbracoContextAccessor umbracoContextAccessor,
|
|
IUmbracoDatabaseFactory databaseFactory,
|
|
ServiceContext services,
|
|
AppCaches appCaches,
|
|
IProfilingLogger profilingLogger,
|
|
IPublishedUrlProvider publishedUrlProvider)
|
|
: base(
|
|
umbracoContextAccessor,
|
|
databaseFactory,
|
|
services,
|
|
appCaches,
|
|
profilingLogger,
|
|
publishedUrlProvider)
|
|
{
|
|
}
|
|
|
|
public IActionResult Index() => Ok();
|
|
}
|