feat: add JoeAppEngine OPC UA nodes, fix DCL auto-reconnect and quality push

- Add JoeAppEngine folder to OPC UA nodes.json (BTCS, AlarmCntsBySeverity, Scheduler/ScanTime)
- Fix DataConnectionActor: capture Self in PreStart for use from non-actor threads,
  preventing Self.Tell failure in Disconnected event handler
- Implement InstanceActor.HandleConnectionQualityChanged to mark attributes Bad on disconnect
- Fix LmxFakeProxy TagMapper to serialize arrays as JSON instead of "System.Int32[]"
- Allow DataType and DataSourceReference updates in TemplateService.UpdateAttributeAsync
- Update test_infra_opcua.md with JoeAppEngine documentation
This commit is contained in:
Joseph Doherty
2026-03-19 13:27:54 -04:00
parent ffdda51990
commit 7740a3bcf9
70 changed files with 2684 additions and 541 deletions

View File

@@ -0,0 +1,90 @@
using ScadaLink.CLI;
namespace ScadaLink.CLI.Tests;
public class CliConfigTests
{
[Fact]
public void Load_DefaultValues_WhenNoConfigExists()
{
// Clear environment variables that might affect the test
var origContact = Environment.GetEnvironmentVariable("SCADALINK_CONTACT_POINTS");
var origLdap = Environment.GetEnvironmentVariable("SCADALINK_LDAP_SERVER");
var origFormat = Environment.GetEnvironmentVariable("SCADALINK_FORMAT");
try
{
Environment.SetEnvironmentVariable("SCADALINK_CONTACT_POINTS", null);
Environment.SetEnvironmentVariable("SCADALINK_LDAP_SERVER", null);
Environment.SetEnvironmentVariable("SCADALINK_FORMAT", null);
var config = CliConfig.Load();
Assert.Equal(636, config.LdapPort);
Assert.True(config.LdapUseTls);
Assert.Equal("json", config.DefaultFormat);
}
finally
{
Environment.SetEnvironmentVariable("SCADALINK_CONTACT_POINTS", origContact);
Environment.SetEnvironmentVariable("SCADALINK_LDAP_SERVER", origLdap);
Environment.SetEnvironmentVariable("SCADALINK_FORMAT", origFormat);
}
}
[Fact]
public void Load_ContactPoints_FromEnvironment()
{
var orig = Environment.GetEnvironmentVariable("SCADALINK_CONTACT_POINTS");
try
{
Environment.SetEnvironmentVariable("SCADALINK_CONTACT_POINTS", "host1:8080,host2:8080");
var config = CliConfig.Load();
Assert.Equal(2, config.ContactPoints.Count);
Assert.Equal("host1:8080", config.ContactPoints[0]);
Assert.Equal("host2:8080", config.ContactPoints[1]);
}
finally
{
Environment.SetEnvironmentVariable("SCADALINK_CONTACT_POINTS", orig);
}
}
[Fact]
public void Load_LdapServer_FromEnvironment()
{
var orig = Environment.GetEnvironmentVariable("SCADALINK_LDAP_SERVER");
try
{
Environment.SetEnvironmentVariable("SCADALINK_LDAP_SERVER", "ldap.example.com");
var config = CliConfig.Load();
Assert.Equal("ldap.example.com", config.LdapServer);
}
finally
{
Environment.SetEnvironmentVariable("SCADALINK_LDAP_SERVER", orig);
}
}
[Fact]
public void Load_Format_FromEnvironment()
{
var orig = Environment.GetEnvironmentVariable("SCADALINK_FORMAT");
try
{
Environment.SetEnvironmentVariable("SCADALINK_FORMAT", "table");
var config = CliConfig.Load();
Assert.Equal("table", config.DefaultFormat);
}
finally
{
Environment.SetEnvironmentVariable("SCADALINK_FORMAT", orig);
}
}
}

View File

