Fix tests on non-windows

cyanfish · Jan 12, 2024 · f4f782a · f4f782a
1 parent 6b17c5e
commit f4f782a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/NAPS2.Escl.Tests/ClientServerTests.cs b/NAPS2.Escl.Tests/ClientServerTests.cs
@@ -30,7 +30,7 @@ public async Task ClientServer()
         {
             IpV4 = IPAddress.Loopback,
             IpV6 = IPAddress.IPv6Loopback,
-            Host = IPAddress.IPv6Loopback.ToString(),
+            Host = $"[{IPAddress.IPv6Loopback}]",
             RemoteEndpoint = IPAddress.IPv6Loopback,
             Port = deviceConfig.Port,
             RootUrl = "eSCL",

diff --git a/NAPS2.Lib.Tests/Automation/CommandLineIntegrationTests.cs b/NAPS2.Lib.Tests/Automation/CommandLineIntegrationTests.cs
@@ -1074,7 +1074,7 @@ await _automationHelper.RunCommand(
                 BitDepth = ConsoleBitDepth.Gray,
                 Dpi = 300,
                 PageSize = "a4",
-                Driver = "twain",
+                Driver = "escl",
                 Device = "name1",
                 OutputPath = $"{FolderPath}/test.jpg",
                 Verbose = true
@@ -1087,7 +1087,7 @@ await _automationHelper.RunCommand(
                 options.BitDepth == BitDepth.Grayscale &&
                 options.Dpi == 300 &&
                 options.PageSize == PageSize.A4 &&
-                options.Driver == Driver.Twain &&
+                options.Driver == Driver.Escl &&
                 options.Device.Name == "test_name1"),
             Arg.Any<CancellationToken>(),
             Arg.Any<IScanEvents>(),
@@ -1100,7 +1100,7 @@ public async Task ListDevices()
     {
         var (_, scanDriverFactoryMock) = CreateDriverMocks();
 
-        var outputWriter = new StringWriter();
+        var outputWriter = new StringWriter { NewLine = "\n" };
         await _automationHelper.WithContainerBuilder(container =>
         {
             container.RegisterInstance(new ConsoleOutput(outputWriter));
@@ -1110,7 +1110,7 @@ await _automationHelper.WithContainerBuilder(container =>
                 ListDevices = true
             }, scanDriverFactoryMock);
 
-        Assert.Equal("test_name1\r\ntest_name2\r\n", outputWriter.ToString());
+        Assert.Equal("test_name1\ntest_name2\n", outputWriter.ToString());
         AssertRecoveryCleanedUp();
     }
 

diff --git a/NAPS2.Sdk.Tests/Scan/ScanErrorHandling.cs b/NAPS2.Sdk.Tests/Scan/ScanErrorHandling.cs
@@ -45,7 +45,7 @@ public async void Scan_CreateScanBridge()
 
         bridgeFactory.When(factory => factory.Create(Arg.Any<ScanOptions>()))
             .Do(_ => throw new InvalidOperationException());
-        var source = controller.Scan(new ScanOptions { Device = new ScanDevice(Driver.Wia, "foo", "bar") });
+        var source = controller.Scan(new ScanOptions { Device = new ScanDevice(Driver.Default, "foo", "bar") });
         await Assert.ThrowsAsync<InvalidOperationException>(async () => await source.ToListAsync());
     }
 
@@ -91,7 +91,7 @@ public async void Scan_LocalPostProcess()
         localPostProcessor.When(pp =>
                 pp.PostProcess(Arg.Any<ProcessedImage>(), Arg.Any<ScanOptions>(), Arg.Any<PostProcessingContext>()))
             .Do(_ => throw new InvalidOperationException());
-        var source = controller.Scan(new ScanOptions { Device = new ScanDevice(Driver.Wia, "foo", "bar") });
+        var source = controller.Scan(new ScanOptions { Device = new ScanDevice(Driver.Default, "foo", "bar") });
         await Assert.ThrowsAsync<InvalidOperationException>(async () => await source.ToListAsync());
     }
 
@@ -106,7 +106,7 @@ public async void Scan_BridgeScan()
                 bridgeFactory);
 
         bridgeFactory.Create(Arg.Any<ScanOptions>()).Returns(bridge);
-        var source = controller.Scan(new ScanOptions { Device = new ScanDevice(Driver.Wia, "foo", "bar") });
+        var source = controller.Scan(new ScanOptions { Device = new ScanDevice(Driver.Default, "foo", "bar") });
         await Assert.ThrowsAsync<InvalidOperationException>(async () => await source.ToListAsync());
     }