Skip to content
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

Jump to bottom

Re-enable Akka.Streams.Tests.TCK NUnit tests #4548

Merged
merged 9 commits into from Aug 21, 2020
Merged

Re-enable Akka.Streams.Tests.TCK NUnit tests #4548

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
4455d0f
Turn on NUnit testing on Akka.Streams.Tests.TCK
Arkatufus Aug 20, 2020
9dc81ee
Downgrade NUnit to 3.7.1 becasue 3.12.0 was not compatible with React…
Arkatufus Aug 20, 2020
a06a297
Merge branch 'dev' into Add_NUnit_to_build_system
Arkatufus Aug 20, 2020
a0ad0f3
Remove NUnit reference in csproj, using the one referenced in the `Re…
Arkatufus Aug 20, 2020
e81ce96
Fix build script, it excludes `Akka.Streams.Tests.TCK` from test runs
Arkatufus Aug 21, 2020
bf06936
Merge branch 'dev' into Add_NUnit_to_build_system
Arkatufus Aug 21, 2020
681e12d
Enable Akka.Streams.Tests.TCK on netcoreapp3.1
Arkatufus Aug 21, 2020
5fc1eb9
Merge branch 'dev' into Add_NUnit_to_build_system
Arkatufus Aug 21, 2020
50aab10
Merge branch 'Add_NUnit_to_build_system' of github.com:Arkatufus/akka…
Arkatufus Aug 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions build.fsx
View file
Open in desktop
Expand Up @@ -232,6 +232,7 @@ Target "RunTests" (fun _ ->
let projects =
let rawProjects = match (isWindows) with
| true -> !! "./src/**/*.Tests.*sproj"
++ "./src/**/Akka.Streams.Tests.TCK.csproj"
| _ -> !! "./src/**/*.Tests.*sproj" // if you need to filter specs for Linux vs. Windows, do it here
rawProjects |> Seq.choose filterProjects

Expand All @@ -257,6 +258,7 @@ Target "RunTestsNetCore" (fun _ ->
let projects =
let rawProjects = match (isWindows) with
| true -> !! "./src/**/*.Tests.*sproj"
++ "./src/**/Akka.Streams.Tests.TCK.csproj"
| _ -> !! "./src/**/*.Tests.*sproj" // if you need to filter specs for Linux vs. Windows, do it here
rawProjects |> Seq.choose filterProjects

Expand Down
11 changes: 8 additions & 3 deletions src/core/Akka.Streams.Tests.TCK/Akka.Streams.Tests.TCK.csproj
View file
Open in desktop
Expand Up @@ -2,8 +2,9 @@
<Import Project="..\..\common.props" />
<Import Project="..\..\xunitSettings.props" />
<PropertyGroup>
<AssemblyName>Akka.Streams.Tests</AssemblyName>
<TargetFrameworks>$(NetFrameworkTestVersion)</TargetFrameworks>
<AssemblyName>Akka.Streams.Tests.TCK</AssemblyName>
<!-- Reactive.Streams.TCK isn't compatible with .NET Core -->
<TargetFrameworks>$(NetFrameworkTestVersion);$(NetCoreTestVersion)</TargetFrameworks>
</PropertyGroup>

<ItemGroup>
Expand All @@ -18,8 +19,12 @@

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
<PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
<PackageReference Include="Reactive.Streams.TCK" Version="1.0.2" />
<PackageReference Include="NUnit" Version="3.12.0" />
<!-- !!!WARNING!!!
NUNIT VERSION HAVE TO MATCH WITH THE VERSION USED BY REACTIVE TCK.
!!!WARNING!!! -->
<PackageReference Include="NUnit" Version="3.7.1" Condition="'$(TargetFramework)' == '$(NetCoreTestVersion)'"/>
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I need to add this back in, because .NET Core could not use the NUnit package referenced inside the TCK package

</ItemGroup>

<PropertyGroup Condition=" '$(TargetFramework)' == '$(NetFrameworkTestVersion)' ">
Expand Down