@@ -0,0 +1,131 @@
using ScadaLink.CLI.Commands;
using ScadaLink.Commons.Messages.Management;
namespace ScadaLink.CLI.Tests;
public class CommandHelpersTests
{
[Fact]
public void HandleResponse_ManagementSuccess_JsonFormat_ReturnsZero()
{
var writer = new StringWriter();
Console.SetOut(writer);
var response = new ManagementSuccess("corr-1", "{\"id\":1,\"name\":\"test\"}");
var exitCode = CommandHelpers.HandleResponse(response, "json");
Assert.Equal(0, exitCode);
Assert.Contains("{\"id\":1,\"name\":\"test\"}", writer.ToString());
Console.SetOut(new StreamWriter(Console.OpenStandardOutput()) { AutoFlush = true });
}
[Fact]
public void HandleResponse_ManagementSuccess_TableFormat_ArrayData_ReturnsZero()
{
var writer = new StringWriter();
Console.SetOut(writer);
var json = "[{\"Id\":1,\"Name\":\"Alpha\"},{\"Id\":2,\"Name\":\"Beta\"}]";
var response = new ManagementSuccess("corr-1", json);
var exitCode = CommandHelpers.HandleResponse(response, "table");
Assert.Equal(0, exitCode);
var output = writer.ToString();
Assert.Contains("Id", output);
Assert.Contains("Name", output);
Assert.Contains("Alpha", output);
Assert.Contains("Beta", output);
Console.SetOut(new StreamWriter(Console.OpenStandardOutput()) { AutoFlush = true });
}
[Fact]
public void HandleResponse_ManagementSuccess_TableFormat_ObjectData_ReturnsZero()
{
var writer = new StringWriter();
Console.SetOut(writer);
var json = "{\"Id\":1,\"Name\":\"Alpha\",\"Status\":\"Active\"}";
var response = new ManagementSuccess("corr-1", json);
var exitCode = CommandHelpers.HandleResponse(response, "table");
Assert.Equal(0, exitCode);
var output = writer.ToString();
Assert.Contains("Property", output);
Assert.Contains("Value", output);
Assert.Contains("Id", output);
Assert.Contains("Alpha", output);
Console.SetOut(new StreamWriter(Console.OpenStandardOutput()) { AutoFlush = true });
}
[Fact]
public void HandleResponse_ManagementSuccess_TableFormat_EmptyArray_ShowsNoResults()
{
var writer = new StringWriter();
Console.SetOut(writer);
var response = new ManagementSuccess("corr-1", "[]");
var exitCode = CommandHelpers.HandleResponse(response, "table");
Assert.Equal(0, exitCode);
Assert.Contains("(no results)", writer.ToString());
Console.SetOut(new StreamWriter(Console.OpenStandardOutput()) { AutoFlush = true });
}
[Fact]
public void HandleResponse_ManagementError_ReturnsOne()
{
var errWriter = new StringWriter();
Console.SetError(errWriter);
var response = new ManagementError("corr-1", "Something failed", "FAIL_CODE");
var exitCode = CommandHelpers.HandleResponse(response, "json");
Assert.Equal(1, exitCode);
Assert.Contains("Something failed", errWriter.ToString());
Console.SetError(new StreamWriter(Console.OpenStandardError()) { AutoFlush = true });
}
[Fact]
public void HandleResponse_ManagementUnauthorized_ReturnsTwo()
{
var errWriter = new StringWriter();
Console.SetError(errWriter);
var response = new ManagementUnauthorized("corr-1", "Access denied");
var exitCode = CommandHelpers.HandleResponse(response, "json");
Assert.Equal(2, exitCode);
Assert.Contains("Access denied", errWriter.ToString());
Console.SetError(new StreamWriter(Console.OpenStandardError()) { AutoFlush = true });
}
[Fact]
public void HandleResponse_UnexpectedType_ReturnsOne()
{
var errWriter = new StringWriter();
Console.SetError(errWriter);
var exitCode = CommandHelpers.HandleResponse("unexpected", "json");
Assert.Equal(1, exitCode);
Assert.Contains("Unexpected response type", errWriter.ToString());
Console.SetError(new StreamWriter(Console.OpenStandardError()) { AutoFlush = true });
}
[Fact]
public void NewCorrelationId_ReturnsNonEmpty32CharHex()
{
var id = CommandHelpers.NewCorrelationId();
Assert.NotNull(id);
Assert.Equal(32, id.Length);
Assert.True(id.All(c => "0123456789abcdef".Contains(c)));
}
}

