Skip to content

Commit 2c2674b

Browse files
HirogenHirogen
authored
Merge pull request #495 from LogExperts/optimizations_warnings_removal_housekeeping
optimizations
2 parents 1ef497a + 8ce7e15 commit 2c2674b

178 files changed

Lines changed: 2128 additions & 872 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎build/_build.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@
1414
<PackageReference Include="GitVersion.Core" Version="6.5.0" />
1515
<PackageReference Include="Microsoft.Build" Version="18.0.2" />
1616
<PackageReference Include="Microsoft.Build.Tasks.Core" Version="18.0.2" />
17-
<PackageReference Include="NuGet.CommandLine" Version="7.0.0">
17+
<PackageReference Include="NuGet.CommandLine" Version="7.0.1">
1818
<PrivateAssets>all</PrivateAssets>
1919
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
2020
</PackageReference>
21-
<PackageReference Include="NuGet.Versioning" Version="7.0.0" />
22-
<PackageReference Include="Nuke.Common" Version="9.0.4" />
21+
<PackageReference Include="NuGet.Versioning" Version="7.0.1" />
22+
<PackageReference Include="Nuke.Common" Version="10.0.0" />
2323
<PackageReference Include="Nuke.GitHub" Version="7.0.0" />
2424
<PackageReference Include="NUnit.ConsoleRunner" Version="3.20.2" />
2525
</ItemGroup>

‎src/AutoColumnizer/AutoColumnizer.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using LogExpert;
1+
using ColumnizerLib;
22

33
namespace AutoColumnizer;
44

‎src/ColumnizerLib.UnitTests/ColumnTests.cs‎

Lines changed: 30 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,51 @@
1-
using LogExpert;
1+
using System.Text;
22

3-
using NUnit.Framework;
3+
using ColumnizerLib;
44

5-
using System;
6-
using System.Text;
5+
using NUnit.Framework;
76

8-
namespace ColumnizerLib.UnitTests;
7+
namespace LogExpert.ColumnizerLib.Tests;
98

