Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
58 changes: 58 additions & 0 deletions source/AAS.TwinEngine.DataEngine.sln
Original file line number Diff line number Diff line change
Expand Up @@ -13,32 +13,90 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AAS.TwinEngine.Plugin.TestP
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AAS.TwinEngine.Plugin.TestPlugin.UnitTests", "AAS.TwinEngine.Plugin.TestPlugin.UnitTests\AAS.TwinEngine.Plugin.TestPlugin.UnitTests.csproj", "{573F3A2B-8CC3-40D8-B543-74BF5DF7D4FF}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AAS.TwinEngine.Plugin.TestPlugin.PlaywrightTests", "AAS.TwinEngine.Plugin.TestPlugin.PlaywrightTests\AAS.TwinEngine.Plugin.TestPlugin.PlaywrightTests.csproj", "{147F5F77-EC38-4541-AF3C-5B4FAD15E1C4}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
Release|Any CPU = Release|Any CPU
Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{80387870-5B50-461A-B5E7-105B9D526F7B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{80387870-5B50-461A-B5E7-105B9D526F7B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{80387870-5B50-461A-B5E7-105B9D526F7B}.Debug|x64.ActiveCfg = Debug|Any CPU
{80387870-5B50-461A-B5E7-105B9D526F7B}.Debug|x64.Build.0 = Debug|Any CPU
{80387870-5B50-461A-B5E7-105B9D526F7B}.Debug|x86.ActiveCfg = Debug|Any CPU
{80387870-5B50-461A-B5E7-105B9D526F7B}.Debug|x86.Build.0 = Debug|Any CPU
{80387870-5B50-461A-B5E7-105B9D526F7B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{80387870-5B50-461A-B5E7-105B9D526F7B}.Release|Any CPU.Build.0 = Release|Any CPU
{80387870-5B50-461A-B5E7-105B9D526F7B}.Release|x64.ActiveCfg = Release|Any CPU
{80387870-5B50-461A-B5E7-105B9D526F7B}.Release|x64.Build.0 = Release|Any CPU
{80387870-5B50-461A-B5E7-105B9D526F7B}.Release|x86.ActiveCfg = Release|Any CPU
{80387870-5B50-461A-B5E7-105B9D526F7B}.Release|x86.Build.0 = Release|Any CPU
{B24F4A6D-294A-4C4A-BAAC-A2D396E8C88A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B24F4A6D-294A-4C4A-BAAC-A2D396E8C88A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B24F4A6D-294A-4C4A-BAAC-A2D396E8C88A}.Debug|x64.ActiveCfg = Debug|Any CPU
{B24F4A6D-294A-4C4A-BAAC-A2D396E8C88A}.Debug|x64.Build.0 = Debug|Any CPU
{B24F4A6D-294A-4C4A-BAAC-A2D396E8C88A}.Debug|x86.ActiveCfg = Debug|Any CPU
{B24F4A6D-294A-4C4A-BAAC-A2D396E8C88A}.Debug|x86.Build.0 = Debug|Any CPU
{B24F4A6D-294A-4C4A-BAAC-A2D396E8C88A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B24F4A6D-294A-4C4A-BAAC-A2D396E8C88A}.Release|Any CPU.Build.0 = Release|Any CPU
{B24F4A6D-294A-4C4A-BAAC-A2D396E8C88A}.Release|x64.ActiveCfg = Release|Any CPU
{B24F4A6D-294A-4C4A-BAAC-A2D396E8C88A}.Release|x64.Build.0 = Release|Any CPU
{B24F4A6D-294A-4C4A-BAAC-A2D396E8C88A}.Release|x86.ActiveCfg = Release|Any CPU
{B24F4A6D-294A-4C4A-BAAC-A2D396E8C88A}.Release|x86.Build.0 = Release|Any CPU
{D16C8CF8-6A29-4A40-971A-9A070A1817A9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D16C8CF8-6A29-4A40-971A-9A070A1817A9}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D16C8CF8-6A29-4A40-971A-9A070A1817A9}.Debug|x64.ActiveCfg = Debug|Any CPU
{D16C8CF8-6A29-4A40-971A-9A070A1817A9}.Debug|x64.Build.0 = Debug|Any CPU
{D16C8CF8-6A29-4A40-971A-9A070A1817A9}.Debug|x86.ActiveCfg = Debug|Any CPU
{D16C8CF8-6A29-4A40-971A-9A070A1817A9}.Debug|x86.Build.0 = Debug|Any CPU
{D16C8CF8-6A29-4A40-971A-9A070A1817A9}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D16C8CF8-6A29-4A40-971A-9A070A1817A9}.Release|Any CPU.Build.0 = Release|Any CPU
{D16C8CF8-6A29-4A40-971A-9A070A1817A9}.Release|x64.ActiveCfg = Release|Any CPU
{D16C8CF8-6A29-4A40-971A-9A070A1817A9}.Release|x64.Build.0 = Release|Any CPU
{D16C8CF8-6A29-4A40-971A-9A070A1817A9}.Release|x86.ActiveCfg = Release|Any CPU
{D16C8CF8-6A29-4A40-971A-9A070A1817A9}.Release|x86.Build.0 = Release|Any CPU
{455B960D-57D0-4D9B-805C-E1DEA05B9311}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{455B960D-57D0-4D9B-805C-E1DEA05B9311}.Debug|Any CPU.Build.0 = Debug|Any CPU
{455B960D-57D0-4D9B-805C-E1DEA05B9311}.Debug|x64.ActiveCfg = Debug|Any CPU
{455B960D-57D0-4D9B-805C-E1DEA05B9311}.Debug|x64.Build.0 = Debug|Any CPU
{455B960D-57D0-4D9B-805C-E1DEA05B9311}.Debug|x86.ActiveCfg = Debug|Any CPU
{455B960D-57D0-4D9B-805C-E1DEA05B9311}.Debug|x86.Build.0 = Debug|Any CPU
{455B960D-57D0-4D9B-805C-E1DEA05B9311}.Release|Any CPU.ActiveCfg = Release|Any CPU
{455B960D-57D0-4D9B-805C-E1DEA05B9311}.Release|Any CPU.Build.0 = Release|Any CPU
{455B960D-57D0-4D9B-805C-E1DEA05B9311}.Release|x64.ActiveCfg = Release|Any CPU
{455B960D-57D0-4D9B-805C-E1DEA05B9311}.Release|x64.Build.0 = Release|Any CPU
{455B960D-57D0-4D9B-805C-E1DEA05B9311}.Release|x86.ActiveCfg = Release|Any CPU
{455B960D-57D0-4D9B-805C-E1DEA05B9311}.Release|x86.Build.0 = Release|Any CPU
{573F3A2B-8CC3-40D8-B543-74BF5DF7D4FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{573F3A2B-8CC3-40D8-B543-74BF5DF7D4FF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{573F3A2B-8CC3-40D8-B543-74BF5DF7D4FF}.Debug|x64.ActiveCfg = Debug|Any CPU
{573F3A2B-8CC3-40D8-B543-74BF5DF7D4FF}.Debug|x64.Build.0 = Debug|Any CPU
{573F3A2B-8CC3-40D8-B543-74BF5DF7D4FF}.Debug|x86.ActiveCfg = Debug|Any CPU
{573F3A2B-8CC3-40D8-B543-74BF5DF7D4FF}.Debug|x86.Build.0 = Debug|Any CPU
{573F3A2B-8CC3-40D8-B543-74BF5DF7D4FF}.Release|Any CPU.ActiveCfg = Release|Any CPU
{573F3A2B-8CC3-40D8-B543-74BF5DF7D4FF}.Release|Any CPU.Build.0 = Release|Any CPU
{573F3A2B-8CC3-40D8-B543-74BF5DF7D4FF}.Release|x64.ActiveCfg = Release|Any CPU
{573F3A2B-8CC3-40D8-B543-74BF5DF7D4FF}.Release|x64.Build.0 = Release|Any CPU
{573F3A2B-8CC3-40D8-B543-74BF5DF7D4FF}.Release|x86.ActiveCfg = Release|Any CPU
{573F3A2B-8CC3-40D8-B543-74BF5DF7D4FF}.Release|x86.Build.0 = Release|Any CPU
{147F5F77-EC38-4541-AF3C-5B4FAD15E1C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{147F5F77-EC38-4541-AF3C-5B4FAD15E1C4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{147F5F77-EC38-4541-AF3C-5B4FAD15E1C4}.Debug|x64.ActiveCfg = Debug|Any CPU
{147F5F77-EC38-4541-AF3C-5B4FAD15E1C4}.Debug|x64.Build.0 = Debug|Any CPU
{147F5F77-EC38-4541-AF3C-5B4FAD15E1C4}.Debug|x86.ActiveCfg = Debug|Any CPU
{147F5F77-EC38-4541-AF3C-5B4FAD15E1C4}.Debug|x86.Build.0 = Debug|Any CPU
{147F5F77-EC38-4541-AF3C-5B4FAD15E1C4}.Release|Any CPU.ActiveCfg = Release|Any CPU
{147F5F77-EC38-4541-AF3C-5B4FAD15E1C4}.Release|Any CPU.Build.0 = Release|Any CPU
{147F5F77-EC38-4541-AF3C-5B4FAD15E1C4}.Release|x64.ActiveCfg = Release|Any CPU
{147F5F77-EC38-4541-AF3C-5B4FAD15E1C4}.Release|x64.Build.0 = Release|Any CPU
{147F5F77-EC38-4541-AF3C-5B4FAD15E1C4}.Release|x86.ActiveCfg = Release|Any CPU
{147F5F77-EC38-4541-AF3C-5B4FAD15E1C4}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>

<IsPackable>false</IsPackable>
<IsTestProject>true</IsTestProject>
<EnableNETAnalyzers>true</EnableNETAnalyzers>
<NoWarn>IDE1006, IDE0058</NoWarn>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="coverlet.collector" Version="6.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageReference Include="Microsoft.Playwright" Version="1.48.0" />
<PackageReference Include="Microsoft.Playwright.NUnit" Version="1.48.0" />
<PackageReference Include="xunit" Version="2.5.3" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.3" />
</ItemGroup>

<ItemGroup>
<Using Include="Xunit" />
</ItemGroup>

<ItemGroup>
<None Update="AasRegistry\TestData\GetAllShellDescriptors_Expected.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="AasRegistry\TestData\GetShellDescriptorById_Expected.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="AasRepository\TestData\GetAssetInformationById_Expected.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="AasRepository\TestData\GetShellById_Expected.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="AasRepository\TestData\GetSubmodelRefById_Expected.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="SubmodelRegistry\TestData\GetSubmodelDescriptorById_Contact_Expected.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="SubmodelRegistry\TestData\GetSubmodelDescriptorById_Nameplate_Expected.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="SubmodelRegistry\TestData\GetSubmodelDescriptorById_Reliability_Expected.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="SubmodelRepository\TestData\GetSubmodelElement_ContactInfo_ContactInformation_Expected.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="SubmodelRepository\TestData\GetSubmodelElement_Nameplate_ManufacturerName_Expected.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="SubmodelRepository\TestData\GetSubmodelElement_Nameplate_Markings_Expected.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="SubmodelRepository\TestData\GetSubmodelElement_Reliability_ReliabilityCharacteristics_MTTF.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="SubmodelRepository\TestData\GetSubmodel_ContactInfo_Expected.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="SubmodelRepository\TestData\GetSubmodel_Nameplate_Expected.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="SubmodelRepository\TestData\GetSubmodel_Reliability_Expected.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
using System.Text.Json;

namespace AAS.TwinEngine.Plugin.TestPlugin.PlaywrightTests.AasRegistry;

/// <summary>
/// Tests for AAS Registry endpoints
/// </summary>
public class AasRegistryTests : ApiTestBase
{
[Fact]
public async Task GetAllShellDescriptors_ShouldReturnSuccess_ContentAsExpected()
{
// Arrange
var url = "/shell-descriptors";

// Act
var response = await ApiContext.GetAsync(url);

// Assert
AssertSuccessResponse(response);
var content = await response.TextAsync();
Assert.False(string.IsNullOrEmpty(content));

var json = JsonDocument.Parse(content);
Assert.NotNull(json);

await CompareJsonAsync(json, Path.Combine(Directory.GetCurrentDirectory(), "AasRegistry", "TestData", "GetAllShellDescriptors_Expected.json"));
}

[Fact]
public async Task GetAllShellDescriptors_WithPagination()
{
// Arrange
var urlLimit2 = "/shell-descriptors?limit=2";
var urlLimit3 = "/shell-descriptors?limit=3";

// Act

var responseLimit2 = await ApiContext.GetAsync(urlLimit2);
var responseLimit3 = await ApiContext.GetAsync(urlLimit3);

// Assert
AssertSuccessResponse(responseLimit2);
AssertSuccessResponse(responseLimit3);

var contentLimit2 = await responseLimit2.TextAsync();
var contentLimit3 = await responseLimit3.TextAsync();

Assert.False(string.IsNullOrEmpty(contentLimit2));
Assert.False(string.IsNullOrEmpty(contentLimit3));

var jsonLimit2 = JsonDocument.Parse(contentLimit2);
var jsonLimit3 = JsonDocument.Parse(contentLimit3);

Assert.NotNull(jsonLimit2);
Assert.NotNull(jsonLimit3);

// Verify that limit 3 contains one more element than limit 2
var resultLimit2 = jsonLimit2.RootElement.GetProperty("result");
var resultLimit3 = jsonLimit3.RootElement.GetProperty("result");

var countLimit2 = resultLimit2.GetArrayLength();
var countLimit3 = resultLimit3.GetArrayLength();

Assert.Equal(countLimit2 + 1, countLimit3);
}

[Fact]
public async Task GetShellDescriptorById_ShouldReturnSuccess_ContentAsExpected()
{
// Arrange
var url = $"/shell-descriptors/{AasIdentifier}";

// Act
var response = await ApiContext.GetAsync(url);

// Assert
AssertSuccessResponse(response);
var content = await response.TextAsync();
Assert.False(string.IsNullOrEmpty(content));

var actualDoc = JsonDocument.Parse(content);
Assert.NotNull(actualDoc);

await CompareJsonAsync(actualDoc, Path.Combine(Directory.GetCurrentDirectory(), "AasRegistry", "TestData", "GetShellDescriptorById_Expected.json"));
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
{
"paging_metadata": {
"cursor": null
},
"result": [
{
"description": null,
"displayName": null,
"extensions": null,
"administration": null,
"assetKind": 0,
"assetType": 0,
"endpoints": [
{
"interface": "AAS-3.0",
"protocolInformation": {
"href": "http://localhost:8080/shells/aHR0cHM6Ly9tbS1zb2Z0d2FyZS5jb20vaWRzL2Fhcy8wMDAtMDAx",
"endpointProtocol": "http",
"endpointProtocolVersion": null,
"subprotocol": null,
"subprotocolBody": null,
"subprotocolBodyEncoding": null,
"securityAttributes": null
}
}
],
"globalAssetId": "https://mm-software.com/ids/assets/000-001",
"idShort": "M&M01",
"id": "https://mm-software.com/ids/aas/000-001",
"specificAssetIds": [],
"submodelDescriptors": null
},
{
"description": null,
"displayName": null,
"extensions": null,
"administration": null,
"assetKind": 0,
"assetType": 0,
"endpoints": [
{
"interface": "AAS-3.0",
"protocolInformation": {
"href": "http://localhost:8080/shells/aHR0cHM6Ly9tbS1zb2Z0d2FyZS5jb20vaWRzL2Fhcy8wMDAtMDAy",
"endpointProtocol": "http",
"endpointProtocolVersion": null,
"subprotocol": null,
"subprotocolBody": null,
"subprotocolBodyEncoding": null,
"securityAttributes": null
}
}
],
"globalAssetId": "https://mm-software.com/ids/assets/000-002",
"idShort": "M&M02",
"id": "https://mm-software.com/ids/aas/000-002",
"specificAssetIds": [],
"submodelDescriptors": null
},
{
"description": null,
"displayName": null,
"extensions": null,
"administration": null,
"assetKind": 0,
"assetType": 0,
"endpoints": [
{
"interface": "AAS-3.0",
"protocolInformation": {
"href": "http://localhost:8080/shells/aHR0cHM6Ly9tbS1zb2Z0d2FyZS5jb20vaWRzL2Fhcy8wMDAtMDAz",
"endpointProtocol": "http",
"endpointProtocolVersion": null,
"subprotocol": null,
"subprotocolBody": null,
"subprotocolBodyEncoding": null,
"securityAttributes": null
}
}
],
"globalAssetId": "https://mm-software.com/ids/assets/000-003",
"idShort": "M&M03",
"id": "https://mm-software.com/ids/aas/000-003",
"specificAssetIds": [],
"submodelDescriptors": null
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{
"description": null,
"displayName": null,
"extensions": null,
"administration": null,
"assetKind": 0,
"assetType": 0,
"endpoints": [
{
"interface": "AAS-3.0",
"protocolInformation": {
"href": "http://localhost:8080/shells/aHR0cHM6Ly9tbS1zb2Z0d2FyZS5jb20vaWRzL2Fhcy8wMDAtMDAx",
"endpointProtocol": "http",
"endpointProtocolVersion": null,
"subprotocol": null,
"subprotocolBody": null,
"subprotocolBodyEncoding": null,
"securityAttributes": null
}
}
],
"globalAssetId": "https://mm-software.com/ids/assets/000-001",
"idShort": "M&M01",
"id": "https://mm-software.com/ids/aas/000-001",
"specificAssetIds": [],
"submodelDescriptors": null
}
Loading
Loading