cdd65beb6c
Closes the four remaining items in the 2026-06-24 template-inheritance/CLI follow-up tracker. #4 — CLI `instance set-bindings` can now set DataSourceReferenceOverride. `--bindings` accepts an optional 3rd element per entry: [attributeName, dataConnectionId, dataSourceReferenceOverride]. A string sets the override; a JSON null or an omitted 3rd element leaves it unset (template default). TryParseBindings accepts 2- or 3-element entries and rejects a non-string/non-null 3rd element or 4+ elements with a clean error. Previously the CLI sent the override as null and silently wiped any existing one (only a raw POST /management could set it). #5 — `template update` is partial, not full-replace (fixed server-side so all clients benefit). UpdateTemplateAsync now uses leave-unchanged semantics: a null description keeps the stored value (pass "" to clear); a null parentTemplateId keeps the existing parent. Parent stays immutable — a non-null differing value is still rejected — but omitting --parent-id is now a no-op instead of failing every derived-template update. #6 — compact `template list`/`get` table output + `--detail`. Table output is now id/name/description/parent/derived + member counts (#attrs/#alarms/ #scripts/#comps/#nativeAlarms) via TemplateTableProjection, fed through a new optional tableProjector seam on CommandHelpers. `--detail` restores the full dump. JSON output is left untouched (always full) so machine consumers are unaffected — the projector only runs on the table path. #8 — structured deploy-time validation error. New ValidationResult.SummarizeErrors() (Commons) returns a grouped, capped summary: leading total count, one line per ValidationCategory, and a per-module rollup (canonical name up to its last dot) with counts + "... and N more module(s)" caps. DeploymentService uses it for the "Pre-deployment validation failed" message and logs the full per-entry list via LogWarning. Replaces the flat semicolon-joined dump that became a wall of text for instances with 50-194 unbound attributes. Tests: +8 Commons (SummarizeErrors), +8 CLI (4 binding 3-element / 4 table projection), +2 net TemplateEngine (partial-update). Affected suites green: Commons 587, CLI 341, TemplateEngine 447, DeploymentManager 101, ManagementService 230, CentralUI 866; full solution builds 0/0. Docs: Component-DeploymentManager.md "Validation Error Reporting"; CLI README (set-bindings 3-element form, template update leave-unchanged, list/get --detail); UpdateTemplateCommand doc; known-issues tracker #4/#5/#6/#8 resolved (all 8 items now closed).
152 lines
4.9 KiB
C#
152 lines
4.9 KiB
C#
using ZB.MOM.WW.ScadaBridge.CLI.Commands;
|
|
using ZB.MOM.WW.ScadaBridge.Commons.Messages.Management;
|
|
|
|
namespace ZB.MOM.WW.ScadaBridge.CLI.Tests;
|
|
|
|
/// <summary>
|
|
/// Regression tests for CLI-005 — malformed <c>--bindings</c> / <c>--overrides</c> JSON
|
|
/// previously threw unhandled exceptions instead of producing a clean validation error.
|
|
/// </summary>
|
|
public class InstanceArgumentParsingTests
|
|
{
|
|
[Fact]
|
|
public void ParseBindings_ValidJson_ReturnsPairs()
|
|
{
|
|
var ok = InstanceCommands.TryParseBindings(
|
|
"[[\"Speed\", 5], [\"Mode\", 7]]", out var bindings, out var error);
|
|
|
|
Assert.True(ok);
|
|
Assert.Null(error);
|
|
Assert.Equal(2, bindings!.Count);
|
|
Assert.Equal(new ConnectionBinding("Speed", 5), bindings[0]);
|
|
Assert.Equal(new ConnectionBinding("Mode", 7), bindings[1]);
|
|
}
|
|
|
|
[Fact]
|
|
public void ParseBindings_MalformedJson_ReturnsErrorNotException()
|
|
{
|
|
var ok = InstanceCommands.TryParseBindings("not json", out var bindings, out var error);
|
|
|
|
Assert.False(ok);
|
|
Assert.Null(bindings);
|
|
Assert.NotNull(error);
|
|
}
|
|
|
|
[Fact]
|
|
public void ParseBindings_ShortPair_ReturnsErrorNotException()
|
|
{
|
|
// A pair with fewer than two elements previously threw ArgumentOutOfRangeException.
|
|
var ok = InstanceCommands.TryParseBindings("[[\"Speed\"]]", out var bindings, out var error);
|
|
|
|
Assert.False(ok);
|
|
Assert.Null(bindings);
|
|
Assert.NotNull(error);
|
|
}
|
|
|
|
[Fact]
|
|
public void ParseBindings_WrongElementTypes_ReturnsErrorNotException()
|
|
{
|
|
// A non-string name / non-int id previously threw InvalidOperationException.
|
|
var ok = InstanceCommands.TryParseBindings("[[5, \"Speed\"]]", out var bindings, out var error);
|
|
|
|
Assert.False(ok);
|
|
Assert.Null(bindings);
|
|
Assert.NotNull(error);
|
|
}
|
|
|
|
[Fact]
|
|
public void ParseBindings_JsonNull_ReturnsErrorNotException()
|
|
{
|
|
var ok = InstanceCommands.TryParseBindings("null", out var bindings, out var error);
|
|
|
|
Assert.False(ok);
|
|
Assert.Null(bindings);
|
|
Assert.NotNull(error);
|
|
}
|
|
|
|
[Fact]
|
|
public void ParseBindings_ThreeElementForm_CapturesReferenceOverride()
|
|
{
|
|
// The optional 3rd element carries the per-instance data-source reference
|
|
// override (followup #4) so the CLI can SET it instead of always wiping it.
|
|
var ok = InstanceCommands.TryParseBindings(
|
|
"[[\"Speed\", 5, \"ns=2;s=Spd\"], [\"Mode\", 7]]", out var bindings, out var error);
|
|
|
|
Assert.True(ok);
|
|
Assert.Null(error);
|
|
Assert.Equal(2, bindings!.Count);
|
|
Assert.Equal(new ConnectionBinding("Speed", 5, "ns=2;s=Spd"), bindings[0]);
|
|
// A 2-element entry still leaves the override null (template default applies).
|
|
Assert.Equal(new ConnectionBinding("Mode", 7, null), bindings[1]);
|
|
Assert.Null(bindings[1].DataSourceReferenceOverride);
|
|
}
|
|
|
|
[Fact]
|
|
public void ParseBindings_ThirdElementExplicitNull_LeavesOverrideUnset()
|
|
{
|
|
var ok = InstanceCommands.TryParseBindings(
|
|
"[[\"Speed\", 5, null]]", out var bindings, out var error);
|
|
|
|
Assert.True(ok);
|
|
Assert.Null(error);
|
|
Assert.Single(bindings!);
|
|
Assert.Null(bindings![0].DataSourceReferenceOverride);
|
|
}
|
|
|
|
[Fact]
|
|
public void ParseBindings_ThirdElementWrongType_ReturnsErrorNotException()
|
|
{
|
|
// A non-string, non-null 3rd element is rejected with a clean error.
|
|
var ok = InstanceCommands.TryParseBindings(
|
|
"[[\"Speed\", 5, 99]]", out var bindings, out var error);
|
|
|
|
Assert.False(ok);
|
|
Assert.Null(bindings);
|
|
Assert.NotNull(error);
|
|
}
|
|
|
|
[Fact]
|
|
public void ParseBindings_FourElements_ReturnsErrorNotException()
|
|
{
|
|
var ok = InstanceCommands.TryParseBindings(
|
|
"[[\"Speed\", 5, \"ref\", \"extra\"]]", out var bindings, out var error);
|
|
|
|
Assert.False(ok);
|
|
Assert.Null(bindings);
|
|
Assert.NotNull(error);
|
|
}
|
|
|
|
[Fact]
|
|
public void ParseOverrides_ValidJson_ReturnsDictionary()
|
|
{
|
|
var ok = InstanceCommands.TryParseOverrides(
|
|
"{\"Speed\": \"100\", \"Mode\": null}", out var overrides, out var error);
|
|
|
|
Assert.True(ok);
|
|
Assert.Null(error);
|
|
Assert.Equal(2, overrides!.Count);
|
|
Assert.Equal("100", overrides["Speed"]);
|
|
Assert.Null(overrides["Mode"]);
|
|
}
|
|
|
|
[Fact]
|
|
public void ParseOverrides_MalformedJson_ReturnsErrorNotException()
|
|
{
|
|
var ok = InstanceCommands.TryParseOverrides("{bad json", out var overrides, out var error);
|
|
|
|
Assert.False(ok);
|
|
Assert.Null(overrides);
|
|
Assert.NotNull(error);
|
|
}
|
|
|
|
[Fact]
|
|
public void ParseOverrides_JsonNull_ReturnsErrorNotException()
|
|
{
|
|
var ok = InstanceCommands.TryParseOverrides("null", out var overrides, out var error);
|
|
|
|
Assert.False(ok);
|
|
Assert.Null(overrides);
|
|
Assert.NotNull(error);
|
|
}
|
|
}
|