Skip to content

Commit

Permalink
Update test files
Browse files Browse the repository at this point in the history 
- Add globalAssetId for all `ÀssetInformation`
- Fix Entity.specificAssetIds in test files
  • Loading branch information
@zrgt @s-heppner
zrgt authored and s-heppner committed Nov 14, 2023
1 parent eec297a commit 9b76d24
Show file tree
Hide file tree
Showing 9 changed files with 115 additions and 92 deletions.
29 changes: 16 additions & 13 deletions compliance-tool/test/compliance_tool/files/test_demo_full_example.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,8 @@
"modelType": "AssetAdministrationShell",
"id": "https://acplt.org/Test_AssetAdministrationShell2_Mandatory",
"assetInformation": {
"assetKind": "Instance"
"assetKind": "Instance",
"globalAssetId": "http://acplt.org/TestAsset2_Mandatory/"
}
},
{
Expand Down Expand Up @@ -720,19 +721,21 @@
],
"entityType": "SelfManagedEntity",
"globalAssetId": "http://acplt.org/TestAsset/",
"specificAssetId": {
"name": "TestKey",
"value": "TestValue",
"externalSubjectId": {
"type": "ExternalReference",
"keys": [
{
"type": "GlobalReference",
"value": "http://acplt.org/SpecificAssetId/"
}
]
"specificAssetIds": [
{
"name": "TestKey",
"value": "TestValue",
"externalSubjectId": {
"type": "ExternalReference",
"keys": [
{
"type": "GlobalReference",
"value": "http://acplt.org/SpecificAssetId/"
}
]
}
}
}
]
},
{
"idShort": "ExampleEntity2",
Expand Down
29 changes: 16 additions & 13 deletions compliance-tool/test/compliance_tool/files/test_demo_full_example.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -245,6 +245,7 @@
<aas:id>https://acplt.org/Test_AssetAdministrationShell2_Mandatory</aas:id>
<aas:assetInformation>
<aas:assetKind>Instance</aas:assetKind>
<aas:globalAssetId>http://acplt.org/TestAsset2_Mandatory/</aas:globalAssetId>
</aas:assetInformation>
</aas:assetAdministrationShell>
<aas:assetAdministrationShell>
Expand Down Expand Up @@ -601,19 +602,21 @@
</aas:statements>
<aas:entityType>SelfManagedEntity</aas:entityType>
<aas:globalAssetId>http://acplt.org/TestAsset/</aas:globalAssetId>
<aas:specificAssetId>
<aas:name>TestKey</aas:name>
<aas:value>TestValue</aas:value>
<aas:externalSubjectId>
<aas:type>ExternalReference</aas:type>
<aas:keys>
<aas:key>
<aas:type>GlobalReference</aas:type>
<aas:value>http://acplt.org/SpecificAssetId/</aas:value>
</aas:key>
</aas:keys>
</aas:externalSubjectId>
</aas:specificAssetId>
<aas:specificAssetIds>
<aas:specificAssetId>
<aas:name>TestKey</aas:name>
<aas:value>TestValue</aas:value>
<aas:externalSubjectId>
<aas:type>ExternalReference</aas:type>
<aas:keys>
<aas:key>
<aas:type>GlobalReference</aas:type>
<aas:value>http://acplt.org/SpecificAssetId/</aas:value>
</aas:key>
</aas:keys>
</aas:externalSubjectId>
</aas:specificAssetId>
</aas:specificAssetIds>
</aas:entity>
<aas:entity>
<aas:category>PARAMETER</aas:category>
Expand Down
29 changes: 16 additions & 13 deletions compliance-tool/test/compliance_tool/files/test_demo_full_example_json_aasx/aasx/data.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,8 @@
"modelType": "AssetAdministrationShell",
"id": "https://acplt.org/Test_AssetAdministrationShell2_Mandatory",
"assetInformation": {
"assetKind": "Instance"
"assetKind": "Instance",
"globalAssetId": "http://acplt.org/TestAsset2_Mandatory/"
}
},
{
Expand Down Expand Up @@ -728,19 +729,21 @@
],
"entityType": "SelfManagedEntity",
"globalAssetId": "http://acplt.org/TestAsset/",
"specificAssetId": {
"name": "TestKey",
"value": "TestValue",
"externalSubjectId": {
"type": "ExternalReference",
"keys": [
{
"type": "GlobalReference",
"value": "http://acplt.org/SpecificAssetId/"
}
]
"specificAssetIds": [
{
"name": "TestKey",
"value": "TestValue",
"externalSubjectId": {
"type": "ExternalReference",
"keys": [
{
"type": "GlobalReference",
"value": "http://acplt.org/SpecificAssetId/"
}
]
}
}
}
]
},
{
"idShort": "ExampleEntity2",
Expand Down
29 changes: 16 additions & 13 deletions compliance-tool/test/compliance_tool/files/test_demo_full_example_wrong_attribute.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,8 @@
"modelType": "AssetAdministrationShell",
"id": "https://acplt.org/Test_AssetAdministrationShell2_Mandatory",
"assetInformation": {
"assetKind": "Instance"
"assetKind": "Instance",
"globalAssetId": "http://acplt.org/TestAsset2_Mandatory/"
}
},
{
Expand Down Expand Up @@ -718,19 +719,21 @@
],
"entityType": "SelfManagedEntity",
"globalAssetId": "http://acplt.org/TestAsset/",
"specificAssetId": {
"name": "TestKey",
"value": "TestValue",
"externalSubjectId": {
"type": "ExternalReference",
"keys": [
{
"type": "GlobalReference",
"value": "http://acplt.org/SpecificAssetId/"
}
]
"specificAssetIds": [
{
"name": "TestKey",
"value": "TestValue",
"externalSubjectId": {
"type": "ExternalReference",
"keys": [
{
"type": "GlobalReference",
"value": "http://acplt.org/SpecificAssetId/"
}
]
}
}
}
]
},
{
"idShort": "ExampleEntity2",
Expand Down
29 changes: 16 additions & 13 deletions compliance-tool/test/compliance_tool/files/test_demo_full_example_wrong_attribute.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -245,6 +245,7 @@
<aas:id>https://acplt.org/Test_AssetAdministrationShell2_Mandatory</aas:id>
<aas:assetInformation>
<aas:assetKind>Instance</aas:assetKind>
<aas:globalAssetId>http://acplt.org/TestAsset2_Mandatory/</aas:globalAssetId>
</aas:assetInformation>
</aas:assetAdministrationShell>
<aas:assetAdministrationShell>
Expand Down Expand Up @@ -601,19 +602,21 @@
</aas:statements>
<aas:entityType>SelfManagedEntity</aas:entityType>
<aas:globalAssetId>http://acplt.org/TestAsset/</aas:globalAssetId>
<aas:specificAssetId>
<aas:name>TestKey</aas:name>
<aas:value>TestValue</aas:value>
<aas:externalSubjectId>
<aas:type>ExternalReference</aas:type>
<aas:keys>
<aas:key>
<aas:type>GlobalReference</aas:type>
<aas:value>http://acplt.org/SpecificAssetId/</aas:value>
</aas:key>
</aas:keys>
</aas:externalSubjectId>
</aas:specificAssetId>
<aas:specificAssetIds>
<aas:specificAssetId>
<aas:name>TestKey</aas:name>
<aas:value>TestValue</aas:value>
<aas:externalSubjectId>
<aas:type>ExternalReference</aas:type>
<aas:keys>
<aas:key>
<aas:type>GlobalReference</aas:type>
<aas:value>http://acplt.org/SpecificAssetId/</aas:value>
</aas:key>
</aas:keys>
</aas:externalSubjectId>
</aas:specificAssetId>
</aas:specificAssetIds>
</aas:entity>
<aas:entity>
<aas:category>PARAMETER</aas:category>
Expand Down
29 changes: 16 additions & 13 deletions compliance-tool/test/compliance_tool/files/test_demo_full_example_xml_aasx/aasx/data.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -253,6 +253,7 @@
<aas:id>https://acplt.org/Test_AssetAdministrationShell2_Mandatory</aas:id>
<aas:assetInformation>
<aas:assetKind>Instance</aas:assetKind>
<aas:globalAssetId>http://acplt.org/TestAsset2_Mandatory/</aas:globalAssetId>
</aas:assetInformation>
</aas:assetAdministrationShell>
<aas:assetAdministrationShell>
Expand Down Expand Up @@ -609,19 +610,21 @@
</aas:statements>
<aas:entityType>SelfManagedEntity</aas:entityType>
<aas:globalAssetId>http://acplt.org/TestAsset/</aas:globalAssetId>
<aas:specificAssetId>
<aas:name>TestKey</aas:name>
<aas:value>TestValue</aas:value>
<aas:externalSubjectId>
<aas:type>ExternalReference</aas:type>
<aas:keys>
<aas:key>
<aas:type>GlobalReference</aas:type>
<aas:value>http://acplt.org/SpecificAssetId/</aas:value>
</aas:key>
</aas:keys>
</aas:externalSubjectId>
</aas:specificAssetId>
<aas:specificAssetIds>
<aas:specificAssetId>
<aas:name>TestKey</aas:name>
<aas:value>TestValue</aas:value>
<aas:externalSubjectId>
<aas:type>ExternalReference</aas:type>
<aas:keys>
<aas:key>
<aas:type>GlobalReference</aas:type>
<aas:value>http://acplt.org/SpecificAssetId/</aas:value>
</aas:key>
</aas:keys>
</aas:externalSubjectId>
</aas:specificAssetId>
</aas:specificAssetIds>
</aas:entity>
<aas:entity>
<aas:category>PARAMETER</aas:category>
Expand Down
29 changes: 16 additions & 13 deletions .../test/compliance_tool/files/test_demo_full_example_xml_wrong_attribute_aasx/aasx/data.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -253,6 +253,7 @@
<aas:id>https://acplt.org/Test_AssetAdministrationShell2_Mandatory</aas:id>
<aas:assetInformation>
<aas:assetKind>Instance</aas:assetKind>
<aas:globalAssetId>http://acplt.org/TestAsset2_Mandatory/</aas:globalAssetId>
</aas:assetInformation>
</aas:assetAdministrationShell>
<aas:assetAdministrationShell>
Expand Down Expand Up @@ -609,19 +610,21 @@
</aas:statements>
<aas:entityType>SelfManagedEntity</aas:entityType>
<aas:globalAssetId>http://acplt.org/TestAsset/</aas:globalAssetId>
<aas:specificAssetId>
<aas:name>TestKey</aas:name>
<aas:value>TestValue</aas:value>
<aas:externalSubjectId>
<aas:type>ExternalReference</aas:type>
<aas:keys>
<aas:key>
<aas:type>GlobalReference</aas:type>
<aas:value>http://acplt.org/SpecificAssetId/</aas:value>
</aas:key>
</aas:keys>
</aas:externalSubjectId>
</aas:specificAssetId>
<aas:specificAssetIds>
<aas:specificAssetId>
<aas:name>TestKey</aas:name>
<aas:value>TestValue</aas:value>
<aas:externalSubjectId>
<aas:type>ExternalReference</aas:type>
<aas:keys>
<aas:key>
<aas:type>GlobalReference</aas:type>
<aas:value>http://acplt.org/SpecificAssetId/</aas:value>
</aas:key>
</aas:keys>
</aas:externalSubjectId>
</aas:specificAssetId>
</aas:specificAssetIds>
</aas:entity>
<aas:entity>
<aas:category>PARAMETER</aas:category>
Expand Down
3 changes: 2 additions & 1 deletion compliance-tool/test/compliance_tool/files/test_deserializable_aas_warning.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
},
"modelType": "AssetAdministrationShell",
"assetInformation": {
"assetKind": "Instance"
"assetKind": "Instance",
"globalAssetId": "http://acplt.org/TestAsset/"
}
}
]
Expand Down
1 change: 1 addition & 0 deletions compliance-tool/test/compliance_tool/files/test_deserializable_aas_warning.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
<aas:id>https://acplt.org/Test_AssetAdministrationShell</aas:id>
<aas:assetInformation>
<aas:assetKind>Instance</aas:assetKind>
<aas:globalAssetId>http://acplt.org/TestAsset/</aas:globalAssetId>
</aas:assetInformation>
</aas:assetAdministrationShell>
</aas:assetAdministrationShells>
Expand Down

0 comments on commit 9b76d24

Please sign in to comment.