View File

@@ -0,0 +1,102 @@
using ScadaLink.CLI;
namespace ScadaLink.CLI.Tests;
public class OutputFormatterTests
{
[Fact]
public void WriteJson_WritesIndentedJson()
{
var writer = new StringWriter();
Console.SetOut(writer);
OutputFormatter.WriteJson(new { Name = "test", Value = 42 });
var output = writer.ToString().Trim();
Assert.Contains("\"name\"", output);
Assert.Contains("\"value\": 42", output);
Console.SetOut(new StreamWriter(Console.OpenStandardOutput()) { AutoFlush = true });
}
[Fact]
public void WriteError_WritesToStdErr()
{
var writer = new StringWriter();
Console.SetError(writer);
OutputFormatter.WriteError("something went wrong", "ERR_CODE");
var output = writer.ToString().Trim();
Assert.Contains("something went wrong", output);
Assert.Contains("ERR_CODE", output);
Console.SetError(new StreamWriter(Console.OpenStandardError()) { AutoFlush = true });
}
[Fact]
public void WriteTable_RendersHeadersAndRows()
{
var writer = new StringWriter();
Console.SetOut(writer);
var headers = new[] { "Id", "Name", "Status" };
var rows = new List<string[]>
{
new[] { "1", "Alpha", "Active" },
new[] { "2", "Beta", "Inactive" }
};
OutputFormatter.WriteTable(rows, headers);
var output = writer.ToString();
Assert.Contains("Id", output);
Assert.Contains("Name", output);
Assert.Contains("Status", output);
Assert.Contains("Alpha", output);
Assert.Contains("Beta", output);
Assert.Contains("Inactive", output);
Console.SetOut(new StreamWriter(Console.OpenStandardOutput()) { AutoFlush = true });
}
[Fact]
public void WriteTable_EmptyRows_ShowsHeadersOnly()
{
var writer = new StringWriter();
Console.SetOut(writer);
var headers = new[] { "Id", "Name" };
OutputFormatter.WriteTable(Array.Empty<string[]>(), headers);
var output = writer.ToString();
Assert.Contains("Id", output);
Assert.Contains("Name", output);
Console.SetOut(new StreamWriter(Console.OpenStandardOutput()) { AutoFlush = true });
}
[Fact]
public void WriteTable_ColumnWidthsAdjustToContent()
{
var writer = new StringWriter();
Console.SetOut(writer);
var headers = new[] { "X", "LongColumnName" };
var rows = new List<string[]>
{
new[] { "ShortValue", "Y" }
};
OutputFormatter.WriteTable(rows, headers);
var lines = writer.ToString().Split(Environment.NewLine, StringSplitOptions.RemoveEmptyEntries);
// Header line: "X" should be padded to at least "ShortValue" width
Assert.True(lines.Length >= 2);
// The "X" column header should be padded wider than 1 character
var headerLine = lines[0];
Assert.True(headerLine.IndexOf("LongColumnName") > 1);
Console.SetOut(new StreamWriter(Console.OpenStandardOutput()) { AutoFlush = true });
}
}

View File

@@ -0,0 +1,28 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net10.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<IsPackable>false</IsPackable>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="coverlet.collector" Version="6.0.4" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
<PackageReference Include="NSubstitute" Version="5.3.0" />
<PackageReference Include="xunit" Version="2.9.3" />
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.4" />
</ItemGroup>
<ItemGroup>
<Using Include="Xunit" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="../../src/ScadaLink.CLI/ScadaLink.CLI.csproj" />
<ProjectReference Include="../../src/ScadaLink.Commons/ScadaLink.Commons.csproj" />
</ItemGroup>
</Project>