Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion src/core/Akka.Remote.Tests/ActorsLeakSpec.cs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
using Xunit;
using FluentAssertions;
using FluentAssertions.Extensions;
using Xunit.Abstractions;

namespace Akka.Remote.Tests
{
Expand Down
16 changes: 8 additions & 8 deletions src/core/Akka.Remote.Tests/Akka.Remote.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@

<PropertyGroup Condition="'$(OS)' == 'Windows_NT'">
<TargetFrameworks>$(NetFrameworkTestVersion);$(NetTestVersion)</TargetFrameworks>
<OutputType>Exe</OutputType>
<IsPackable>false</IsPackable>
</PropertyGroup>

<!-- disable .NET Framework on Linux-->
Expand All @@ -12,8 +14,9 @@

<ItemGroup>
<ProjectReference Include="..\..\contrib\serializers\Akka.Serialization.Hyperion\Akka.Serialization.Hyperion.csproj" />
<ProjectReference Include="..\..\contrib\testkits\Akka.TestKit.Xunit\Akka.TestKit.Xunit.csproj" />
<ProjectReference Include="..\Akka.Remote\Akka.Remote.csproj" />
<ProjectReference Include="..\Akka.Tests.Shared.Internals\Akka.Tests.Shared.Internals.csproj" />
<ProjectReference Include="..\Akka.Tests.Shared.Internals.Xunit3\Akka.Tests.Shared.Internals.Xunit3.csproj" />

<None Include="Resources\akka-validcert.pfx">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
Expand Down Expand Up @@ -42,14 +45,11 @@

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
<PackageReference Include="xunit" Version="$(XunitVersion)" />
<PackageReference Include="xunit.runner.visualstudio" Version="$(XunitVersion)" />
<PackageReference Include="xunit.v3" Version="$(Xunit3Version)" />
<PackageReference Include="xunit.runner.visualstudio" Version="$(Xunit3RunnerVersion)" />
<PackageReference Include="FluentAssertions" Version="$(FluentAssertionsVersion)" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == '$(NetFrameworkTestVersion)' ">
<PackageReference Include="FsCheck" Version="$(FsCheckVersion)" />
<PackageReference Include="FsCheck.Xunit" Version="$(FsCheckVersion)" />
<PackageReference Include="FsCheck" Version="$(FsCheck3Version)" />
<PackageReference Include="FsCheck.Xunit.v3" Version="$(FsCheck3Version)" />
</ItemGroup>

<PropertyGroup Condition=" '$(TargetFramework)' == '$(NetFrameworkTestVersion)' ">
Expand Down
3 changes: 1 addition & 2 deletions src/core/Akka.Remote.Tests/BugFixes/BugFix4384Spec.cs
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,10 @@
using Akka.Routing;
using FluentAssertions;
using Xunit;
using Xunit.Abstractions;

namespace Akka.Remote.Tests.BugFixes
{
public class BugFix4384Spec : TestKit.Xunit2.TestKit
public class BugFix4384Spec : TestKit.Xunit.TestKit
{
public ActorSystem Sys1 { get; }
public Address Sys1Address { get; }
Expand Down
1 change: 0 additions & 1 deletion src/core/Akka.Remote.Tests/ExceptionSupportSpec.cs
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
using Akka.Serialization;
using Akka.TestKit;
using Xunit;
using Xunit.Abstractions;
using FluentAssertions;

namespace Akka.Remote.Tests
Expand Down
1 change: 0 additions & 1 deletion src/core/Akka.Remote.Tests/RemoteActorTelemetrySpecs.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
using Akka.TestKit.TestActors;
using Akka.Util.Internal;
using Xunit;
using Xunit.Abstractions;

namespace Akka.Remote.Tests
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
using Akka.TestKit.Extensions;
using Akka.TestKit.TestActors;
using Xunit;
using Xunit.Abstractions;

namespace Akka.Remote.Tests
{
Expand Down
1 change: 0 additions & 1 deletion src/core/Akka.Remote.Tests/RemoteMetricsSpec.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
using Akka.TestKit;
using Akka.Util.Internal;
using Xunit;
using Xunit.Abstractions;

namespace Akka.Remote.Tests
{
Expand Down
1 change: 0 additions & 1 deletion src/core/Akka.Remote.Tests/RemoteRouterSpec.cs
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
using Akka.Util.Internal;
using Xunit;
using FluentAssertions;
using Xunit.Abstractions;

namespace Akka.Remote.Tests
{
Expand Down
1 change: 0 additions & 1 deletion src/core/Akka.Remote.Tests/RemoteWatcherSpec.cs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
using Akka.Util.Internal;
using FluentAssertions.Extensions;
using Xunit;
using Xunit.Abstractions;

namespace Akka.Remote.Tests
{
Expand Down
3 changes: 1 addition & 2 deletions src/core/Akka.Remote.Tests/RemotingSpec.cs
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,10 @@
using FluentAssertions;
using Google.Protobuf;
using Xunit;
using Xunit.Abstractions;
using Nito.AsyncEx;
using ThreadLocalRandom = Akka.Util.ThreadLocalRandom;
using Akka.TestKit.Extensions;
using Akka.TestKit.Xunit2.Attributes;
using Akka.TestKit.Xunit.Attributes;
using FluentAssertions.Extensions;

namespace Akka.Remote.Tests
Expand Down
1 change: 0 additions & 1 deletion src/core/Akka.Remote.Tests/RemotingTerminatorSpecs.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
using Akka.TestKit.TestActors;
using FluentAssertions.Extensions;
using Xunit;
using Xunit.Abstractions;

namespace Akka.Remote.Tests
{
Expand Down
1 change: 0 additions & 1 deletion src/core/Akka.Remote.Tests/Serialization/BugFix5062Spec.cs
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
using FluentAssertions;
using Google.Protobuf;
using Xunit;
using Xunit.Abstractions;

namespace Akka.Remote.Tests.Serialization
{
Expand Down
1 change: 0 additions & 1 deletion src/core/Akka.Remote.Tests/Serialization/Bugfix3903Spec.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
using Akka.TestKit;
using Akka.Util.Internal;
using Xunit;
using Xunit.Abstractions;
using FluentAssertions;

namespace Akka.Remote.Tests.Serialization
Expand Down
3 changes: 1 addition & 2 deletions src/core/Akka.Remote.Tests/Serialization/Bugfix7215Spec.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,12 @@
using Akka.Actor;
using Akka.Remote.Serialization;
using Xunit;
using Xunit.Abstractions;
using FluentAssertions;
using static FluentAssertions.FluentActions;

namespace Akka.Remote.Tests.Serialization;

public class Bugfix7215Spec: TestKit.Xunit2.TestKit
public class Bugfix7215Spec: TestKit.Xunit.TestKit
{
public Bugfix7215Spec(ITestOutputHelper output) : base(nameof(Bugfix7215Spec), output)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,11 @@
using FluentAssertions;
using FluentAssertions.Extensions;
using Xunit;
using Xunit.Abstractions;
using static FluentAssertions.FluentActions;

namespace Akka.Remote.Tests.Serialization
{
public class RemoteAskFailureSpec: TestKit.Xunit2.TestKit
public class RemoteAskFailureSpec: TestKit.Xunit.TestKit
{
private static Config Config(int port) => @$"
akka.actor.ask-timeout = 5s
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
using FluentAssertions;
using Akka.Util.Internal;
using Xunit;
using Xunit.Abstractions;

namespace Akka.Remote.Tests.Serialization
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
using Akka.Util.Internal;
using FluentAssertions;
using Xunit;
using Xunit.Abstractions;

namespace Akka.Remote.Tests.Serialization
{
Expand Down
1 change: 0 additions & 1 deletion src/core/Akka.Remote.Tests/Transport/AkkaProtocolSpec.cs
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
using FluentAssertions.Extensions;
using Google.Protobuf;
using Xunit;
using Xunit.Abstractions;
using SerializedMessage = Akka.Remote.Serialization.Proto.Msg.Payload;
using static FluentAssertions.FluentActions;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
using Akka.Util.Internal;
using FluentAssertions.Extensions;
using Xunit;
using Xunit.Abstractions;

namespace Akka.Remote.Tests.Transport
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
using Akka.Remote.Transport.DotNetty;
using Akka.TestKit;
using Xunit;
using Xunit.Abstractions;

namespace Akka.Remote.Tests.Transport
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
using FluentAssertions;
using FluentAssertions.Extensions;
using Xunit;
using Xunit.Abstractions;

namespace Akka.Remote.Tests.Transport
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
using Akka.Configuration;
using Akka.TestKit;
using Xunit;
using Xunit.Abstractions;

namespace Akka.Remote.Tests.Transport
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
using Akka.Configuration;
using Akka.TestKit;
using Xunit;
using Xunit.Abstractions;

namespace Akka.Remote.Tests.Transport
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
using Akka.Remote.Transport.DotNetty;
using Akka.TestKit;
using Xunit;
using Xunit.Abstractions;
using static Akka.Util.RuntimeDetector;

namespace Akka.Remote.Tests.Transport
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,9 @@
using Akka.Actor;
using Akka.Configuration;
using Akka.TestKit;
using Akka.TestKit.Xunit2.Attributes;
using Akka.TestKit.Xunit.Attributes;
using FluentAssertions;
using Xunit;
using Xunit.Abstractions;
using static Akka.Util.RuntimeDetector;

namespace Akka.Remote.Tests.Transport
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
using Akka.TestKit;
using Akka.Event;
using Xunit;
using Xunit.Abstractions;

namespace Akka.Remote.Tests.Transport
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
using FsCheck;
using FsCheck.Xunit;
using Xunit;
using Xunit.Abstractions;
using static Akka.Util.RuntimeDetector;
using Config = Akka.Configuration.Config;
using FluentAssertions;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,13 @@
using Akka.Configuration;
using Akka.TestKit;
using Xunit;
using Xunit.Abstractions;

namespace Akka.Remote.Tests.Transport;

/// <summary>
/// Added this spec to prove the existence of https://github.com/akkadotnet/akka.net/issues/7378
/// </summary>
public class MultiTransportAddressingSpec : TestKit.Xunit2.TestKit
public class MultiTransportAddressingSpec : TestKit.Xunit.TestKit
{
public MultiTransportAddressingSpec(ITestOutputHelper output) : base(GetConfig(Sys1Port1, Sys1Port2), "MultiTransportSpec", output)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
using FluentAssertions;
using FluentAssertions.Extensions;
using Xunit;
using Xunit.Abstractions;

namespace Akka.Remote.Tests.Transport
{
Expand Down
1 change: 0 additions & 1 deletion src/core/Akka.Remote.Tests/UntrustedSpec.cs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
using Akka.TestKit;
using Akka.Util.Internal;
using Xunit;
using Xunit.Abstractions;

namespace Akka.Remote.Tests
{
Expand Down
Loading