Resolved more warnings, and marked more warning types as errors (#16991)
* 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
2024-09-24 12:56:28 +01:00
|
|
|
using NUnit.Framework;
|
2023-07-10 14:36:20 +02:00
|
|
|
using Umbraco.Cms.Core.Services;
|
|
|
|
|
using Umbraco.Cms.Core.Services.OperationStatus;
|
|
|
|
|
using Umbraco.Cms.Tests.Common.Testing;
|
|
|
|
|
using Umbraco.Cms.Tests.Integration.Testing;
|
|
|
|
|
|
|
|
|
|
namespace Umbraco.Cms.Tests.Integration.Umbraco.Core.Services;
|
|
|
|
|
|
|
|
|
|
[TestFixture]
|
|
|
|
|
[UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
|
2025-03-21 18:02:31 +01:00
|
|
|
internal sealed class LogViewerServiceTests : UmbracoIntegrationTest
|
2023-07-10 14:36:20 +02:00
|
|
|
{
|
|
|
|
|
private ILogViewerService LogViewerService => GetRequiredService<ILogViewerService>();
|
|
|
|
|
|
|
|
|
|
private const string LogfileName = "UmbracoTraceLog.INTEGRATIONTEST.20230707.json";
|
|
|
|
|
|
Resolved more warnings, and marked more warning types as errors (#16991)
* 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
2024-09-24 12:56:28 +01:00
|
|
|
private readonly string _newLogfilePath;
|
|
|
|
|
private readonly string _newLogfileDirPath;
|
|
|
|
|
private readonly DateTime _startDate = new(2023, 7, 7);
|
|
|
|
|
private readonly DateTime _endDate = new(2023, 7, 8);
|
2023-07-10 14:36:20 +02:00
|
|
|
|
|
|
|
|
[OneTimeSetUp]
|
|
|
|
|
public void Setup()
|
|
|
|
|
{
|
|
|
|
|
// Create an example JSON log file to check results
|
|
|
|
|
// As a one time setup for all tets in this class/fixture
|
|
|
|
|
var testRoot = TestContext.CurrentContext.TestDirectory.Split("bin")[0];
|
|
|
|
|
var ioHelper = TestHelper.IOHelper;
|
|
|
|
|
var hostingEnv = TestHelper.GetHostingEnvironment();
|
|
|
|
|
|
|
|
|
|
var loggingConfiguration = TestHelper.GetLoggingConfiguration(hostingEnv);
|
|
|
|
|
|
|
|
|
|
var exampleLogfilePath = Path.Combine(testRoot, "TestData", "TestLogs", LogfileName);
|
|
|
|
|
|
|
|
|
|
string newLogfileDirPath = loggingConfiguration.LogDirectory;
|
|
|
|
|
string newLogfilePath = Path.Combine(newLogfileDirPath, LogfileName);
|
|
|
|
|
|
|
|
|
|
// Create/ensure Directory exists
|
|
|
|
|
ioHelper.EnsurePathExists(newLogfileDirPath);
|
|
|
|
|
|
|
|
|
|
// Copy the sample files
|
|
|
|
|
File.Copy(exampleLogfilePath, newLogfilePath, true);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
[OneTimeTearDown]
|
|
|
|
|
public void TearDown()
|
|
|
|
|
{
|
|
|
|
|
// Cleanup & delete the example log & search files off disk
|
|
|
|
|
// Once all tests in this class/fixture have run
|
|
|
|
|
if (File.Exists(_newLogfilePath))
|
|
|
|
|
{
|
|
|
|
|
File.Delete(_newLogfilePath);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
[Test]
|
|
|
|
|
public async Task Can_View_Logs()
|
|
|
|
|
{
|
|
|
|
|
var attempt = await LogViewerService.CanViewLogsAsync(_startDate, _endDate);
|
|
|
|
|
|
|
|
|
|
Assert.Multiple(() =>
|
|
|
|
|
{
|
|
|
|
|
Assert.IsTrue(attempt.Success);
|
|
|
|
|
Assert.AreEqual(attempt.Status, LogViewerOperationStatus.Success);
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
[Test]
|
|
|
|
|
public async Task Can_Get_Logs()
|
|
|
|
|
{
|
|
|
|
|
var attempt = await LogViewerService.GetPagedLogsAsync(_startDate, _endDate, 0, int.MaxValue);
|
|
|
|
|
|
|
|
|
|
Assert.Multiple(() =>
|
|
|
|
|
{
|
|
|
|
|
Assert.IsTrue(attempt.Success);
|
|
|
|
|
Assert.AreEqual(attempt.Status, LogViewerOperationStatus.Success);
|
|
|
|
|
Assert.IsNotNull(attempt.Result);
|
|
|
|
|
Assert.IsNotEmpty(attempt.Result.Items);
|
|
|
|
|
Assert.AreEqual(362, attempt.Result.Total);
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
[Test]
|
|
|
|
|
public async Task Can_Get_Logs_By_Filter_Expression()
|
|
|
|
|
{
|
Resolved more warnings, and marked more warning types as errors (#16991)
* 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
2024-09-24 12:56:28 +01:00
|
|
|
var attempt = await LogViewerService.GetPagedLogsAsync(
|
|
|
|
|
_startDate,
|
|
|
|
|
_endDate,
|
|
|
|
|
0,
|
|
|
|
|
int.MaxValue,
|
2023-07-10 14:36:20 +02:00
|
|
|
filterExpression: "@Level='Error'");
|
|
|
|
|
|
|
|
|
|
Assert.Multiple(() =>
|
|
|
|
|
{
|
|
|
|
|
Assert.IsTrue(attempt.Success);
|
|
|
|
|
Assert.AreEqual(LogViewerOperationStatus.Success, attempt.Status);
|
|
|
|
|
Assert.IsNotNull(attempt.Result);
|
|
|
|
|
Assert.IsNotEmpty(attempt.Result.Items);
|
|
|
|
|
Assert.AreEqual(6, attempt.Result.Total);
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
[Test]
|
|
|
|
|
public async Task Can_Get_Logs_By_Log_Levels()
|
|
|
|
|
{
|
|
|
|
|
var attempt =
|
|
|
|
|
await LogViewerService.GetPagedLogsAsync(_startDate, _endDate, 0, int.MaxValue, logLevels: new[] {"Error"});
|
|
|
|
|
|
|
|
|
|
Assert.Multiple(() =>
|
|
|
|
|
{
|
|
|
|
|
Assert.IsTrue(attempt.Success);
|
|
|
|
|
Assert.AreEqual(LogViewerOperationStatus.Success, attempt.Status);
|
|
|
|
|
Assert.IsNotNull(attempt.Result);
|
|
|
|
|
Assert.IsNotEmpty(attempt.Result.Items);
|
|
|
|
|
Assert.AreEqual(6, attempt.Result.Total);
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
[Test]
|
|
|
|
|
public async Task Can_Get_Log_Count()
|
|
|
|
|
{
|
|
|
|
|
var attempt = await LogViewerService.GetLogLevelCountsAsync(_startDate, _endDate);
|
|
|
|
|
|
|
|
|
|
Assert.Multiple(() =>
|
|
|
|
|
{
|
|
|
|
|
Assert.IsTrue(attempt.Success);
|
|
|
|
|
Assert.AreEqual(attempt.Status, LogViewerOperationStatus.Success);
|
|
|
|
|
Assert.IsNotNull(attempt.Result);
|
|
|
|
|
Assert.AreEqual(341, attempt.Result.Information);
|
|
|
|
|
Assert.AreEqual(0, attempt.Result.Debug);
|
|
|
|
|
Assert.AreEqual(9, attempt.Result.Warning);
|
|
|
|
|
Assert.AreEqual(6, attempt.Result.Error);
|
|
|
|
|
Assert.AreEqual(6, attempt.Result.Fatal);
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
[Test]
|
|
|
|
|
public async Task Can_Get_Message_Templates()
|
|
|
|
|
{
|
|
|
|
|
var attempt = await LogViewerService.GetMessageTemplatesAsync(_startDate, _endDate, 0, int.MaxValue);
|
|
|
|
|
|
|
|
|
|
Assert.Multiple(() =>
|
|
|
|
|
{
|
|
|
|
|
Assert.IsTrue(attempt.Success);
|
|
|
|
|
Assert.AreEqual(attempt.Status, LogViewerOperationStatus.Success);
|
|
|
|
|
Assert.IsNotNull(attempt.Result);
|
|
|
|
|
Assert.IsNotEmpty(attempt.Result.Items);
|
|
|
|
|
Assert.AreEqual(31, attempt.Result.Total);
|
|
|
|
|
|
|
|
|
|
// Assert its sorted correctly
|
|
|
|
|
var mostPopularTemplate = attempt.Result.Items.First();
|
|
|
|
|
Assert.AreEqual("Create Index:\n {Sql}", mostPopularTemplate.MessageTemplate);
|
|
|
|
|
Assert.AreEqual(74, mostPopularTemplate.Count);
|
|
|
|
|
Assert.AreEqual(attempt.Result.Items, attempt.Result.Items.OrderByDescending(x => x.Count));
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
[Test]
|
|
|
|
|
public async Task Can_Add_Saved_Query()
|
|
|
|
|
{
|
|
|
|
|
const string queryName = "testQuery";
|
|
|
|
|
const string query = "@Message like '%test critical%'";
|
|
|
|
|
var attempt = await LogViewerService.AddSavedLogQueryAsync(queryName, query);
|
|
|
|
|
|
|
|
|
|
Assert.Multiple(() =>
|
|
|
|
|
{
|
|
|
|
|
Assert.IsTrue(attempt.Success);
|
|
|
|
|
Assert.AreEqual(attempt.Status, LogViewerOperationStatus.Success);
|
|
|
|
|
Assert.IsNotNull(attempt.Result);
|
|
|
|
|
Assert.AreEqual(queryName, attempt.Result.Name);
|
|
|
|
|
Assert.AreEqual(query, attempt.Result.Query);
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
[Test]
|
|
|
|
|
public async Task Can_Get_Saved_Query()
|
|
|
|
|
{
|
|
|
|
|
const string queryName = "testQuery";
|
|
|
|
|
const string query = "@Message like '%test critical%'";
|
|
|
|
|
var savedAttempt = await LogViewerService.AddSavedLogQueryAsync(queryName, query);
|
|
|
|
|
|
|
|
|
|
Assert.Multiple(() =>
|
|
|
|
|
{
|
|
|
|
|
Assert.IsTrue(savedAttempt.Success);
|
|
|
|
|
Assert.AreEqual(savedAttempt.Status, LogViewerOperationStatus.Success);
|
|
|
|
|
Assert.IsNotNull(savedAttempt.Result);
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
var getAttempt = await LogViewerService.GetSavedLogQueryByNameAsync(queryName);
|
|
|
|
|
|
|
|
|
|
Assert.AreEqual(getAttempt, savedAttempt.Result);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
[Test]
|
|
|
|
|
public async Task Can_Delete_Saved_Query()
|
|
|
|
|
{
|
|
|
|
|
const string queryName = "testQuery";
|
|
|
|
|
const string query = "@Message like '%test critical%'";
|
|
|
|
|
var savedAttempt = await LogViewerService.AddSavedLogQueryAsync(queryName, query);
|
|
|
|
|
|
|
|
|
|
Assert.Multiple(() =>
|
|
|
|
|
{
|
|
|
|
|
Assert.IsTrue(savedAttempt.Success);
|
|
|
|
|
Assert.AreEqual(savedAttempt.Status, LogViewerOperationStatus.Success);
|
|
|
|
|
Assert.IsNotNull(savedAttempt.Result);
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
var deleteAttempt = await LogViewerService.DeleteSavedLogQueryAsync(queryName);
|
|
|
|
|
|
|
|
|
|
Assert.Multiple(() =>
|
|
|
|
|
{
|
|
|
|
|
Assert.IsTrue(deleteAttempt.Success);
|
|
|
|
|
Assert.AreEqual(deleteAttempt.Status, LogViewerOperationStatus.Success);
|
|
|
|
|
Assert.AreEqual(savedAttempt.Result, deleteAttempt.Result);
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
}
|