109
[TestFixture]
1110
public class ColumnTests
1211
{
1312
[SetUp]
14-
public void SetUp()
13+
public void SetUp ()
1514
{
1615
// Reset to default before each test
1716
Column.SetMaxDisplayLength(20_000);
1817
}
1918

2019
[Test]
21-
public void Column_DisplayMaxLength_DefaultIs20000()
20+
public void Column_DisplayMaxLength_DefaultIs20000 ()
2221
{
2322
Assert.That(Column.GetMaxDisplayLength(), Is.EqualTo(20_000));
2423
}
2524

2625
[Test]
27-
public void Column_DisplayMaxLength_CanBeConfigured()
26+
public void Column_DisplayMaxLength_CanBeConfigured ()
2827
{
2928
Column.SetMaxDisplayLength(50_000);
3029
Assert.That(Column.GetMaxDisplayLength(), Is.EqualTo(50_000));
31-
30+
3231
// Reset for other tests
3332
Column.SetMaxDisplayLength(20_000);
3433
}
3534

3635
[Test]
37-
public void Column_DisplayMaxLength_EnforcesMinimum()
36+
public void Column_DisplayMaxLength_EnforcesMinimum ()
3837
{
39-
Assert.Throws<ArgumentOutOfRangeException>(() => Column.SetMaxDisplayLength(500));
38+
_ = Assert.Throws<ArgumentOutOfRangeException>(() => Column.SetMaxDisplayLength(500));
4039
}
4140

4241
[Test]
43-
public void Column_TruncatesAtConfiguredDisplayLength()
42+
public void Column_TruncatesAtConfiguredDisplayLength ()
4443
{
4544
Column.SetMaxDisplayLength(10_000);
46-
45+
4746
// Create a line longer than the display max length
4847
var longValue = new StringBuilder().Append('X', 15_000).ToString();
49-
48+
5049
Column column = new()
5150
{
5251
FullValue = longValue
@@ -55,21 +54,21 @@ public void Column_TruncatesAtConfiguredDisplayLength()
5554
// FullValue should contain the full line
5655
Assert.That(column.FullValue, Is.EqualTo(longValue));
5756
Assert.That(column.FullValue.Length, Is.EqualTo(15_000));
58-
57+
5958
// DisplayValue should be truncated at 10,000 with "..." appended
6059
Assert.That(column.DisplayValue.Length, Is.EqualTo(10_003)); // 10000 + "..."
61-
Assert.That(column.DisplayValue.EndsWith("..."), Is.True);
62-
Assert.That(column.DisplayValue.StartsWith("XXX"), Is.True);
63-
60+
Assert.That(column.DisplayValue.EndsWith("...", StringComparison.OrdinalIgnoreCase), Is.True);
61+
Assert.That(column.DisplayValue.StartsWith("XXX", StringComparison.OrdinalIgnoreCase), Is.True);
62+
6463
// Reset for other tests
6564
Column.SetMaxDisplayLength(20_000);
6665
}
6766

6867
[Test]
69-
public void Column_NoTruncationWhenBelowLimit()
68+
public void Column_NoTruncationWhenBelowLimit ()
7069
{
7170
Column.SetMaxDisplayLength(20_000);
72-
71+
7372
var normalValue = new StringBuilder().Append('Y', 5_000).ToString();
7473
Column column = new()
7574
{
@@ -81,14 +80,15 @@ public void Column_NoTruncationWhenBelowLimit()
8180
}
8281

8382
[Test]
84-
public void Column_NullCharReplacement()
83+
public void Column_NullCharReplacement ()
8584
{
86-
Column column = new();
87-
88-
column.FullValue = "asdf\0";
85+
Column column = new()
86+
{
87+
FullValue = "asdf\0"
88+
};
8989

9090
//Switch between the different implementation for the windows versions
91-
//Not that great solution but currently I'm out of ideas, I know that currently
91+
//Not that great solution but currently I'm out of ideas, I know that currently
9292
//only one implementation depending on the windows version is executed
9393
if (Environment.Version >= Version.Parse("6.2"))
9494
{
@@ -103,11 +103,12 @@ public void Column_NullCharReplacement()
103103
}
104104

105105
[Test]
106-
public void Column_TabReplacement()
106+
public void Column_TabReplacement ()
107107
{
108-
Column column = new();
109-
110-
column.FullValue = "asdf\t";
108+
Column column = new()
109+
{
110+
FullValue = "asdf\t"
111+
};
111112

112113
Assert.That(column.DisplayValue, Is.EqualTo("asdf "));
113114
Assert.That(column.FullValue, Is.EqualTo("asdf\t"));

‎src/ColumnizerLib.UnitTests/Extensions/LogLineExtensionsTests.cs‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
using LogExpert;
2-
using LogExpert.Extensions;
1+
using ColumnizerLib;
2+
using ColumnizerLib.Extensions;
33

44
using NUnit.Framework;
55

6-
namespace ColumnizerLib.UnitTests.Extensions;
6+
namespace LogExpert.ColumnizerLib.Tests.Extensions;
77

88
[TestFixture]
99

@@ -19,7 +19,8 @@ private class TestingLogLine : ILogLine
1919
}
2020

2121
[Test]
22-
public void ToClipBoardText_ReturnsExpected()
22+
[System.Diagnostics.CodeAnalysis.SuppressMessage("Globalization", "CA1303:Do not pass literals as localized parameters", Justification = "Unit Test")]
23+
public void ToClipBoardText_ReturnsExpected ()
2324
{
2425
var underTest = new TestingLogLine
2526
{

src/ColumnizerLib.UnitTests/ColumnizerLib.UnitTests.csproj renamed to src/ColumnizerLib.UnitTests/LogExpert.ColumnizerLib.Tests.csproj

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
2-
<PropertyGroup>
3-
<TargetFramework>net10.0</TargetFramework>
4-
5-
<IsTestProject>true</IsTestProject>
6-
<AssemblyTitle>ColumnizerLib.UnitTests</AssemblyTitle>
7-
<Company>Microsoft</Company>
8-
<OutputPath>bin\$(Configuration)</OutputPath>
9-
</PropertyGroup>
10-
<ItemGroup>
11-
<ProjectReference Include="..\ColumnizerLib\ColumnizerLib.csproj" />
12-
</ItemGroup>
13-
<ItemGroup>
14-
<PackageReference Include="NUnit" />
15-
<PackageReference Include="NUnit3TestAdapter" />
16-
<PackageReference Include="Microsoft.NET.Test.Sdk" />
17-
</ItemGroup>
18-
</Project>
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
<PropertyGroup>
3+
<TargetFramework>net10.0</TargetFramework>
4+
5+
<IsTestProject>true</IsTestProject>
6+
<AssemblyTitle>ColumnizerLib.Tests</AssemblyTitle>
7+
<Company>Microsoft</Company>
8+
<OutputPath>bin\$(Configuration)</OutputPath>
9+
<RootNamespace>LogExpert.ColumnizerLib.Tests</RootNamespace>
10+
</PropertyGroup>
11+
<ItemGroup>
12+
<ProjectReference Include="..\ColumnizerLib\ColumnizerLib.csproj" />
13+
</ItemGroup>
14+
<ItemGroup>
15+
<PackageReference Include="NUnit" />
16+
<PackageReference Include="NUnit3TestAdapter" />
17+
<PackageReference Include="Microsoft.NET.Test.Sdk" />
18+
</ItemGroup>
19+
</Project>

‎src/ColumnizerLib/Column.cs‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
using LogExpert;
2-
31
namespace ColumnizerLib;
42

53
public class Column : IColumn
@@ -90,7 +88,7 @@ public static void SetMaxDisplayLength (int maxLength)
9088
{
9189
if (maxLength < 1000)
9290
{
93-
throw new ArgumentOutOfRangeException(nameof(maxLength), "Maximum display length must be at least 1000 characters.");
91+
throw new ArgumentOutOfRangeException(nameof(maxLength), Resources.Column_Error_Messages_MaximumDisplayLengthMustBeAtLeast1000Characters);
9492
}
9593

9694
_maxDisplayLength = maxLength;

‎src/ColumnizerLib/ColumnizedLogLine.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
namespace LogExpert;
1+
namespace ColumnizerLib;
22

33
public class ColumnizedLogLine : IColumnizedLogLine
44
{

‎src/ColumnizerLib/ColumnizerLib.csproj‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,24 @@
44
<TargetFramework>net10.0</TargetFramework>
55

66
<DocumentationFile>$(SolutionDir)..\bin\Docs\ColumnizerLib.xml</DocumentationFile>
7+
8+
<RootNamespace>ColumnizerLib</RootNamespace>
79
</PropertyGroup>
810

11+
<ItemGroup>
12+
<Compile Update="Resources.Designer.cs">
13+
<DesignTime>True</DesignTime>
14+
<AutoGen>True</AutoGen>
15+
<DependentUpon>Resources.resx</DependentUpon>
16+
</Compile>
17+
</ItemGroup>
18+
19+
<ItemGroup>
20+
<EmbeddedResource Update="Resources.resx">
21+
<Generator>ResXFileCodeGenerator</Generator>
22+
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
23+
<CustomToolNamespace>ColumnizerLib</CustomToolNamespace>
24+
</EmbeddedResource>
25+
</ItemGroup>
26+
927
</Project>

‎src/ColumnizerLib/Extensions/LogLineExtensions.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
namespace LogExpert.Extensions;
1+
namespace ColumnizerLib.Extensions;
22

33
//TODO: Move this to LogExpert.UI, change to internal and fix tests
44
public static class LogLineExtensions

‎src/ColumnizerLib/IAutoLogLineColumnizerCallback.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
namespace LogExpert;
1+
namespace ColumnizerLib;
22

33
public interface IAutoLogLineColumnizerCallback
44
{

0 commit comments

Comments
 (0)