Skip to content

Commit

Permalink
test: update compliance tool test-files
Browse files Browse the repository at this point in the history 
This commit applies the following changes to all test-files:
- The id_short of direct children of a `SubmodelElementList` is removed
- `SubmodelElementList.order_relevant` is set to true for all
  `SubmodelElementList`s
  • Loading branch information
@jkhsjdhjs
jkhsjdhjs committed Oct 12, 2023
1 parent cc11346 commit a0a2416
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 32 deletions.
10 changes: 2 additions & 8 deletions test/compliance_tool/files/test_demo_full_example.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1424,7 +1424,6 @@
},
"value": [
{
"idShort": "ExampleProperty",
"displayName": [
{
"language": "en-US",
Expand Down Expand Up @@ -1595,7 +1594,6 @@
]
},
{
"idShort": "ExampleProperty2",
"displayName": [
{
"language": "en-US",
Expand Down Expand Up @@ -1754,7 +1752,6 @@
"modelType": "SubmodelElementList",
"value": [
{
"idShort": "ExampleSubmodelCollection",
"modelType": "SubmodelElementCollection",
"value": [
{
Expand Down Expand Up @@ -1796,7 +1793,6 @@
]
},
{
"idShort": "ExampleSubmodelCollection2",
"modelType": "SubmodelElementCollection"
}
]
Expand Down Expand Up @@ -2757,7 +2753,7 @@
}
]
},
"orderRelevant": false,
"orderRelevant": true,
"category": "PARAMETER",
"description": [
{
Expand All @@ -2782,7 +2778,6 @@
"kind": "Template",
"value": [
{
"idShort": "ExampleSubmodelCollection",
"category": "PARAMETER",
"description": [
{
Expand Down Expand Up @@ -2995,7 +2990,6 @@
]
},
{
"idShort": "ExampleSubmodelCollection2",
"category": "PARAMETER",
"description": [
{
Expand Down Expand Up @@ -3033,7 +3027,7 @@
}
]
},
"orderRelevant": false,
"orderRelevant": true,
"category": "PARAMETER",
"description": [
{
Expand Down
10 changes: 2 additions & 8 deletions test/compliance_tool/files/test_demo_full_example.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1180,7 +1180,6 @@
<aas:value>
<aas:property>
<aas:category>CONSTANT</aas:category>
<aas:idShort>ExampleProperty</aas:idShort>
<aas:displayName>
<aas:langStringNameType>
<aas:language>en-US</aas:language>
Expand Down Expand Up @@ -1341,7 +1340,6 @@
</aas:property>
<aas:property>
<aas:category>CONSTANT</aas:category>
<aas:idShort>ExampleProperty2</aas:idShort>
<aas:displayName>
<aas:langStringNameType>
<aas:language>en-US</aas:language>
Expand Down Expand Up @@ -1624,7 +1622,6 @@
<aas:idShort>ExampleSubmodelList</aas:idShort>
<aas:value>
<aas:submodelElementCollection>
<aas:idShort>ExampleSubmodelCollection</aas:idShort>
<aas:kind>Instance</aas:kind>
<aas:value>
<aas:blob>
Expand Down Expand Up @@ -1663,7 +1660,6 @@
</aas:value>
</aas:submodelElementCollection>
<aas:submodelElementCollection>
<aas:idShort>ExampleSubmodelCollection2</aas:idShort>
<aas:kind>Instance</aas:kind>
</aas:submodelElementCollection>
</aas:value>
Expand Down Expand Up @@ -2632,11 +2628,10 @@
</aas:key>
</aas:keys>
</aas:semanticId>
<aas:orderRelevant>false</aas:orderRelevant>
<aas:orderRelevant>true</aas:orderRelevant>
<aas:value>
<aas:submodelElementCollection>
<aas:category>PARAMETER</aas:category>
<aas:idShort>ExampleSubmodelCollection</aas:idShort>
<aas:description>
<aas:langStringTextType>
<aas:language>en-US</aas:language>
Expand Down Expand Up @@ -2838,7 +2833,6 @@
</aas:submodelElementCollection>
<aas:submodelElementCollection>
<aas:category>PARAMETER</aas:category>
<aas:idShort>ExampleSubmodelCollection2</aas:idShort>
<aas:description>
<aas:langStringTextType>
<aas:language>en-US</aas:language>
Expand Down Expand Up @@ -2895,7 +2889,7 @@
</aas:key>
</aas:keys>
</aas:semanticId>
<aas:orderRelevant>false</aas:orderRelevant>
<aas:orderRelevant>true</aas:orderRelevant>
<aas:semanticIdListElement>
<aas:type>ExternalReference</aas:type>
<aas:keys>
Expand Down
Binary file modified test/compliance_tool/files/test_demo_full_example_json.aasx
View file
Binary file not shown.
10 changes: 2 additions & 8 deletions 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 @@ -1424,7 +1424,6 @@
},
"value": [
{
"idShort": "ExampleProperty",
"displayName": [
{
"language": "en-US",
Expand Down Expand Up @@ -1595,7 +1594,6 @@
]
},
{
"idShort": "ExampleProperty2",
"displayName": [
{
"language": "en-US",
Expand Down Expand Up @@ -1754,7 +1752,6 @@
"modelType": "SubmodelElementList",
"value": [
{
"idShort": "ExampleSubmodelCollection",
"modelType": "SubmodelElementCollection",
"value": [
{
Expand Down Expand Up @@ -1796,7 +1793,6 @@
]
},
{
"idShort": "ExampleSubmodelCollection2",
"modelType": "SubmodelElementCollection"
}
]
Expand Down Expand Up @@ -2757,7 +2753,7 @@
}
]
},
"orderRelevant": false,
"orderRelevant": true,
"category": "PARAMETER",
"description": [
{
Expand All @@ -2782,7 +2778,6 @@
"kind": "Template",
"value": [
{
"idShort": "ExampleSubmodelCollection",
"category": "PARAMETER",
"description": [
{
Expand Down Expand Up @@ -2995,7 +2990,6 @@
]
},
{
"idShort": "ExampleSubmodelCollection2",
"category": "PARAMETER",
"description": [
{
Expand Down Expand Up @@ -3033,7 +3027,7 @@
}
]
},
"orderRelevant": false,
"orderRelevant": true,
"category": "PARAMETER",
"description": [
{
Expand Down
10 changes: 2 additions & 8 deletions 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 @@ -1180,7 +1180,6 @@
<aas:value>
<aas:property>
<aas:category>CONSTANT</aas:category>
<aas:idShort>ExampleProperty</aas:idShort>
<aas:displayName>
<aas:langStringNameType>
<aas:language>en-US</aas:language>
Expand Down Expand Up @@ -1341,7 +1340,6 @@
</aas:property>
<aas:property>
<aas:category>CONSTANT</aas:category>
<aas:idShort>ExampleProperty2</aas:idShort>
<aas:displayName>
<aas:langStringNameType>
<aas:language>en-US</aas:language>
Expand Down Expand Up @@ -1624,7 +1622,6 @@
<aas:idShort>ExampleSubmodelList</aas:idShort>
<aas:value>
<aas:submodelElementCollection>
<aas:idShort>ExampleSubmodelCollection</aas:idShort>
<aas:kind>Instance</aas:kind>
<aas:value>
<aas:blob>
Expand Down Expand Up @@ -1663,7 +1660,6 @@
</aas:value>
</aas:submodelElementCollection>
<aas:submodelElementCollection>
<aas:idShort>ExampleSubmodelCollection2</aas:idShort>
<aas:kind>Instance</aas:kind>
</aas:submodelElementCollection>
</aas:value>
Expand Down Expand Up @@ -2632,11 +2628,10 @@
</aas:key>
</aas:keys>
</aas:semanticId>
<aas:orderRelevant>false</aas:orderRelevant>
<aas:orderRelevant>true</aas:orderRelevant>
<aas:value>
<aas:submodelElementCollection>
<aas:category>PARAMETER</aas:category>
<aas:idShort>ExampleSubmodelCollection</aas:idShort>
<aas:description>
<aas:langStringTextType>
<aas:language>en-US</aas:language>
Expand Down Expand Up @@ -2838,7 +2833,6 @@
</aas:submodelElementCollection>
<aas:submodelElementCollection>
<aas:category>PARAMETER</aas:category>
<aas:idShort>ExampleSubmodelCollection2</aas:idShort>
<aas:description>
<aas:langStringTextType>
<aas:language>en-US</aas:language>
Expand Down Expand Up @@ -2895,7 +2889,7 @@
</aas:key>
</aas:keys>
</aas:semanticId>
<aas:orderRelevant>false</aas:orderRelevant>
<aas:orderRelevant>true</aas:orderRelevant>
<aas:semanticIdListElement>
<aas:type>ExternalReference</aas:type>
<aas:keys>
Expand Down
Binary file modified test/compliance_tool/files/test_demo_full_example_xml.aasx
View file
Binary file not shown.
Binary file modified test/compliance_tool/files/test_demo_full_example_xml_wrong_attribute.aasx
View file
Binary file not shown.

0 comments on commit a0a2416

Please sign in to comment.