Address review feedback for regression tests

Author: marcschier

Tests/Opc.Ua.Client.Tests/Session/ManagedSessionTests.cs

@@ -382,18 +382,30 @@ public async Task CreateAsyncCancellationStopsStartedConnectAttemptAsync()
                 connectGate: gate,
                 ct: cancellation.Token);
 
-            await gate.Started.ConfigureAwait(false);
+            Task startedTask = await Task.WhenAny(
+                    gate.Started,
+                    Task.Delay(TimeSpan.FromSeconds(5)))
+                .ConfigureAwait(false);
+            Assert.That(startedTask, Is.SameAs(gate.Started));
+
             cancellation.Cancel();
 
+            Task completedTask = await Task.WhenAny(
+                    creation,
+                    Task.Delay(TimeSpan.FromSeconds(5)))
+                .ConfigureAwait(false);
+            Assert.That(completedTask, Is.SameAs(creation));
+
             OperationCanceledException exception =
                 Assert.CatchAsync<OperationCanceledException>(async () =>
                     await creation.ConfigureAwait(false))!;
             Assert.That(exception.CancellationToken, Is.EqualTo(cancellation.Token));
 
-            Task completed = await Task.WhenAny(
-                gate.Stopped,
-                Task.Delay(TimeSpan.FromSeconds(5))).ConfigureAwait(false);
-            Assert.That(completed, Is.SameAs(gate.Stopped));
+            Task stoppedTask = await Task.WhenAny(
+                    gate.Stopped,
+                    Task.Delay(TimeSpan.FromSeconds(5)))
+                .ConfigureAwait(false);
+            Assert.That(stoppedTask, Is.SameAs(gate.Stopped));
         }
 
         [Test]
@@ -709,7 +721,8 @@ public async ValueTask<IDisposable> AcquireAsync(
                     m_stopped.TrySetResult(null);
                 }
 
-                return new EmptyLease();
+                throw new InvalidOperationException(
+                    "The blocking connect gate unexpectedly completed without cancellation.");
             }
 
             private readonly TaskCompletionSource<object?> m_started =
@@ -718,13 +731,6 @@ public async ValueTask<IDisposable> AcquireAsync(
                 new(TaskCreationOptions.RunContinuationsAsynchronously);
         }
 
-        private sealed class EmptyLease : IDisposable
-        {
-            public void Dispose()
-            {
-            }
-        }
-
 #pragma warning disable IDE0051, RCS1213 // Test scaffold kept for ManagedSession construction tests.
         private static ApplicationConfiguration CreateClientConfiguration(
             ITelemetryContext telemetry)

Tests/Opc.Ua.SourceGeneration.Tests/ModelGeneratorTests.cs

@@ -162,10 +162,13 @@ public void GenerateAndCompileIsa95JobControlNodeSet2Test(
 
             GeneratorRunResult generatorResult = GenerateAndCompile(driver, compilation);
 
-            string generatedSources = string.Join(
-                "\n",
-                generatorResult.GeneratedSources.Select(source => source.SourceText.ToString()));
-            Assert.That(generatedSources, Does.Contain("ISA95JobOrderDataType"));
+            GeneratedSourceResult dataTypesSource = generatorResult.GeneratedSources.Single(
+                source => source.HintName.EndsWith(
+                    ".DataTypes.g.cs",
+                    StringComparison.Ordinal));
+            Assert.That(
+                dataTypesSource.SourceText.ToString(),
+                Does.Contain("ISA95JobOrderDataType"));
         }
 
         [Test]