Remove Akka.Tests.Shared.Internals from Akka.Streams.TestKit dependency

src/core/Akka.Streams.TestKit/Akka.Streams.TestKit.csproj

@@ -13,7 +13,6 @@
   <ItemGroup>
     <ProjectReference Include="..\Akka.Streams\Akka.Streams.csproj" />
     <ProjectReference Include="..\Akka.TestKit\Akka.TestKit.csproj" />
-    <ProjectReference Include="..\Akka.Tests.Shared.Internals\Akka.Tests.Shared.Internals.csproj" />
   </ItemGroup>
 
   <ItemGroup>

src/core/Akka.Streams.TestKit/SubscriberFluentBuilder.cs

@@ -8,12 +8,12 @@
 #nullable enable
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.Runtime.CompilerServices;
 using System.Threading;
 using System.Threading.Tasks;
 using Akka.TestKit;
 using Reactive.Streams;
-using Xunit.Sdk;
 using static Akka.Streams.TestKit.TestSubscriber;
 
 namespace Akka.Streams.TestKit
@@ -411,7 +411,10 @@ public SubscriberFluentBuilder<T> RequestNextN(params T[] elements)
                     var next = await probe.ExpectNextAsync(ct);
                     if (Comparer<T>.Default.Compare(elements[i], next) != 0)
                     {
-                        throw new CollectionException(elements, elements.Length, i + 1, i);
+                        throw new Exception(string.Format(
+                            CultureInfo.CurrentCulture,
+                            "Collection Comparison Failure{3}Error during comparison of item at index {0}. Expected: {1}, found: {2}",
+                            i, elements[i], next, Environment.NewLine));
                     }
                 }
             });

src/core/Akka.Streams.TestKit/TestSubscriber_Shared.cs

@@ -15,7 +15,6 @@
 using System.Threading.Tasks;
 using Akka.TestKit;
 using Reactive.Streams;
-using Xunit.Sdk;
 
 namespace Akka.Streams.TestKit
 {

src/core/Akka.Streams.TestKit/Utils.cs

@@ -16,6 +16,7 @@
 using Akka.TestKit;
 using Akka.TestKit.Extensions;
 using Akka.Util.Internal;
+using FluentAssertions;
 using FluentAssertions.Extensions;
 
 namespace Akka.Streams.TestKit
@@ -26,7 +27,7 @@ public static class Utils
             ConfigurationFactory.ParseString(@"akka.actor.default-mailbox.mailbox-type = ""Akka.Dispatch.UnboundedMailbox, Akka""");
 
         public static void AssertAllStagesStopped(
-            this AkkaSpec spec,
+            this TestKitBase spec,
             Action block,
             IMaterializer materializer,
             TimeSpan? timeout = null,
@@ -39,7 +40,7 @@ public static void AssertAllStagesStopped(
                 .ConfigureAwait(false).GetAwaiter().GetResult();
 
         public static T AssertAllStagesStopped<T>(
-            this AkkaSpec spec,
+            this TestKitBase spec,
             Func<T> block,
             IMaterializer materializer,
             TimeSpan? timeout = null,
@@ -48,7 +49,7 @@ public static T AssertAllStagesStopped<T>(
                 .ConfigureAwait(false).GetAwaiter().GetResult();
 
         public static async Task AssertAllStagesStoppedAsync(
-            this AkkaSpec spec,
+            this TestKitBase spec,
             Func<Task> block,
             IMaterializer materializer,
             TimeSpan? timeout = null,
@@ -61,7 +62,7 @@ public static async Task AssertAllStagesStoppedAsync(
                 .ConfigureAwait(false);
 
         public static async Task<T> AssertAllStagesStoppedAsync<T>(
-            this AkkaSpec spec,
+            this TestKitBase spec,
             Func<Task<T>> block, 
             IMaterializer materializer,
             TimeSpan? timeout = null,
@@ -117,7 +118,7 @@ public static void AssertDispatcher(IActorRef @ref, string dispatcher)
         [Obsolete("Use ShouldCompleteWithin instead")]
         public static T AwaitResult<T>(this Task<T> task, TimeSpan? timeout = null)
         {
-            task.Wait(timeout??TimeSpan.FromSeconds(3)).ShouldBeTrue();
+            task.Wait(timeout??TimeSpan.FromSeconds(3)).Should().BeTrue();
             return task.Result;
         }
     }

src/core/Akka.Streams.TestKit/BaseTwoStreamsSetup.cs → src/core/Akka.Streams.Tests/BaseTwoStreamsSetup.cs

@@ -9,13 +9,14 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using Akka.Streams.Dsl;
+using Akka.Streams.TestKit;
 using Akka.TestKit;
 using FluentAssertions;
 using Reactive.Streams;
 using Xunit;
 using Xunit.Abstractions;
 
-namespace Akka.Streams.TestKit
+namespace Akka.Streams.Tests
 {
     public abstract class BaseTwoStreamsSetup<TOutputs> : AkkaSpec
     {

src/core/Akka.Streams.TestKit/ScriptedTest.cs → src/core/Akka.Streams.Tests/ScriptedTest.cs

@@ -14,15 +14,15 @@
 using Akka.Actor;
 using Akka.Configuration;
 using Akka.Streams.Dsl;
+using Akka.Streams.TestKit;
 using Akka.TestKit;
 using Akka.TestKit.Extensions;
 using Akka.Util;
-using Akka.Util.Internal;
 using FluentAssertions.Extensions;
 using Reactive.Streams;
 using Xunit.Abstractions;
 
-namespace Akka.Streams.TestKit
+namespace Akka.Streams.Tests
 {
     [Serializable]
     public class ScriptException : Exception

src/core/Akka.Streams.TestKit/TwoStreamsSetup.cs → src/core/Akka.Streams.Tests/TwoStreamsSetup.cs

@@ -6,10 +6,11 @@
 //-----------------------------------------------------------------------
 
 using Akka.Streams.Dsl;
+using Akka.Streams.TestKit;
 using Reactive.Streams;
 using Xunit.Abstractions;
 
-namespace Akka.Streams.TestKit
+namespace Akka.Streams.Tests
 {
     public abstract class TwoStreamsSetup<TOutputs> : BaseTwoStreamsSetup<TOutputs>
     {