mirror of
https://github.com/OPCFoundation/UA-.NETStandard.git
synced 2026-10-28 22:55:49 +08:00
# Description
Pure code-style sweep across the repo — no behavioral changes. Drives
`dotnet format` info-level diagnostics down on a large slice of the
codebase (Stack, Libraries, Tests, Tools).
Six commits, applied bottom-up in safety order so each batch leaves the
build green:
1. **`style: fix whitespace and final-newline formatting (WHITESPACE,
FINALNEWLINE)`**
197 hits across ~30 files; pure mechanical cleanup.
2. **`style: apply dotnet format style fixes (IDE rules)`**
IDE-rule batch via `dotnet format style --severity info` —
`var`/explicit type, simplify names, collection expressions, expression
bodies, unused usings, etc.
3. **`style: apply dotnet format analyzers fixes (RCS blank-line
formatting)`**
Roslynator formatting (RCS0xxx) blank-line and punctuation rules.
4. **`style: convert comments to doc comments and inline local vars
(RCS1181, RCS1124)`**
24 files. RCS1181 promotes `// summary`-style comments above
public/internal members to `/// <summary>` doc comments; RCS1124 inlines
locals used exactly once. Generated `Tools/` files were reverted to keep
the source-generator outputs deterministic.
5. **`docs(agent): correct --diagnostics flag form and verify Roslynator
4.x code fixers`**
Updates `.github/agents/opc-ua-codestyle-enforcer.agent.md` with two
corrections discovered while running this sweep:
- `dotnet format --diagnostics "RULE1 RULE2"` (single quoted,
space-separated) silently fixes nothing on `dotnet format` 10.x — it
parses as one unknown ID and exits 0. The correct form is `--diagnostics
RULE1 --diagnostics RULE2 …`, repeated per rule.
- Roslynator 4.15.0 **does** ship code fixers for
RCS1078/1118/1124/1140/1142/1181/1221/1260 (the previous "no auto-fixer"
list was outdated). RCS1140/1142 default to `Hidden` so need `--severity
info` to surface and fire; RCS1078 requires
`roslynator_empty_string_style = field` (already set in
`.editorconfig`). Only NUnit4002/2046/2010 genuinely lack auto-fixers in
this stack.
6. **`style: format new code from master merge (dotnet format sweep)`**
After merging master into the branch (commit `e3ebc8742`), re-ran the
same three-phase format sweep on the 151 .cs files brought in by the
merge, scoped per project via repeated `--include`. 81 files changed;
same rule families as commits 1–4.
- Hand-fixed `Tests/Opc.Ua.MigrationAnalyzer.Tests/AnalyzerHarness.cs`
for `RCS1174` (redundant `async`/`await` removal) because the auto-fixer
didn't apply for that specific case.
- Reverted files that the formatter would break:
- `Libraries/Opc.Ua.Server/Server/ServerInternalData.cs` — multi-TFM
analysis disagreement injected `<<<<<<<` / `=======` / `>>>>>>>`
markers.
-
`Tools/Opc.Ua.MigrationAnalyzer.Core/{Core/Stack/Client/ChannelBase.cs,
Core/Stack/Types/IUserIdentityTokenHandler.cs,
Client/Session/Session.cs}` — IDE0005 removed `using
Opc.Ua.Security.Certificates` that IS used (the files are 1.5.378
reference fixtures for the analyzer).
- `Tests/Opc.Ua.Gds.Tests/PushTest.cs` — IDE0002 over-simplified
`OpcUa.ObjectTypeIds` to `ObjectTypeIds`, which then resolves to a
conflicting type.
### What this PR does **not** touch
- No behavioral or semantic logic changes.
- No `.editorconfig` rule promotions (rules stay at their current
severities; this is a backlog-burndown pass, not a rule tightening).
- Generated source under `Tools/` is intentionally excluded.
- Higher-risk rule families (`RCS1090`/`CA2007` `ConfigureAwait`,
`RCS1249` null-forgiving cleanup, `IDE0270`/`IDE0059`) are left for
follow-up sweeps because they need per-TFM build verification or
semantic review.
## Related Issues
_No tracking issue — this is a non-functional style sweep and the
agent-doc correction is a follow-up to the same work. Happy to open one
if the maintainers prefer._
## Checklist
- [ ] I have signed the
[CLA](https://opcfoundation.org/license/cla/ContributorLicenseAgreementv1.0.pdf)
and read the
[CONTRIBUTING](https://github.com/OPCFoundation/UA-.NETStandard/blob/master/CONTRIBUTING.md)
doc.
- [x] I have added tests that prove my fix is effective or that my
feature works and increased code coverage. _(N/A — style-only, no
behavioral change)_
- [x] I have added all necessary documentation. _(agent doc updated with
the two corrections)_
- [x] I have verified that my changes do not introduce (new) build or
analyzer warnings. _(verified clean on `net10.0` and `net48`; only
pre-existing `NETSDK1005`/`NETSDK1207` failures on Tools/AOT projects)_
- [ ] I ran **all** tests locally using the **UA.slnx** solution against
at least .net **framework** and .net **10**, and all passed. _(build
verified on net10 and net48 per batch; full test suite not yet run
locally — relying on CI)_
- [ ] I fixed **all** failing and flaky tests in the CI pipelines and
**all** CodeQL warnings.
- [ ] I have addressed **all** PR feedback received.
---------
Co-authored-by: agent <agent@local>
669 lines
27 KiB
C#
669 lines
27 KiB
C#
/* ========================================================================
|
|
* Copyright (c) 2005-2025 The OPC Foundation, Inc. All rights reserved.
|
|
*
|
|
* OPC Foundation MIT License 1.00
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person
|
|
* obtaining a copy of this software and associated documentation
|
|
* files (the "Software"), to deal in the Software without
|
|
* restriction, including without limitation the rights to use,
|
|
* copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
* copies of the Software, and to permit persons to whom the
|
|
* Software is furnished to do so, subject to the following
|
|
* conditions:
|
|
*
|
|
* The above copyright notice and this permission notice shall be
|
|
* included in all copies or substantial portions of the Software.
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
|
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
|
|
* OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
|
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
|
|
* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
|
|
* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
|
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
|
|
* OTHER DEALINGS IN THE SOFTWARE.
|
|
*
|
|
* The complete license agreement can be found here:
|
|
* http://opcfoundation.org/License/MIT/1.00/
|
|
* ======================================================================*/
|
|
|
|
// CA2000: test code; many disposables are ownership-transferred to test fixtures or short-lived,
|
|
// making CA2000 noisy without a real leak risk. Disabled file-level for the suite.
|
|
#pragma warning disable CA2000
|
|
using System;
|
|
using System.Diagnostics;
|
|
using System.Linq;
|
|
using System.Threading;
|
|
using System.Threading.Tasks;
|
|
using Microsoft.Extensions.Logging;
|
|
using Microsoft.Extensions.Options;
|
|
using Moq;
|
|
using NUnit.Framework;
|
|
using Opc.Ua.Client.Subscriptions.Fakes;
|
|
using Opc.Ua.Tests;
|
|
|
|
namespace Opc.Ua.Client.Subscriptions
|
|
{
|
|
[TestFixture]
|
|
[Category("Client")]
|
|
[Category("SubscriptionManager")]
|
|
[SetCulture("en-us")]
|
|
[SetUICulture("en-us")]
|
|
public sealed class SubscriptionManagerTests
|
|
{
|
|
[SetUp]
|
|
public void SetUp()
|
|
{
|
|
m_session = new FakeSubscriptionManagerContext();
|
|
m_telemetry = NUnitTelemetryContext.Create();
|
|
m_mockNotificationDataHandler = new Mock<ISubscriptionNotificationHandler>();
|
|
m_subscriptionManager = new SubscriptionManager(
|
|
m_session, m_telemetry.LoggerFactory, DiagnosticsMasks.All);
|
|
}
|
|
|
|
[TearDown]
|
|
public void TearDown()
|
|
{
|
|
m_subscriptionManager.DisposeAsync().AsTask().GetAwaiter().GetResult();
|
|
}
|
|
|
|
[Test]
|
|
public async Task AddAndRemoveOfSubscription1Async()
|
|
{
|
|
ILoggerFactory loggerFactory = m_telemetry.LoggerFactory;
|
|
var session = new FakeSubscriptionManagerContext();
|
|
OptionsMonitor<SubscriptionOptions> so1 = OptionsFactory.Create<SubscriptionOptions>();
|
|
OptionsMonitor<SubscriptionOptions> so2 = OptionsFactory.Create<SubscriptionOptions>();
|
|
|
|
var ms1 = new FakeManagedSubscription { Id = 1 };
|
|
var ms2 = new FakeManagedSubscription { Id = 2 };
|
|
|
|
var sut = new SubscriptionManager(session,
|
|
loggerFactory, DiagnosticsMasks.None);
|
|
|
|
session.CreateSubscriptionFactory = (handler, options, queue) =>
|
|
{
|
|
Assert.That(queue, Is.SameAs(sut));
|
|
if (ReferenceEquals(options, so1))
|
|
{
|
|
return ms1;
|
|
}
|
|
if (ReferenceEquals(options, so2))
|
|
{
|
|
return ms2;
|
|
}
|
|
throw new InvalidOperationException("unexpected options");
|
|
};
|
|
|
|
Assert.That(sut.PublishWorkerCount, Is.Zero);
|
|
|
|
// Test adding and removing a subscription from
|
|
ISubscription s1 = sut.Add(m_mockNotificationDataHandler.Object, so1);
|
|
ISubscription s2 = sut.Add(m_mockNotificationDataHandler.Object, so2);
|
|
Assert.That(sut.Count, Is.EqualTo(2));
|
|
|
|
ServiceResultException ex = Assert.Throws<ServiceResultException>(() => sut.Add(m_mockNotificationDataHandler.Object, so2));
|
|
Assert.That(ex.StatusCode, Is.EqualTo(StatusCodes.BadAlreadyExists));
|
|
await Task.Delay(100).ConfigureAwait(false); // Give time to workers to start
|
|
Assert.That(sut.PublishWorkerCount, Is.Zero);
|
|
await sut.CompleteAsync(1, default).ConfigureAwait(false);
|
|
Assert.That(sut.Count, Is.EqualTo(1));
|
|
Assert.That(sut.Items, Does.Contain(s2));
|
|
|
|
Assert.That(sut.PublishControlCycles, Is.GreaterThan(0));
|
|
await sut.DisposeAsync().ConfigureAwait(false);
|
|
Assert.That(sut.Count, Is.Zero);
|
|
Assert.That(sut.PublishWorkerCount, Is.Zero);
|
|
// Verify the so1 subscription was created exactly once.
|
|
Assert.That(session.CreateSubscriptionCalls
|
|
.Count(c => ReferenceEquals(c.Options, so1)), Is.EqualTo(1));
|
|
}
|
|
|
|
[Test]
|
|
public async Task AddAndRemoveOfSubscription2Async()
|
|
{
|
|
ILoggerFactory loggerFactory = m_telemetry.LoggerFactory;
|
|
var session = new FakeSubscriptionManagerContext();
|
|
OptionsMonitor<SubscriptionOptions> so1 = OptionsFactory.Create<SubscriptionOptions>();
|
|
OptionsMonitor<SubscriptionOptions> so2 = OptionsFactory.Create<SubscriptionOptions>();
|
|
|
|
var ms1 = new FakeManagedSubscription { Id = 1 };
|
|
var ms2 = new FakeManagedSubscription { Id = 2 };
|
|
|
|
var sut = new SubscriptionManager(session,
|
|
loggerFactory, DiagnosticsMasks.None);
|
|
|
|
session.CreateSubscriptionFactory = (handler, options, queue) =>
|
|
{
|
|
Assert.That(queue, Is.SameAs(sut));
|
|
if (ReferenceEquals(options, so1))
|
|
{
|
|
return ms1;
|
|
}
|
|
if (ReferenceEquals(options, so2))
|
|
{
|
|
return ms2;
|
|
}
|
|
throw new InvalidOperationException("unexpected options");
|
|
};
|
|
|
|
Assert.That(sut.PublishWorkerCount, Is.Zero);
|
|
|
|
// Test adding and removing a subscription from
|
|
ISubscription s1 = sut.Add(m_mockNotificationDataHandler.Object, so1);
|
|
ISubscription s2 = sut.Add(m_mockNotificationDataHandler.Object, so2);
|
|
Assert.That(sut.Count, Is.EqualTo(2));
|
|
|
|
ms1.Created = true;
|
|
sut.Update();
|
|
// Wait for the worker controller to spin up workers. CreatedCount=1
|
|
// but MinPublishWorkerCount defaults to 2, so the desired count is 2.
|
|
await WaitForPublishWorkerCountAsync(sut, 2).ConfigureAwait(false);
|
|
|
|
await sut.CompleteAsync(2, default).ConfigureAwait(false); // Remove s2
|
|
Assert.That(sut.Count, Is.EqualTo(1));
|
|
Assert.That(sut.Items, Does.Not.Contain(s2));
|
|
|
|
// Workers stay at 2 because MinPublishWorkerCount=2 (default).
|
|
Assert.That(sut.PublishWorkerCount, Is.EqualTo(2));
|
|
Assert.That(sut.PublishControlCycles, Is.GreaterThan(0));
|
|
|
|
await sut.CompleteAsync(1, default).ConfigureAwait(false); // Remove s1
|
|
Assert.That(sut.Count, Is.Zero);
|
|
Assert.That(sut.Items, Does.Not.Contain(s1));
|
|
|
|
await WaitForPublishWorkerCountAsync(sut, 0).ConfigureAwait(false);
|
|
|
|
await sut.DisposeAsync().ConfigureAwait(false);
|
|
Assert.That(sut.Count, Is.Zero);
|
|
Assert.That(sut.PublishWorkerCount, Is.Zero);
|
|
}
|
|
|
|
[Test]
|
|
public async Task ScaleOutAndInOfPublishWorkersAsync()
|
|
{
|
|
ILoggerFactory loggerFactory = m_telemetry.LoggerFactory;
|
|
var session = new FakeSubscriptionManagerContext();
|
|
OptionsMonitor<SubscriptionOptions> so1 = OptionsFactory.Create<SubscriptionOptions>();
|
|
OptionsMonitor<SubscriptionOptions> so2 = OptionsFactory.Create<SubscriptionOptions>();
|
|
|
|
var ms1 = new FakeManagedSubscription { Id = 1 };
|
|
var ms2 = new FakeManagedSubscription { Id = 2 };
|
|
|
|
var sut = new SubscriptionManager(session,
|
|
loggerFactory, DiagnosticsMasks.None);
|
|
|
|
session.CreateSubscriptionFactory = (handler, options, queue) =>
|
|
{
|
|
Assert.That(queue, Is.SameAs(sut));
|
|
if (ReferenceEquals(options, so1))
|
|
{
|
|
return ms1;
|
|
}
|
|
if (ReferenceEquals(options, so2))
|
|
{
|
|
return ms2;
|
|
}
|
|
throw new InvalidOperationException("unexpected options");
|
|
};
|
|
|
|
Assert.That(sut.PublishWorkerCount, Is.Zero);
|
|
|
|
// Test adding and removing a subscription from
|
|
ISubscription s1 = sut.Add(m_mockNotificationDataHandler.Object, so1);
|
|
ISubscription s2 = sut.Add(m_mockNotificationDataHandler.Object, so2);
|
|
Assert.That(sut.Count, Is.EqualTo(2));
|
|
|
|
sut.MinPublishWorkerCount = 0;
|
|
ms1.Created = true;
|
|
sut.Update();
|
|
await WaitForPublishWorkerCountAsync(sut, 1).ConfigureAwait(false);
|
|
|
|
sut.MinPublishWorkerCount = 8;
|
|
ms2.Created = true;
|
|
sut.Update();
|
|
await WaitForPublishWorkerCountAsync(sut, 8).ConfigureAwait(false);
|
|
|
|
sut.MinPublishWorkerCount = 4;
|
|
sut.Update();
|
|
await WaitForPublishWorkerCountAsync(sut, 4).ConfigureAwait(false);
|
|
|
|
sut.MinPublishWorkerCount = 0;
|
|
sut.Update();
|
|
await WaitForPublishWorkerCountAsync(sut, 2).ConfigureAwait(false);
|
|
|
|
sut.MinPublishWorkerCount = 0;
|
|
sut.MaxPublishWorkerCount = 1;
|
|
sut.Update();
|
|
await WaitForPublishWorkerCountAsync(sut, 1).ConfigureAwait(false);
|
|
|
|
await sut.DisposeAsync().ConfigureAwait(false);
|
|
Assert.That(sut.Count, Is.Zero);
|
|
Assert.That(sut.PublishWorkerCount, Is.Zero);
|
|
|
|
// Each subscription was created exactly once.
|
|
Assert.That(session.CreateSubscriptionCalls
|
|
.Count(c => ReferenceEquals(c.Options, so1)), Is.EqualTo(1));
|
|
Assert.That(session.CreateSubscriptionCalls
|
|
.Count(c => ReferenceEquals(c.Options, so2)), Is.EqualTo(1));
|
|
}
|
|
|
|
[Test]
|
|
public async Task SendPublishRequestsWithSuccessAsync()
|
|
{
|
|
ILoggerFactory loggerFactory = m_telemetry.LoggerFactory;
|
|
var session = new FakeSubscriptionManagerContext();
|
|
OptionsMonitor<SubscriptionOptions> so1 = OptionsFactory.Create<SubscriptionOptions>();
|
|
var ms1 = new FakeManagedSubscription { Id = 1, Created = true };
|
|
var sut = new SubscriptionManager(session,
|
|
loggerFactory, DiagnosticsMasks.None);
|
|
session.CreateSubscriptionFactory = (handler, options, queue) =>
|
|
{
|
|
Assert.That(ReferenceEquals(options, so1), Is.True);
|
|
Assert.That(queue, Is.SameAs(sut));
|
|
return ms1;
|
|
};
|
|
// Test adding subscription
|
|
ISubscription s1 = sut.Add(m_mockNotificationDataHandler.Object, so1);
|
|
Assert.That(sut.Count, Is.EqualTo(1));
|
|
sut.MaxPublishWorkerCount = 1;
|
|
|
|
// Ack received immediately
|
|
ms1.OnPublishReceivedAsyncFunc = (n, _, _) =>
|
|
sut.QueueAsync(new SubscriptionAcknowledgement
|
|
{
|
|
SubscriptionId = 1,
|
|
SequenceNumber = n.SequenceNumber
|
|
}, default);
|
|
|
|
session.OnPublishAsync = (h, s, ct) =>
|
|
new ValueTask<PublishResponse>(new PublishResponse
|
|
{
|
|
AvailableSequenceNumbers = [],
|
|
NotificationMessage = new NotificationMessage
|
|
{
|
|
SequenceNumber = h.RequestHandle
|
|
},
|
|
Results = s.ConvertAll(_ => StatusCodes.Good),
|
|
SubscriptionId = 1,
|
|
MoreNotifications = false,
|
|
ResponseHeader = new ResponseHeader
|
|
{
|
|
ServiceResult = StatusCodes.Good,
|
|
StringTable = []
|
|
}
|
|
});
|
|
|
|
sut.Resume();
|
|
await Task.Delay(1000).ConfigureAwait(false);
|
|
|
|
await sut.DisposeAsync().ConfigureAwait(false);
|
|
Assert.That(sut.Count, Is.Zero);
|
|
Assert.That(sut.PublishWorkerCount, Is.Zero);
|
|
// The so1 subscription was created exactly once.
|
|
Assert.That(session.CreateSubscriptionCalls
|
|
.Count(c => ReferenceEquals(c.Options, so1)), Is.EqualTo(1));
|
|
}
|
|
|
|
[Test]
|
|
public void TransferSubscriptionsOnRecreateSetAndGet()
|
|
{
|
|
m_subscriptionManager.TransferSubscriptionsOnRecreate = true;
|
|
Assert.That(m_subscriptionManager.TransferSubscriptionsOnRecreate, Is.True);
|
|
}
|
|
|
|
[Test]
|
|
public void ReturnDiagnosticsSetAndGet()
|
|
{
|
|
m_subscriptionManager.ReturnDiagnostics = DiagnosticsMasks.All;
|
|
Assert.That(m_subscriptionManager.ReturnDiagnostics, Is.EqualTo(DiagnosticsMasks.All));
|
|
}
|
|
|
|
[Test]
|
|
public void MinPublishWorkerCountSetAndGet()
|
|
{
|
|
m_subscriptionManager.MinPublishWorkerCount = 5;
|
|
Assert.That(m_subscriptionManager.MinPublishWorkerCount, Is.EqualTo(5));
|
|
}
|
|
|
|
[Test]
|
|
public void MaxPublishWorkerCountSetAndGet()
|
|
{
|
|
m_subscriptionManager.MaxPublishWorkerCount = 10;
|
|
Assert.That(m_subscriptionManager.MaxPublishWorkerCount, Is.EqualTo(10));
|
|
}
|
|
|
|
[Test]
|
|
public void ItemsReturnsSubscriptions()
|
|
{
|
|
var mockSubscription = new FakeManagedSubscription();
|
|
m_session.CreateSubscriptionFactory =
|
|
(handler, options, queue) => mockSubscription;
|
|
|
|
m_subscriptionManager.Add(m_mockNotificationDataHandler.Object,
|
|
Mock.Of<IOptionsMonitor<SubscriptionOptions>>());
|
|
Assert.That(m_subscriptionManager.Items, Has.Exactly(1).Items);
|
|
}
|
|
|
|
[Test]
|
|
public void CountReturnsSubscriptionCount()
|
|
{
|
|
var mockSubscription = new FakeManagedSubscription();
|
|
m_session.CreateSubscriptionFactory =
|
|
(handler, options, queue) => mockSubscription;
|
|
|
|
m_subscriptionManager.Add(m_mockNotificationDataHandler.Object,
|
|
Mock.Of<IOptionsMonitor<SubscriptionOptions>>());
|
|
Assert.That(m_subscriptionManager.Count, Is.EqualTo(1));
|
|
}
|
|
|
|
[Test]
|
|
public void GoodPublishRequestCountReturnsCount()
|
|
{
|
|
Assert.That(m_subscriptionManager.GoodPublishRequestCount, Is.Zero);
|
|
}
|
|
|
|
[Test]
|
|
public void BadPublishRequestCountReturnsCount()
|
|
{
|
|
Assert.That(m_subscriptionManager.BadPublishRequestCount, Is.Zero);
|
|
}
|
|
|
|
[Test]
|
|
public void PublishWorkerCountReturnsCount()
|
|
{
|
|
Assert.That(m_subscriptionManager.PublishWorkerCount, Is.Zero);
|
|
}
|
|
|
|
[Test]
|
|
public async Task DisposeAsyncDisposesSubscriptionsAsync()
|
|
{
|
|
var mockSubscription = new FakeManagedSubscription();
|
|
m_session.CreateSubscriptionFactory =
|
|
(handler, options, queue) => mockSubscription;
|
|
|
|
m_subscriptionManager.Add(m_mockNotificationDataHandler.Object,
|
|
Mock.Of<IOptionsMonitor<SubscriptionOptions>>());
|
|
await m_subscriptionManager.DisposeAsync().ConfigureAwait(false);
|
|
Assert.That(mockSubscription.DisposeAsyncCalls, Is.EqualTo(1));
|
|
}
|
|
|
|
[Test]
|
|
public void UpdateTriggersPublishController()
|
|
{
|
|
m_subscriptionManager.Update();// No exception means success
|
|
}
|
|
|
|
[Test]
|
|
public async Task QueueAsyncQueuesAcknowledgementAsync()
|
|
{
|
|
var ack = new SubscriptionAcknowledgement();
|
|
await m_subscriptionManager.QueueAsync(ack, CancellationToken.None).ConfigureAwait(false);
|
|
// No exception means success
|
|
}
|
|
|
|
[Test]
|
|
public async Task CompleteAsyncCompletesSubscriptionAsync()
|
|
{
|
|
var mockSubscription = new FakeManagedSubscription { Id = 1 };
|
|
m_session.CreateSubscriptionFactory =
|
|
(handler, options, queue) => mockSubscription;
|
|
|
|
m_subscriptionManager.Add(m_mockNotificationDataHandler.Object,
|
|
Mock.Of<IOptionsMonitor<SubscriptionOptions>>());
|
|
await m_subscriptionManager.CompleteAsync(1, CancellationToken.None).ConfigureAwait(false);
|
|
Assert.That(m_subscriptionManager.Items, Is.Empty);
|
|
}
|
|
|
|
[Test]
|
|
public void AddAddsSubscription()
|
|
{
|
|
var mockSubscription = new FakeManagedSubscription();
|
|
m_session.CreateSubscriptionFactory =
|
|
(handler, options, queue) => mockSubscription;
|
|
|
|
ISubscription subscription = m_subscriptionManager.Add(m_mockNotificationDataHandler.Object,
|
|
Mock.Of<IOptionsMonitor<SubscriptionOptions>>());
|
|
|
|
Assert.That(subscription, Is.Not.Null);
|
|
Assert.That(m_subscriptionManager.Items, Has.Exactly(1).Items);
|
|
}
|
|
|
|
[Test]
|
|
public void ResumeResumesSubscriptions()
|
|
{
|
|
m_subscriptionManager.Resume();// No exception means success
|
|
}
|
|
|
|
[Test]
|
|
public void PausePausesSubscriptions()
|
|
{
|
|
m_subscriptionManager.Pause();// No exception means success
|
|
}
|
|
|
|
[Test]
|
|
public async Task RecreateSubscriptionsAsyncRecreatesSubscriptionsAsync()
|
|
{
|
|
var mockSubscription = new FakeManagedSubscription();
|
|
m_session.CreateSubscriptionFactory =
|
|
(handler, options, queue) => mockSubscription;
|
|
|
|
m_subscriptionManager.Add(m_mockNotificationDataHandler.Object, Mock.Of<IOptionsMonitor<SubscriptionOptions>>());
|
|
await m_subscriptionManager.RecreateSubscriptionsAsync(null, CancellationToken.None).ConfigureAwait(false);
|
|
Assert.That(mockSubscription.RecreateAsyncCalls, Is.EqualTo(1));
|
|
}
|
|
|
|
[Test]
|
|
public async Task DrainAsyncReturnsImmediatelyWhenNoPublishesActiveAsync()
|
|
{
|
|
// No worker started — counter is zero — DrainAsync should
|
|
// complete synchronously.
|
|
using var ct = new CancellationTokenSource(TimeSpan.FromSeconds(5));
|
|
await m_subscriptionManager
|
|
.DrainAsync(ct.Token).ConfigureAwait(false);
|
|
}
|
|
|
|
[Test]
|
|
[CancelAfter(30_000)]
|
|
public async Task DrainAsyncWaitsForInFlightPublishToCompleteAsync(
|
|
CancellationToken testCt)
|
|
{
|
|
ILoggerFactory loggerFactory = m_telemetry.LoggerFactory;
|
|
var session = new FakeSubscriptionManagerContext();
|
|
OptionsMonitor<SubscriptionOptions> options =
|
|
OptionsFactory.Create<SubscriptionOptions>();
|
|
var ms1 = new FakeManagedSubscription { Id = 1u, Created = true };
|
|
|
|
var sut = new SubscriptionManager(session,
|
|
loggerFactory, DiagnosticsMasks.None);
|
|
try
|
|
{
|
|
session.CreateSubscriptionFactory = (handler, opts, queue) =>
|
|
{
|
|
Assert.That(ReferenceEquals(opts, options), Is.True);
|
|
Assert.That(queue, Is.SameAs(sut));
|
|
return ms1;
|
|
};
|
|
|
|
// Block the publish call so a worker stays "in flight".
|
|
var publishGate = new TaskCompletionSource<PublishResponse>(
|
|
TaskCreationOptions.RunContinuationsAsynchronously);
|
|
var publishCalled = new TaskCompletionSource<bool>(
|
|
TaskCreationOptions.RunContinuationsAsynchronously);
|
|
|
|
session.OnPublishAsync = (h, a, ct) =>
|
|
{
|
|
publishCalled.TrySetResult(true);
|
|
return new ValueTask<PublishResponse>(publishGate.Task);
|
|
};
|
|
|
|
sut.MaxPublishWorkerCount = 1;
|
|
sut.MinPublishWorkerCount = 1;
|
|
ISubscription _ = sut.Add(
|
|
m_mockNotificationDataHandler.Object, options);
|
|
sut.Resume();
|
|
|
|
// Wait until the worker has called PublishAsync at least
|
|
// once so the active-publish counter is non-zero.
|
|
await publishCalled.Task.WaitAsync(testCt).ConfigureAwait(false);
|
|
|
|
// Pause is soft: it stops *new* publishes from being
|
|
// issued, but the in-flight publish call is still
|
|
// outstanding. Drain must wait for it.
|
|
sut.Pause();
|
|
|
|
using var drainCts = CancellationTokenSource
|
|
.CreateLinkedTokenSource(testCt);
|
|
drainCts.CancelAfter(TimeSpan.FromMilliseconds(300));
|
|
try
|
|
{
|
|
await sut.DrainAsync(drainCts.Token).ConfigureAwait(false);
|
|
Assert.Fail(
|
|
"DrainAsync must not return while a publish is " +
|
|
"in flight; expected OperationCanceledException.");
|
|
}
|
|
catch (OperationCanceledException)
|
|
{
|
|
// expected — drain timed out because the publish is
|
|
// still in flight.
|
|
}
|
|
|
|
// Complete the publish, releasing the worker.
|
|
publishGate.TrySetResult(new PublishResponse
|
|
{
|
|
AvailableSequenceNumbers = [],
|
|
NotificationMessage = new NotificationMessage
|
|
{
|
|
SequenceNumber = 1u
|
|
},
|
|
Results = [],
|
|
SubscriptionId = 1,
|
|
MoreNotifications = false,
|
|
ResponseHeader = new ResponseHeader
|
|
{
|
|
ServiceResult = StatusCodes.Good,
|
|
StringTable = []
|
|
}
|
|
});
|
|
|
|
// The publish worker decrements the counter in finally,
|
|
// so DrainAsync now returns.
|
|
using var drainCts2 = CancellationTokenSource
|
|
.CreateLinkedTokenSource(testCt);
|
|
drainCts2.CancelAfter(TimeSpan.FromSeconds(5));
|
|
await sut.DrainAsync(drainCts2.Token).ConfigureAwait(false);
|
|
}
|
|
finally
|
|
{
|
|
await sut.DisposeAsync().ConfigureAwait(false);
|
|
}
|
|
}
|
|
|
|
/// <summary>
|
|
/// Regression coverage for the ack-pruning helper added by
|
|
/// #3540. <see cref="IMessageAckQueue.DropPendingForSubscription"/>
|
|
/// must remove every queued acknowledgement targeting the
|
|
/// given subscription id while leaving acks for other
|
|
/// subscriptions intact. The recovery path relies on this
|
|
/// before recreating a subscription so stale acks for the
|
|
/// dead id do not leak <c>BadSubscriptionIdInvalid</c> to
|
|
/// the server when the server re-uses the id.
|
|
/// </summary>
|
|
[Test]
|
|
public async Task DropPendingForSubscriptionRemovesOnlyMatchingAcksAsync()
|
|
{
|
|
ILoggerFactory loggerFactory = m_telemetry.LoggerFactory;
|
|
var session = new FakeSubscriptionManagerContext();
|
|
var sut = new SubscriptionManager(session,
|
|
loggerFactory, DiagnosticsMasks.None);
|
|
await using (sut.ConfigureAwait(false))
|
|
{
|
|
// Variable typed as the interface on purpose to test the
|
|
// public contract; the analyzer's perf hint does not
|
|
// apply to a coverage test.
|
|
#pragma warning disable CA1859
|
|
IMessageAckQueue queue = sut;
|
|
await queue.QueueAsync(new SubscriptionAcknowledgement
|
|
{
|
|
SubscriptionId = 1u,
|
|
SequenceNumber = 10u
|
|
}).ConfigureAwait(false);
|
|
await queue.QueueAsync(new SubscriptionAcknowledgement
|
|
{
|
|
SubscriptionId = 2u,
|
|
SequenceNumber = 11u
|
|
}).ConfigureAwait(false);
|
|
await queue.QueueAsync(new SubscriptionAcknowledgement
|
|
{
|
|
SubscriptionId = 1u,
|
|
SequenceNumber = 12u
|
|
}).ConfigureAwait(false);
|
|
|
|
int dropped = queue.DropPendingForSubscription(1u);
|
|
|
|
Assert.That(dropped, Is.EqualTo(2),
|
|
"All queued acks for the dead subscription id must be dropped.");
|
|
|
|
int droppedAgain = queue.DropPendingForSubscription(1u);
|
|
Assert.That(droppedAgain, Is.Zero,
|
|
"Second call must drop nothing (idempotent).");
|
|
|
|
int droppedOther = queue.DropPendingForSubscription(2u);
|
|
Assert.That(droppedOther, Is.EqualTo(1),
|
|
"Ack for the surviving subscription id must still be queued " +
|
|
"and drainable on a subsequent call.");
|
|
#pragma warning restore CA1859
|
|
}
|
|
}
|
|
|
|
/// <summary>
|
|
/// Calling <see cref="IMessageAckQueue.DropPendingForSubscription"/>
|
|
/// on an empty queue is a no-op and must not throw.
|
|
/// </summary>
|
|
[Test]
|
|
public async Task DropPendingForSubscriptionOnEmptyQueueReturnsZeroAsync()
|
|
{
|
|
ILoggerFactory loggerFactory = m_telemetry.LoggerFactory;
|
|
var session = new FakeSubscriptionManagerContext();
|
|
var sut = new SubscriptionManager(session,
|
|
loggerFactory, DiagnosticsMasks.None);
|
|
await using (sut.ConfigureAwait(false))
|
|
{
|
|
#pragma warning disable CA1859
|
|
IMessageAckQueue queue = sut;
|
|
int dropped = queue.DropPendingForSubscription(7u);
|
|
Assert.That(dropped, Is.Zero);
|
|
#pragma warning restore CA1859
|
|
}
|
|
}
|
|
|
|
/// <summary>
|
|
/// Polls <see cref="SubscriptionManager.PublishWorkerCount"/> until it
|
|
/// matches the expected value or the timeout elapses. Replaces fixed
|
|
/// <c>Task.Delay</c>-based waits, which are flaky on slow CI runners.
|
|
/// </summary>
|
|
private static async Task WaitForPublishWorkerCountAsync(
|
|
SubscriptionManager sut,
|
|
int expected,
|
|
TimeSpan? timeout = null)
|
|
{
|
|
timeout ??= TimeSpan.FromSeconds(5);
|
|
var sw = Stopwatch.StartNew();
|
|
while (sw.Elapsed < timeout.Value && sut.PublishWorkerCount != expected)
|
|
{
|
|
await Task.Delay(25).ConfigureAwait(false);
|
|
}
|
|
Assert.That(sut.PublishWorkerCount, Is.EqualTo(expected),
|
|
$"Expected PublishWorkerCount={expected} within {timeout.Value}; " +
|
|
$"got {sut.PublishWorkerCount} after {sw.ElapsedMilliseconds} ms.");
|
|
}
|
|
|
|
private FakeSubscriptionManagerContext m_session;
|
|
private ITelemetryContext m_telemetry;
|
|
private Mock<ISubscriptionNotificationHandler> m_mockNotificationDataHandler;
|
|
#pragma warning disable NUnit1032 // Disposed via DisposeAsync in TearDown
|
|
private SubscriptionManager m_subscriptionManager;
|
|
#pragma warning restore NUnit1032
|
|
}
|
|
}
|