Skip to content

Commit cb3057f

Browse files
authored
Fixed failing tests (#80)
* Fixed failing tests * Moved Tests to separate folder
1 parent e5f6bad commit cb3057f

File tree

8 files changed

+15
-15
lines changed

8 files changed

+15
-15
lines changed

Nlog.RabbitMQ.sln

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{B2E4FF07-A0B
77
EndProject
88
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{5A26CA6D-64DF-4A0F-9FE2-D6BE96AB3F38}"
99
ProjectSection(SolutionItems) = preProject
10-
README.md = README.md
1110
.editorconfig = .editorconfig
11+
README.md = README.md
1212
EndProjectSection
1313
EndProject
1414
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nlog.RabbitMQ.Target", "src\Nlog.RabbitMQ.Target\Nlog.RabbitMQ.Target.csproj", "{F19ED52D-06EE-4C1F-BE6C-060D891CCCF0}"
1515
EndProject
16-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nlog.RabbitMQ.Target.Tests", "src\Nlog.RabbitMQ.Target.Tests\Nlog.RabbitMQ.Target.Tests.csproj", "{36A98B2A-610E-4034-8F16-2BC4A4768E65}"
16+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nlog.RabbitMQ.Target.Tests", "tests\Nlog.RabbitMQ.Target.Tests\Nlog.RabbitMQ.Target.Tests.csproj", "{36A98B2A-610E-4034-8F16-2BC4A4768E65}"
1717
EndProject
1818
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".github", ".github", "{12266784-3C6A-4598-B593-8F84C4BCC0D2}"
1919
ProjectSection(SolutionItems) = preProject
@@ -24,6 +24,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".github", ".github", "{1226
2424
EndProject
2525
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nlog.RabbitMQ.Sample", "src\Nlog.RabbitMQ.Sample\Nlog.RabbitMQ.Sample.csproj", "{6CD9BEEC-158D-4CFE-B24F-A3E328782777}"
2626
EndProject
27+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{02EA681E-C7D8-13C7-8484-4AC65E1B71E8}"
28+
EndProject
2729
Global
2830
GlobalSection(SolutionConfigurationPlatforms) = preSolution
2931
Debug|Any CPU = Debug|Any CPU
@@ -48,7 +50,7 @@ Global
4850
EndGlobalSection
4951
GlobalSection(NestedProjects) = preSolution
5052
{F19ED52D-06EE-4C1F-BE6C-060D891CCCF0} = {B2E4FF07-A0B1-40D5-A4E5-E1F778290C24}
51-
{36A98B2A-610E-4034-8F16-2BC4A4768E65} = {B2E4FF07-A0B1-40D5-A4E5-E1F778290C24}
53+
{36A98B2A-610E-4034-8F16-2BC4A4768E65} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
5254
{12266784-3C6A-4598-B593-8F84C4BCC0D2} = {5A26CA6D-64DF-4A0F-9FE2-D6BE96AB3F38}
5355
{6CD9BEEC-158D-4CFE-B24F-A3E328782777} = {B2E4FF07-A0B1-40D5-A4E5-E1F778290C24}
5456
EndGlobalSection

src/Nlog.RabbitMQ.Target.Tests/MessageFormatterTests.cs renamed to tests/Nlog.RabbitMQ.Target.Tests/MessageFormatterTests.cs

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1-
using System.Text.Json;
2-
31
using FluentAssertions;
4-
2+
using Newtonsoft.Json;
53
using NLog;
64

75
namespace Nlog.RabbitMQ.Target.Tests;
@@ -17,11 +15,11 @@ public void GivenLogEvent_WhenFormatMessage_ThenReturnFormattedMessage()
1715
string messageSource = "nlog://localhost/TestLogger";
1816
var logEvent = new LogEventInfo(logLevel, "TestLogger", logMessage);
1917
var messageFormatter = new MessageFormatter();
20-
18+
2119
// Act
2220
var formattedMessage = messageFormatter.GetMessage(logMessage, messageSource, logEvent, null, null);
23-
var deserializedMessage = JsonSerializer.Deserialize<LogLine>(formattedMessage);
24-
21+
var deserializedMessage = JsonConvert.DeserializeObject<LogLine>(formattedMessage);
22+
2523
// Assert
2624
deserializedMessage.Should().NotBeNull();
2725
deserializedMessage.Message.Should().Be(logMessage);

src/Nlog.RabbitMQ.Target.Tests/Nlog.RabbitMQ.Target.Tests.csproj renamed to tests/Nlog.RabbitMQ.Target.Tests/Nlog.RabbitMQ.Target.Tests.csproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,20 +11,20 @@
1111
</PropertyGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="coverlet.collector" Version="6.0.4"/>
14+
<PackageReference Include="coverlet.collector" Version="6.0.4" />
1515
<PackageReference Include="FluentAssertions" Version="8.0.1" />
16-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0"/>
17-
<PackageReference Include="xunit" Version="2.9.3"/>
18-
<PackageReference Include="xunit.runner.visualstudio" Version="3.0.2"/>
16+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
17+
<PackageReference Include="xunit" Version="2.9.3" />
18+
<PackageReference Include="xunit.runner.visualstudio" Version="3.0.2" />
1919
<PackageReference Include="Testcontainers.RabbitMq" Version="4.2.0" />
2020
</ItemGroup>
2121

2222
<ItemGroup>
23-
<Using Include="Xunit"/>
23+
<ProjectReference Include="..\..\src\Nlog.RabbitMQ.Target\Nlog.RabbitMQ.Target.csproj" />
2424
</ItemGroup>
2525

2626
<ItemGroup>
27-
<ProjectReference Include="..\Nlog.RabbitMQ.Target\Nlog.RabbitMQ.Target.csproj" />
27+
<Using Include="Xunit" />
2828
</ItemGroup>
2929

3030
</Project>

0 commit comments

Comments
 (0)