Update compliance tool test files

As default value of Submodel.id_short, ConceptDescription.id_short, AAS.id_short is set to None, test files had to be updated.
eclipse-basyx · Oct 17, 2023 · c44bbc9 · c44bbc9
1 parent 250517d
commit c44bbc9
Show file tree

Hide file tree

Showing 8 changed files with 0 additions and 22 deletions.
diff --git a/test/adapter/xml/test_xml_deserialization.py b/test/adapter/xml/test_xml_deserialization.py
@@ -258,7 +258,6 @@ def test_duplicate_identifier(self) -> None:
  <aas:assetAdministrationShells>
  <aas:assetAdministrationShell>
  <aas:id>http://acplt.org/test_aas</aas:id>
- <aas:idShort>NotSet</aas:idShort>
  <aas:assetInformation>
  <aas:assetKind>Instance</aas:assetKind>
  </aas:assetInformation>
@@ -267,7 +266,6 @@ def test_duplicate_identifier(self) -> None:
  <aas:submodels>
  <aas:submodel>
  <aas:id>http://acplt.org/test_aas</aas:id>
- <aas:idShort>NotSet</aas:idShort>
  </aas:submodel>
  </aas:submodels>
  """)

diff --git a/test/compliance_tool/files/test_demo_full_example.json b/test/compliance_tool/files/test_demo_full_example.json
@@ -225,7 +225,6 @@
  ]
  },
  {
- "idShort": "NotSet",
  "modelType": "AssetAdministrationShell",
  "id": "https://acplt.org/Test_AssetAdministrationShell_Mandatory",
  "assetInformation": {
@@ -254,7 +253,6 @@
  ]
  },
  {
- "idShort": "NotSet",
  "modelType": "AssetAdministrationShell",
  "id": "https://acplt.org/Test_AssetAdministrationShell2_Mandatory",
  "assetInformation": {
@@ -1655,7 +1653,6 @@
  ]
  },
  {
- "idShort": "NotSet",
  "modelType": "Submodel",
  "id": "https://acplt.org/Test_Submodel_Mandatory",
  "submodelElements": [
@@ -1805,7 +1802,6 @@
  ]
  },
  {
- "idShort": "NotSet",
  "modelType": "Submodel",
  "id": "https://acplt.org/Test_Submodel2_Mandatory"
  },
@@ -3202,7 +3198,6 @@
  ]
  },
  {
- "idShort": "NotSet",
  "modelType": "ConceptDescription",
  "id": "https://acplt.org/Test_ConceptDescription_Mandatory"
  },

diff --git a/test/compliance_tool/files/test_demo_full_example.xml b/test/compliance_tool/files/test_demo_full_example.xml
@@ -215,7 +215,6 @@
  </aas:submodels>
  </aas:assetAdministrationShell>
  <aas:assetAdministrationShell>
- <aas:idShort>NotSet</aas:idShort>
  <aas:id>https://acplt.org/Test_AssetAdministrationShell_Mandatory</aas:id>
  <aas:assetInformation>
  <aas:assetKind>Instance</aas:assetKind>
@@ -243,7 +242,6 @@
  </aas:submodels>
  </aas:assetAdministrationShell>
  <aas:assetAdministrationShell>
- <aas:idShort>NotSet</aas:idShort>
  <aas:id>https://acplt.org/Test_AssetAdministrationShell2_Mandatory</aas:id>
  <aas:assetInformation>
  <aas:assetKind>Instance</aas:assetKind>
@@ -1527,7 +1525,6 @@
  </aas:submodelElements>
  </aas:submodel>
  <aas:submodel>
- <aas:idShort>NotSet</aas:idShort>
  <aas:id>https://acplt.org/Test_Submodel_Mandatory</aas:id>
  <aas:kind>Instance</aas:kind>
  <aas:submodelElements>
@@ -1672,7 +1669,6 @@
  </aas:submodelElements>
  </aas:submodel>
  <aas:submodel>
- <aas:idShort>NotSet</aas:idShort>
  <aas:id>https://acplt.org/Test_Submodel2_Mandatory</aas:id>
  <aas:kind>Instance</aas:kind>
  </aas:submodel>
@@ -3041,7 +3037,6 @@
  </aas:isCaseOf>
  </aas:conceptDescription>
  <aas:conceptDescription>
- <aas:idShort>NotSet</aas:idShort>
  <aas:id>https://acplt.org/Test_ConceptDescription_Mandatory</aas:id>
  </aas:conceptDescription>
  <aas:conceptDescription>

diff --git a/test/compliance_tool/files/test_demo_full_example_json.aasx b/test/compliance_tool/files/test_demo_full_example_json.aasx
diff --git a/test/compliance_tool/files/test_demo_full_example_wrong_attribute.json b/test/compliance_tool/files/test_demo_full_example_wrong_attribute.json
@@ -225,7 +225,6 @@
  ]
  },
  {
- "idShort": "NotSet",
  "modelType": "AssetAdministrationShell",
  "id": "https://acplt.org/Test_AssetAdministrationShell_Mandatory",
  "assetInformation": {
@@ -254,7 +253,6 @@
  ]
  },
  {
- "idShort": "NotSet",
  "modelType": "AssetAdministrationShell",
  "id": "https://acplt.org/Test_AssetAdministrationShell2_Mandatory",
  "assetInformation": {
@@ -1655,7 +1653,6 @@
  ]
  },
  {
- "idShort": "NotSet",
  "modelType": "Submodel",
  "id": "https://acplt.org/Test_Submodel_Mandatory",
  "submodelElements": [
@@ -1805,7 +1802,6 @@
  ]
  },
  {
- "idShort": "NotSet",
  "modelType": "Submodel",
  "id": "https://acplt.org/Test_Submodel2_Mandatory"
  },
@@ -3202,7 +3198,6 @@
  ]
  },
  {
- "idShort": "NotSet",
  "modelType": "ConceptDescription",
  "id": "https://acplt.org/Test_ConceptDescription_Mandatory"
  },

diff --git a/test/compliance_tool/files/test_demo_full_example_wrong_attribute.xml b/test/compliance_tool/files/test_demo_full_example_wrong_attribute.xml
@@ -215,7 +215,6 @@
  </aas:submodels>
  </aas:assetAdministrationShell>
  <aas:assetAdministrationShell>
- <aas:idShort>NotSet</aas:idShort>
  <aas:id>https://acplt.org/Test_AssetAdministrationShell_Mandatory</aas:id>
  <aas:assetInformation>
  <aas:assetKind>Instance</aas:assetKind>
@@ -243,7 +242,6 @@
  </aas:submodels>
  </aas:assetAdministrationShell>
  <aas:assetAdministrationShell>
- <aas:idShort>NotSet</aas:idShort>
  <aas:id>https://acplt.org/Test_AssetAdministrationShell2_Mandatory</aas:id>
  <aas:assetInformation>
  <aas:assetKind>Instance</aas:assetKind>
@@ -1527,7 +1525,6 @@
  </aas:submodelElements>
  </aas:submodel>
  <aas:submodel>
- <aas:idShort>NotSet</aas:idShort>
  <aas:id>https://acplt.org/Test_Submodel_Mandatory</aas:id>
  <aas:kind>Instance</aas:kind>
  <aas:submodelElements>
@@ -1672,7 +1669,6 @@
  </aas:submodelElements>
  </aas:submodel>
  <aas:submodel>
- <aas:idShort>NotSet</aas:idShort>
  <aas:id>https://acplt.org/Test_Submodel2_Mandatory</aas:id>
  <aas:kind>Instance</aas:kind>
  </aas:submodel>
@@ -3041,7 +3037,6 @@
  </aas:isCaseOf>
  </aas:conceptDescription>
  <aas:conceptDescription>
- <aas:idShort>NotSet</aas:idShort>
  <aas:id>https://acplt.org/Test_ConceptDescription_Mandatory</aas:id>
  </aas:conceptDescription>
  <aas:conceptDescription>

diff --git a/test/compliance_tool/files/test_demo_full_example_xml.aasx b/test/compliance_tool/files/test_demo_full_example_xml.aasx
diff --git a/test/compliance_tool/files/test_demo_full_example_xml_wrong_attribute.aasx b/test/compliance_tool/files/test_demo_full_example_xml_wrong_attribute.aasx