Skip to content

Add multi-targeting to unit test project with net481 support #40

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
paulirwin merged 3 commits into from
Aug 9, 2024
Merged

Add multi-targeting to unit test project with net481 support #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1ce235d
Add multi-targeting to unit test project with net481 support
paulirwin Aug 9, 2024
e4ca592
Use .NET 8 SDK in build pipeline
paulirwin Aug 9, 2024
37cbac1
Update dotnet.yml
paulirwin Aug 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion .github/workflows/dotnet.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,14 @@ jobs:

steps:
- uses: actions/checkout@v2
- name: Setup .NET
- name: Setup .NET 6
uses: actions/setup-dotnet@v1
with:
dotnet-version: 6.0.x
- name: Setup .NET 8
uses: actions/setup-dotnet@v1
with:
dotnet-version: 8.0.x
- name: Restore dependencies
run: dotnet restore
- name: Build
Expand Down
7 changes: 3 additions & 4 deletions test/F23.StringSimilarity.Tests/DamerauTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@

using System;
using System.Diagnostics.CodeAnalysis;
using System.Text;
using F23.StringSimilarity.Tests.TestUtil;
using Xunit;

Expand All @@ -48,11 +47,11 @@ public void TestDistance(string s1, string s2, double expected)

// test char span version
Assert.Equal(expected, actual: instance.Distance(s1.AsSpan(), s2.AsSpan()));

// test byte span version
Assert.Equal(expected, actual: instance.Distance<byte>(
Encoding.Latin1.GetBytes(s1).AsSpan(),
Encoding.Latin1.GetBytes(s2).AsSpan()));
EncodingUtil.Latin1.GetBytes(s1).AsSpan(),
EncodingUtil.Latin1.GetBytes(s2).AsSpan()));
}

[Fact]
Expand Down
5 changes: 4 additions & 1 deletion test/F23.StringSimilarity.Tests/F23.StringSimilarity.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFrameworks>net6.0;net8.0</TargetFrameworks>
<TargetFrameworks Condition="$([MSBuild]::IsOsPlatform('Windows'))">$(TargetFrameworks);net481</TargetFrameworks>
<LangVersion>latest</LangVersion>
<Nullable>enable</Nullable>
</PropertyGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions test/F23.StringSimilarity.Tests/JaroWinklerTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@ public void TestSimilarity(string s1, string s2, double expected)
Assert.Equal(
expected,
actual: instance.Similarity<byte>(
System.Text.Encoding.Latin1.GetBytes(s1).AsSpan(),
System.Text.Encoding.Latin1.GetBytes(s2).AsSpan()),
EncodingUtil.Latin1.GetBytes(s1).AsSpan(),
EncodingUtil.Latin1.GetBytes(s2).AsSpan()),
precision: 6 // 0.000001
);
}
Expand Down
8 changes: 4 additions & 4 deletions test/F23.StringSimilarity.Tests/LevenshteinTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ public void TestDistance(string s1, string s2, double expected)

// test byte span version
Assert.Equal(expected, actual: instance.Distance<byte>(
System.Text.Encoding.Latin1.GetBytes(s1).AsSpan(),
System.Text.Encoding.Latin1.GetBytes(s2).AsSpan()));
EncodingUtil.Latin1.GetBytes(s1).AsSpan(),
EncodingUtil.Latin1.GetBytes(s2).AsSpan()));
}

[InlineData("My string", "M string2", 4, 2.0)]
Expand All @@ -70,8 +70,8 @@ public void TestDistanceWithLimits(string s1, string s2, int limit, double expec

// test byte span version
Assert.Equal(expected, actual: instance.Distance<byte>(
System.Text.Encoding.Latin1.GetBytes(s1).AsSpan(),
System.Text.Encoding.Latin1.GetBytes(s2).AsSpan(),
EncodingUtil.Latin1.GetBytes(s1).AsSpan(),
EncodingUtil.Latin1.GetBytes(s2).AsSpan(),
limit));
}

Expand Down
4 changes: 2 additions & 2 deletions test/F23.StringSimilarity.Tests/LongestCommonSubsequenceTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ public void TestDistance(string s1, string s2, double expected)

// test byte span version
Assert.Equal(expected, actual: instance.Distance<byte>(
System.Text.Encoding.Latin1.GetBytes(s1).AsSpan(),
System.Text.Encoding.Latin1.GetBytes(s2).AsSpan()));
EncodingUtil.Latin1.GetBytes(s1).AsSpan(),
EncodingUtil.Latin1.GetBytes(s2).AsSpan()));
}

[Fact]
Expand Down
4 changes: 2 additions & 2 deletions test/F23.StringSimilarity.Tests/OptimalStringAlignmentTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,8 @@ public void TestDistance(string s1, string s2, double expected)
Assert.Equal(
expected: expected,
actual: instance.Distance<byte>(
System.Text.Encoding.Latin1.GetBytes(s1).AsSpan(),
System.Text.Encoding.Latin1.GetBytes(s2).AsSpan()),
EncodingUtil.Latin1.GetBytes(s1).AsSpan(),
EncodingUtil.Latin1.GetBytes(s2).AsSpan()),
precision: 0 // 0.0
);
}
Expand Down
13 changes: 13 additions & 0 deletions test/F23.StringSimilarity.Tests/TestUtil/EncodingUtil.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
using System.Text;

namespace F23.StringSimilarity.Tests.TestUtil;

internal class EncodingUtil
{
public static Encoding Latin1 =>
#if NET5_0_OR_GREATER
Encoding.Latin1;
#else
Encoding.GetEncoding("ISO-8859-1");
#endif
}