From 1a171e73164c1b4d9884ac6b2cb78db06c43c063 Mon Sep 17 00:00:00 2001 From: Lukas Kurz Date: Sat, 4 Jan 2025 14:53:43 +0100 Subject: [PATCH] Remove `TestUtils` again --- .../TestUtils.cs | 13 ------------- .../Transports/Network/NetworkTransport.cs | 4 ++-- .../E2E/End2EndTest.cs | 2 -- 3 files changed, 2 insertions(+), 17 deletions(-) delete mode 100644 lib/ShortDev.Microsoft.ConnectedDevices/TestUtils.cs diff --git a/lib/ShortDev.Microsoft.ConnectedDevices/TestUtils.cs b/lib/ShortDev.Microsoft.ConnectedDevices/TestUtils.cs deleted file mode 100644 index 3a2035b3..00000000 --- a/lib/ShortDev.Microsoft.ConnectedDevices/TestUtils.cs +++ /dev/null @@ -1,13 +0,0 @@ -using System.Net; - -namespace ShortDev.Microsoft.ConnectedDevices; - -internal sealed class TestUtils -{ - public static IPAddress ListenAddress { get; private set; } = IPAddress.Any; - - internal static void ListenLocalOnly() - { - ListenAddress = IPAddress.Loopback; - } -} diff --git a/lib/ShortDev.Microsoft.ConnectedDevices/Transports/Network/NetworkTransport.cs b/lib/ShortDev.Microsoft.ConnectedDevices/Transports/Network/NetworkTransport.cs index 3faaaf8e..a299ba29 100644 --- a/lib/ShortDev.Microsoft.ConnectedDevices/Transports/Network/NetworkTransport.cs +++ b/lib/ShortDev.Microsoft.ConnectedDevices/Transports/Network/NetworkTransport.cs @@ -24,7 +24,7 @@ public EndpointInfo GetEndpoint() public event DeviceConnectedEventHandler? DeviceConnected; public async Task Listen(CancellationToken cancellationToken) { - var listener = _listener ??= new(TestUtils.ListenAddress, TcpPort); + var listener = _listener ??= new(IPAddress.Any, TcpPort); listener.Start(); try @@ -88,7 +88,7 @@ static UdpClient CreateUdpClient(int port) } client.Client.SetSocketOption(SocketOptionLevel.Socket, SocketOptionName.ReuseAddress, true); - client.Client.Bind(new IPEndPoint(TestUtils.ListenAddress, port)); + client.Client.Bind(new IPEndPoint(IPAddress.Any, port)); return client; } diff --git a/tests/ShortDev.Microsoft.ConnectedDevices.Test/E2E/End2EndTest.cs b/tests/ShortDev.Microsoft.ConnectedDevices.Test/E2E/End2EndTest.cs index 7ca2751d..b0666382 100644 --- a/tests/ShortDev.Microsoft.ConnectedDevices.Test/E2E/End2EndTest.cs +++ b/tests/ShortDev.Microsoft.ConnectedDevices.Test/E2E/End2EndTest.cs @@ -36,8 +36,6 @@ ConnectedDevicesPlatform CreateDevice(DeviceContainer network, string name, stri static void UseTcp(ConnectedDevicesPlatform cdp, int tcpPort, int udpPort) { - TestUtils.ListenLocalOnly(); - NetworkHandler networkHandler = new(IPAddress.Loopback); NetworkTransport networkTransport = new(networkHandler, tcpPort, udpPort); cdp.AddTransport(networkTransport);