chore: organize solution into module folders (Core/Server/Drivers/Client/Tooling)
Group all 69 projects into category subfolders under src/ and tests/ so the Rider Solution Explorer mirrors the module structure. Folders: Core, Server, Drivers (with a nested Driver CLIs subfolder), Client, Tooling. - Move every project folder on disk with git mv (history preserved as renames). - Recompute relative paths in 57 .csproj files: cross-category ProjectReferences, the lib/ HintPath+None refs in Driver.Historian.Wonderware, and the external mxaccessgw refs in Driver.Galaxy and its test project. - Rebuild ZB.MOM.WW.OtOpcUa.slnx with nested solution folders. - Re-prefix project paths in functional scripts (e2e, compliance, smoke SQL, integration, install). Build green (0 errors); unit tests pass. Docs left for a separate pass. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
Joseph Doherty
@@ -0,0 +1,95 @@
|
||||
using Shouldly;
|
||||
using Xunit;
|
||||
using ZB.MOM.WW.OtOpcUa.Client.Shared.Models;
|
||||
|
||||
namespace ZB.MOM.WW.OtOpcUa.Client.Shared.Tests.Models;
|
||||
|
||||
public class ConnectionSettingsTests
|
||||
{
|
||||
[Fact]
|
||||
public void Defaults_AreCorrect()
|
||||
{
|
||||
var settings = new ConnectionSettings();
|
||||
|
||||
settings.EndpointUrl.ShouldBe(string.Empty);
|
||||
settings.FailoverUrls.ShouldBeNull();
|
||||
settings.Username.ShouldBeNull();
|
||||
settings.Password.ShouldBeNull();
|
||||
settings.SecurityMode.ShouldBe(SecurityMode.None);
|
||||
settings.SessionTimeoutSeconds.ShouldBe(60);
|
||||
settings.AutoAcceptCertificates.ShouldBeTrue();
|
||||
settings.CertificateStorePath.ShouldContain("OtOpcUaClient");
|
||||
settings.CertificateStorePath.ShouldContain("pki");
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void Validate_ThrowsOnNullEndpointUrl()
|
||||
{
|
||||
var settings = new ConnectionSettings { EndpointUrl = null! };
|
||||
Should.Throw<ArgumentException>(() => settings.Validate())
|
||||
.ParamName.ShouldBe("EndpointUrl");
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void Validate_ThrowsOnEmptyEndpointUrl()
|
||||
{
|
||||
var settings = new ConnectionSettings { EndpointUrl = "" };
|
||||
Should.Throw<ArgumentException>(() => settings.Validate())
|
||||
.ParamName.ShouldBe("EndpointUrl");
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void Validate_ThrowsOnWhitespaceEndpointUrl()
|
||||
{
|
||||
var settings = new ConnectionSettings { EndpointUrl = " " };
|
||||
Should.Throw<ArgumentException>(() => settings.Validate())
|
||||
.ParamName.ShouldBe("EndpointUrl");
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void Validate_ThrowsOnZeroTimeout()
|
||||
{
|
||||
var settings = new ConnectionSettings
|
||||
{
|
||||
EndpointUrl = "opc.tcp://localhost:4840",
|
||||
SessionTimeoutSeconds = 0
|
||||
};
|
||||
Should.Throw<ArgumentException>(() => settings.Validate())
|
||||
.ParamName.ShouldBe("SessionTimeoutSeconds");
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void Validate_ThrowsOnNegativeTimeout()
|
||||
{
|
||||
var settings = new ConnectionSettings
|
||||
{
|
||||
EndpointUrl = "opc.tcp://localhost:4840",
|
||||
SessionTimeoutSeconds = -1
|
||||
};
|
||||
Should.Throw<ArgumentException>(() => settings.Validate())
|
||||
.ParamName.ShouldBe("SessionTimeoutSeconds");
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void Validate_ThrowsOnTimeoutAbove3600()
|
||||
{
|
||||
var settings = new ConnectionSettings
|
||||
{
|
||||
EndpointUrl = "opc.tcp://localhost:4840",
|
||||
SessionTimeoutSeconds = 3601
|
||||
};
|
||||
Should.Throw<ArgumentException>(() => settings.Validate())
|
||||
.ParamName.ShouldBe("SessionTimeoutSeconds");
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void Validate_SucceedsWithValidSettings()
|
||||
{
|
||||
var settings = new ConnectionSettings
|
||||
{
|
||||
EndpointUrl = "opc.tcp://localhost:4840",
|
||||
SessionTimeoutSeconds = 120
|
||||
};
|
||||
Should.NotThrow(() => settings.Validate());
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,130 @@
|
||||
using Opc.Ua;
|
||||
using Shouldly;
|
||||
using Xunit;
|
||||
using ZB.MOM.WW.OtOpcUa.Client.Shared.Models;
|
||||
using BrowseResult = ZB.MOM.WW.OtOpcUa.Client.Shared.Models.BrowseResult;
|
||||
|
||||
namespace ZB.MOM.WW.OtOpcUa.Client.Shared.Tests.Models;
|
||||
|
||||
public class ModelConstructionTests
|
||||
{
|
||||
[Fact]
|
||||
public void BrowseResult_ConstructsCorrectly()
|
||||
{
|
||||
var result = new BrowseResult("ns=2;s=MyNode", "MyNode", "Variable", true);
|
||||
|
||||
result.NodeId.ShouldBe("ns=2;s=MyNode");
|
||||
result.DisplayName.ShouldBe("MyNode");
|
||||
result.NodeClass.ShouldBe("Variable");
|
||||
result.HasChildren.ShouldBeTrue();
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void BrowseResult_WithoutChildren()
|
||||
{
|
||||
var result = new BrowseResult("ns=2;s=Leaf", "Leaf", "Variable", false);
|
||||
result.HasChildren.ShouldBeFalse();
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void AlarmEventArgs_ConstructsCorrectly()
|
||||
{
|
||||
var time = new DateTime(2026, 1, 15, 10, 30, 0, DateTimeKind.Utc);
|
||||
var args = new AlarmEventArgs("Source1", "HighTemp", 500, "Temperature high", true, true, false, time);
|
||||
|
||||
args.SourceName.ShouldBe("Source1");
|
||||
args.ConditionName.ShouldBe("HighTemp");
|
||||
args.Severity.ShouldBe((ushort)500);
|
||||
args.Message.ShouldBe("Temperature high");
|
||||
args.Retain.ShouldBeTrue();
|
||||
args.ActiveState.ShouldBeTrue();
|
||||
args.AckedState.ShouldBeFalse();
|
||||
args.Time.ShouldBe(time);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void RedundancyInfo_ConstructsCorrectly()
|
||||
{
|
||||
var uris = new[] { "urn:server1", "urn:server2" };
|
||||
var info = new RedundancyInfo("Warm", 200, uris, "urn:server1");
|
||||
|
||||
info.Mode.ShouldBe("Warm");
|
||||
info.ServiceLevel.ShouldBe((byte)200);
|
||||
info.ServerUris.ShouldBe(uris);
|
||||
info.ApplicationUri.ShouldBe("urn:server1");
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void RedundancyInfo_WithEmptyUris()
|
||||
{
|
||||
var info = new RedundancyInfo("None", 0, [], string.Empty);
|
||||
info.ServerUris.ShouldBeEmpty();
|
||||
info.ApplicationUri.ShouldBeEmpty();
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void DataChangedEventArgs_ConstructsCorrectly()
|
||||
{
|
||||
var value = new DataValue(new Variant(42), StatusCodes.Good);
|
||||
var args = new DataChangedEventArgs("ns=2;s=Temp", value);
|
||||
|
||||
args.NodeId.ShouldBe("ns=2;s=Temp");
|
||||
args.Value.ShouldBe(value);
|
||||
args.Value.Value.ShouldBe(42);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void ConnectionStateChangedEventArgs_ConstructsCorrectly()
|
||||
{
|
||||
var args = new ConnectionStateChangedEventArgs(
|
||||
ConnectionState.Disconnected, ConnectionState.Connected, "opc.tcp://localhost:4840");
|
||||
|
||||
args.OldState.ShouldBe(ConnectionState.Disconnected);
|
||||
args.NewState.ShouldBe(ConnectionState.Connected);
|
||||
args.EndpointUrl.ShouldBe("opc.tcp://localhost:4840");
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void ConnectionInfo_ConstructsCorrectly()
|
||||
{
|
||||
var info = new ConnectionInfo(
|
||||
"opc.tcp://localhost:4840",
|
||||
"TestServer",
|
||||
"None",
|
||||
"http://opcfoundation.org/UA/SecurityPolicy#None",
|
||||
"ns=0;i=12345",
|
||||
"TestSession");
|
||||
|
||||
info.EndpointUrl.ShouldBe("opc.tcp://localhost:4840");
|
||||
info.ServerName.ShouldBe("TestServer");
|
||||
info.SecurityMode.ShouldBe("None");
|
||||
info.SecurityPolicyUri.ShouldBe("http://opcfoundation.org/UA/SecurityPolicy#None");
|
||||
info.SessionId.ShouldBe("ns=0;i=12345");
|
||||
info.SessionName.ShouldBe("TestSession");
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void SecurityMode_Enum_HasExpectedValues()
|
||||
{
|
||||
Enum.GetValues<SecurityMode>().Length.ShouldBe(3);
|
||||
((int)SecurityMode.None).ShouldBe(0);
|
||||
((int)SecurityMode.Sign).ShouldBe(1);
|
||||
((int)SecurityMode.SignAndEncrypt).ShouldBe(2);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void ConnectionState_Enum_HasExpectedValues()
|
||||
{
|
||||
Enum.GetValues<ConnectionState>().Length.ShouldBe(4);
|
||||
((int)ConnectionState.Disconnected).ShouldBe(0);
|
||||
((int)ConnectionState.Connecting).ShouldBe(1);
|
||||
((int)ConnectionState.Connected).ShouldBe(2);
|
||||
((int)ConnectionState.Reconnecting).ShouldBe(3);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void AggregateType_Enum_HasExpectedValues()
|
||||
{
|
||||
Enum.GetValues<AggregateType>().Length.ShouldBe(7);
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user