Skip to content

126 role requirements #129

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Archie-Miller merged 2 commits into from
Aug 20, 2025
Merged

126 role requirements #129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b8cb680
Update AmlEngine. Problem appears to be isolated to the library
Archie-Miller Aug 15, 2025
b09d1a9
Add Automated tests
Archie-Miller Aug 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Opc2Aml.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Aml.Engine" Version="4.4.0" />
<PackageReference Include="Aml.Engine" Version="4.4.3" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.1" />
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="9.0.1" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.1" />
Expand Down
46 changes: 46 additions & 0 deletions SystemTest/InternalElements.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,6 +300,52 @@ public void TestInstanceInternalElements(string[] internalElements, string nodeI
}
}

[TestMethod, Timeout(TestHelper.UnitTestTimeout)]
public void TestInstanceRoleRequirements()
{
var document = GetDocument();

foreach (InstanceHierarchyType instanceHierarchy in document.CAEXFile.InstanceHierarchy)
{
foreach (InternalElementType internalElement in instanceHierarchy.InternalElement)
{
CheckRoleRequirementsRecursive(internalElement);
}
}
}

[TestMethod, Timeout(TestHelper.UnitTestTimeout)]
public void TestRoleRequirements()
{
var document = GetDocument();

foreach (SystemUnitClassLibType libType in document.CAEXFile.SystemUnitClassLib)
{
foreach (SystemUnitClassType systemUnitClass in libType)
{
CheckRoleRequirementsRecursive(systemUnitClass);
}
}
}

private void CheckRoleRequirementsRecursive(SystemUnitClassType entity)
{
var seen = new HashSet<string>();

foreach (IObjectWithRoleReference roleReference in entity.RoleReferences)
{
// Use RefBaseRoleClassPath as the unique key for duplication
string key = roleReference.RoleReference ?? string.Empty;
Assert.IsFalse(seen.Contains(key), $"Duplicate RoleRequirements '{key}' found in '{entity.Name}'");
seen.Add(key);
}

foreach (InternalElementType internalElement in entity.InternalElement)
{
CheckRoleRequirementsRecursive(internalElement);
}
}


#endregion

Expand Down
4 changes: 2 additions & 2 deletions SystemTest/SystemTest.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Aml.Engine" Version="4.4.0" />
<PackageReference Include="Aml.Engine.Services" Version="4.2.2" />
<PackageReference Include="Aml.Engine" Version="4.4.3" />
<PackageReference Include="Aml.Engine.Services" Version="4.2.4" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
<PackageReference Include="MSTest.TestAdapter" Version="3.7.3" />
<PackageReference Include="MSTest.TestFramework" Version="3.7.3" />
Expand Down