diff --git a/setup.py b/setup.py index 4b351b6ca..cc78aaefa 100644 --- a/setup.py +++ b/setup.py @@ -50,7 +50,7 @@ "twine", "jsonschema==3.2.0", "xmlschema==1.10.0", - "aas-core-meta@git+https://github.com/aas-core-works/aas-core-meta@4d7e59e#egg=aas-core-meta", + "aas-core-meta@git+https://github.com/aas-core-works/aas-core-meta@c9692bc#egg=aas-core-meta", "ssort==0.12.3", ] }, diff --git a/test_data/cpp/test_main/aas_core_meta.v3/expected_output/types.hpp b/test_data/cpp/test_main/aas_core_meta.v3/expected_output/types.hpp index f8692c990..8136b0c15 100644 --- a/test_data/cpp/test_main/aas_core_meta.v3/expected_output/types.hpp +++ b/test_data/cpp/test_main/aas_core_meta.v3/expected_output/types.hpp @@ -1492,6 +1492,10 @@ class IRelationshipElement /// specify a IHasSemantics::semantic_id then the value is assumed to be /// identical to ISubmodelElementList::semantic_id_list_element. /// +/// Constraint AASd-120:\n +/// The ISubmodelElementList::id_short of a ISubmodelElement being a direct child of a +/// ISubmodelElementList shall not be specified. +/// /// Constraint AASd-108:\n /// All first level child elements in a ISubmodelElementList shall have /// the same submodel element type as specified in ISubmodelElementList::type_value_list_element. diff --git a/test_data/cpp/test_main/aas_core_meta.v3/expected_output/verification.cpp b/test_data/cpp/test_main/aas_core_meta.v3/expected_output/verification.cpp index 9244f272d..9fabcf8ce 100644 --- a/test_data/cpp/test_main/aas_core_meta.v3/expected_output/verification.cpp +++ b/test_data/cpp/test_main/aas_core_meta.v3/expected_output/verification.cpp @@ -9736,7 +9736,7 @@ void OfAssetAdministrationShell::Execute() { } error_ = common::make_unique( - L"Description specifies no duplicate languages." + L"Description must specify unique languages." ); // No path is prepended as the error refers to the instance itself. ++index_; @@ -9777,7 +9777,7 @@ void OfAssetAdministrationShell::Execute() { } error_ = common::make_unique( - L"Display name specifies no duplicate languages." + L"Display name must specify unique languages." ); // No path is prepended as the error refers to the instance itself. ++index_; @@ -11372,7 +11372,7 @@ void OfSubmodel::Execute() { } error_ = common::make_unique( - L"Description specifies no duplicate languages." + L"Description must specify unique languages." ); // No path is prepended as the error refers to the instance itself. ++index_; @@ -11413,7 +11413,7 @@ void OfSubmodel::Execute() { } error_ = common::make_unique( - L"Display name specifies no duplicate languages." + L"Display name must specify unique languages." ); // No path is prepended as the error refers to the instance itself. ++index_; @@ -12090,7 +12090,7 @@ void OfRelationshipElement::Execute() { } error_ = common::make_unique( - L"Description specifies no duplicate languages." + L"Description must specify unique languages." ); // No path is prepended as the error refers to the instance itself. ++index_; @@ -12131,7 +12131,7 @@ void OfRelationshipElement::Execute() { } error_ = common::make_unique( - L"Display name specifies no duplicate languages." + L"Display name must specify unique languages." ); // No path is prepended as the error refers to the instance itself. ++index_; @@ -12627,7 +12627,7 @@ void OfSubmodelElementList::Execute() { } error_ = common::make_unique( - L"Description specifies no duplicate languages." + L"Description must specify unique languages." ); // No path is prepended as the error refers to the instance itself. ++index_; @@ -12668,7 +12668,7 @@ void OfSubmodelElementList::Execute() { } error_ = common::make_unique( - L"Display name specifies no duplicate languages." + L"Display name must specify unique languages." ); // No path is prepended as the error refers to the instance itself. ++index_; @@ -13329,7 +13329,7 @@ void OfSubmodelElementCollection::Execute() { } error_ = common::make_unique( - L"Description specifies no duplicate languages." + L"Description must specify unique languages." ); // No path is prepended as the error refers to the instance itself. ++index_; @@ -13370,7 +13370,7 @@ void OfSubmodelElementCollection::Execute() { } error_ = common::make_unique( - L"Display name specifies no duplicate languages." + L"Display name must specify unique languages." ); // No path is prepended as the error refers to the instance itself. ++index_; @@ -13933,7 +13933,7 @@ void OfProperty::Execute() { } error_ = common::make_unique( - L"Description specifies no duplicate languages." + L"Description must specify unique languages." ); // No path is prepended as the error refers to the instance itself. ++index_; @@ -13974,7 +13974,7 @@ void OfProperty::Execute() { } error_ = common::make_unique( - L"Display name specifies no duplicate languages." + L"Display name must specify unique languages." ); // No path is prepended as the error refers to the instance itself. ++index_; @@ -14570,7 +14570,7 @@ void OfMultiLanguageProperty::Execute() { } error_ = common::make_unique( - L"Description specifies no duplicate languages." + L"Description must specify unique languages." ); // No path is prepended as the error refers to the instance itself. ++index_; @@ -14611,7 +14611,7 @@ void OfMultiLanguageProperty::Execute() { } error_ = common::make_unique( - L"Display name specifies no duplicate languages." + L"Display name must specify unique languages." ); // No path is prepended as the error refers to the instance itself. ++index_; @@ -14757,7 +14757,7 @@ void OfMultiLanguageProperty::Execute() { } error_ = common::make_unique( - L"Value specifies no duplicate languages." + L"Value must specify unique languages." ); // No path is prepended as the error refers to the instance itself. ++index_; @@ -15171,7 +15171,7 @@ void OfRange::Execute() { } error_ = common::make_unique( - L"Description specifies no duplicate languages." + L"Description must specify unique languages." ); // No path is prepended as the error refers to the instance itself. ++index_; @@ -15212,7 +15212,7 @@ void OfRange::Execute() { } error_ = common::make_unique( - L"Display name specifies no duplicate languages." + L"Display name must specify unique languages." ); // No path is prepended as the error refers to the instance itself. ++index_; @@ -15884,7 +15884,7 @@ void OfReferenceElement::Execute() { } error_ = common::make_unique( - L"Description specifies no duplicate languages." + L"Description must specify unique languages." ); // No path is prepended as the error refers to the instance itself. ++index_; @@ -15925,7 +15925,7 @@ void OfReferenceElement::Execute() { } error_ = common::make_unique( - L"Display name specifies no duplicate languages." + L"Display name must specify unique languages." ); // No path is prepended as the error refers to the instance itself. ++index_; @@ -16445,7 +16445,7 @@ void OfBlob::Execute() { } error_ = common::make_unique( - L"Description specifies no duplicate languages." + L"Description must specify unique languages." ); // No path is prepended as the error refers to the instance itself. ++index_; @@ -16486,7 +16486,7 @@ void OfBlob::Execute() { } error_ = common::make_unique( - L"Display name specifies no duplicate languages." + L"Display name must specify unique languages." ); // No path is prepended as the error refers to the instance itself. ++index_; @@ -17107,7 +17107,7 @@ void OfFile::Execute() { } error_ = common::make_unique( - L"Description specifies no duplicate languages." + L"Description must specify unique languages." ); // No path is prepended as the error refers to the instance itself. ++index_; @@ -17148,7 +17148,7 @@ void OfFile::Execute() { } error_ = common::make_unique( - L"Display name specifies no duplicate languages." + L"Display name must specify unique languages." ); // No path is prepended as the error refers to the instance itself. ++index_; @@ -17769,7 +17769,7 @@ void OfAnnotatedRelationshipElement::Execute() { } error_ = common::make_unique( - L"Description specifies no duplicate languages." + L"Description must specify unique languages." ); // No path is prepended as the error refers to the instance itself. ++index_; @@ -17810,7 +17810,7 @@ void OfAnnotatedRelationshipElement::Execute() { } error_ = common::make_unique( - L"Display name specifies no duplicate languages." + L"Display name must specify unique languages." ); // No path is prepended as the error refers to the instance itself. ++index_; @@ -18353,7 +18353,7 @@ void OfEntity::Execute() { } error_ = common::make_unique( - L"Description specifies no duplicate languages." + L"Description must specify unique languages." ); // No path is prepended as the error refers to the instance itself. ++index_; @@ -18394,7 +18394,7 @@ void OfEntity::Execute() { } error_ = common::make_unique( - L"Display name specifies no duplicate languages." + L"Display name must specify unique languages." ); // No path is prepended as the error refers to the instance itself. ++index_; @@ -19468,7 +19468,7 @@ void OfBasicEventElement::Execute() { } error_ = common::make_unique( - L"Description specifies no duplicate languages." + L"Description must specify unique languages." ); // No path is prepended as the error refers to the instance itself. ++index_; @@ -19509,7 +19509,7 @@ void OfBasicEventElement::Execute() { } error_ = common::make_unique( - L"Display name specifies no duplicate languages." + L"Display name must specify unique languages." ); // No path is prepended as the error refers to the instance itself. ++index_; @@ -20281,7 +20281,7 @@ void OfOperation::Execute() { } error_ = common::make_unique( - L"Description specifies no duplicate languages." + L"Description must specify unique languages." ); // No path is prepended as the error refers to the instance itself. ++index_; @@ -20322,7 +20322,7 @@ void OfOperation::Execute() { } error_ = common::make_unique( - L"Display name specifies no duplicate languages." + L"Display name must specify unique languages." ); // No path is prepended as the error refers to the instance itself. ++index_; @@ -21115,7 +21115,7 @@ void OfCapability::Execute() { } error_ = common::make_unique( - L"Description specifies no duplicate languages." + L"Description must specify unique languages." ); // No path is prepended as the error refers to the instance itself. ++index_; @@ -21156,7 +21156,7 @@ void OfCapability::Execute() { } error_ = common::make_unique( - L"Display name specifies no duplicate languages." + L"Display name must specify unique languages." ); // No path is prepended as the error refers to the instance itself. ++index_; @@ -21652,7 +21652,7 @@ void OfConceptDescription::Execute() { } error_ = common::make_unique( - L"Description specifies no duplicate languages." + L"Description must specify unique languages." ); // No path is prepended as the error refers to the instance itself. ++index_; @@ -21693,7 +21693,7 @@ void OfConceptDescription::Execute() { } error_ = common::make_unique( - L"Display name specifies no duplicate languages." + L"Display name must specify unique languages." ); // No path is prepended as the error refers to the instance itself. ++index_; @@ -24452,7 +24452,7 @@ void OfLangStringPreferredNameTypeIec61360::Execute() { } error_ = common::make_unique( - L"String shall have a maximum length of 1023 characters." + L"String shall have a maximum length of 255 characters." ); // No path is prepended as the error refers to the instance itself. ++index_; @@ -24767,7 +24767,7 @@ void OfLangStringShortNameTypeIec61360::Execute() { } error_ = common::make_unique( - L"String shall have a maximum length of 1023 characters." + L"String shall have a maximum length of 18 characters." ); // No path is prepended as the error refers to the instance itself. ++index_; @@ -25473,7 +25473,7 @@ void OfDataSpecificationIec61360::Execute() { } error_ = common::make_unique( - L"Definition specifies no duplicate languages." + L"Definition must specify unique languages." ); // No path is prepended as the error refers to the instance itself. ++index_; @@ -25513,7 +25513,7 @@ void OfDataSpecificationIec61360::Execute() { } error_ = common::make_unique( - L"Short name specifies no duplicate languages." + L"Short name must specify unique languages." ); // No path is prepended as the error refers to the instance itself. ++index_; @@ -25549,7 +25549,7 @@ void OfDataSpecificationIec61360::Execute() { } error_ = common::make_unique( - L"Preferred name specifies no duplicate languages." + L"Preferred name must specify unique languages." ); // No path is prepended as the error refers to the instance itself. ++index_; diff --git a/test_data/csharp/test_main/aas_core_meta.v3/expected_output/types.cs b/test_data/csharp/test_main/aas_core_meta.v3/expected_output/types.cs index 032b00be8..064c2e69c 100644 --- a/test_data/csharp/test_main/aas_core_meta.v3/expected_output/types.cs +++ b/test_data/csharp/test_main/aas_core_meta.v3/expected_output/types.cs @@ -3297,6 +3297,11 @@ public enum AasSubmodelElements /// identical to . /// ///
  • + /// Constraint AASd-120: + /// The of a being a direct child of a + /// shall not be specified. + ///
    • + ///
  • /// Constraint AASd-108: /// All first level child elements in a shall have /// the same submodel element type as specified in . @@ -3386,6 +3391,11 @@ public interface ISubmodelElementList : ISubmodelElement /// identical to . ///
    • ///
  • + /// Constraint AASd-120: + /// The of a being a direct child of a + /// shall not be specified. + ///
    • + ///
  • /// Constraint AASd-108: /// All first level child elements in a shall have /// the same submodel element type as specified in . diff --git a/test_data/csharp/test_main/aas_core_meta.v3/expected_output/verification.cs b/test_data/csharp/test_main/aas_core_meta.v3/expected_output/verification.cs index 096fcf7ec..2c746cd8c 100644 --- a/test_data/csharp/test_main/aas_core_meta.v3/expected_output/verification.cs +++ b/test_data/csharp/test_main/aas_core_meta.v3/expected_output/verification.cs @@ -3007,7 +3007,7 @@ Aas.IAssetAdministrationShell that { yield return new Reporting.Error( "Invariant violated:\n" + - "Description specifies no duplicate languages."); + "Description must specify unique languages."); } if (!( @@ -3026,7 +3026,7 @@ Aas.IAssetAdministrationShell that { yield return new Reporting.Error( "Invariant violated:\n" + - "Display name specifies no duplicate languages."); + "Display name must specify unique languages."); } if (!( @@ -3498,7 +3498,7 @@ Aas.ISubmodel that { yield return new Reporting.Error( "Invariant violated:\n" + - "Description specifies no duplicate languages."); + "Description must specify unique languages."); } if (!( @@ -3517,7 +3517,7 @@ Aas.ISubmodel that { yield return new Reporting.Error( "Invariant violated:\n" + - "Display name specifies no duplicate languages."); + "Display name must specify unique languages."); } if (!( @@ -3887,7 +3887,7 @@ Aas.IRelationshipElement that { yield return new Reporting.Error( "Invariant violated:\n" + - "Description specifies no duplicate languages."); + "Description must specify unique languages."); } if (!( @@ -3906,7 +3906,7 @@ Aas.IRelationshipElement that { yield return new Reporting.Error( "Invariant violated:\n" + - "Display name specifies no duplicate languages."); + "Display name must specify unique languages."); } if (!( @@ -4162,7 +4162,7 @@ Aas.ISubmodelElementList that { yield return new Reporting.Error( "Invariant violated:\n" + - "Description specifies no duplicate languages."); + "Description must specify unique languages."); } if (!( @@ -4181,7 +4181,7 @@ Aas.ISubmodelElementList that { yield return new Reporting.Error( "Invariant violated:\n" + - "Display name specifies no duplicate languages."); + "Display name must specify unique languages."); } if (!( @@ -4561,7 +4561,7 @@ Aas.ISubmodelElementCollection that { yield return new Reporting.Error( "Invariant violated:\n" + - "Description specifies no duplicate languages."); + "Description must specify unique languages."); } if (!( @@ -4580,7 +4580,7 @@ Aas.ISubmodelElementCollection that { yield return new Reporting.Error( "Invariant violated:\n" + - "Display name specifies no duplicate languages."); + "Display name must specify unique languages."); } if (!( @@ -4872,7 +4872,7 @@ Aas.IProperty that { yield return new Reporting.Error( "Invariant violated:\n" + - "Description specifies no duplicate languages."); + "Description must specify unique languages."); } if (!( @@ -4891,7 +4891,7 @@ Aas.IProperty that { yield return new Reporting.Error( "Invariant violated:\n" + - "Display name specifies no duplicate languages."); + "Display name must specify unique languages."); } if (!( @@ -5181,7 +5181,7 @@ Aas.IMultiLanguageProperty that { yield return new Reporting.Error( "Invariant violated:\n" + - "Description specifies no duplicate languages."); + "Description must specify unique languages."); } if (!( @@ -5200,7 +5200,7 @@ Aas.IMultiLanguageProperty that { yield return new Reporting.Error( "Invariant violated:\n" + - "Display name specifies no duplicate languages."); + "Display name must specify unique languages."); } if (!( @@ -5269,7 +5269,7 @@ Aas.IMultiLanguageProperty that { yield return new Reporting.Error( "Invariant violated:\n" + - "Value specifies no duplicate languages."); + "Value must specify unique languages."); } if (!( @@ -5499,7 +5499,7 @@ Aas.IRange that { yield return new Reporting.Error( "Invariant violated:\n" + - "Description specifies no duplicate languages."); + "Description must specify unique languages."); } if (!( @@ -5518,7 +5518,7 @@ Aas.IRange that { yield return new Reporting.Error( "Invariant violated:\n" + - "Display name specifies no duplicate languages."); + "Display name must specify unique languages."); } if (!( @@ -5817,7 +5817,7 @@ Aas.IReferenceElement that { yield return new Reporting.Error( "Invariant violated:\n" + - "Description specifies no duplicate languages."); + "Description must specify unique languages."); } if (!( @@ -5836,7 +5836,7 @@ Aas.IReferenceElement that { yield return new Reporting.Error( "Invariant violated:\n" + - "Display name specifies no duplicate languages."); + "Display name must specify unique languages."); } if (!( @@ -6098,7 +6098,7 @@ Aas.IBlob that { yield return new Reporting.Error( "Invariant violated:\n" + - "Description specifies no duplicate languages."); + "Description must specify unique languages."); } if (!( @@ -6117,7 +6117,7 @@ Aas.IBlob that { yield return new Reporting.Error( "Invariant violated:\n" + - "Display name specifies no duplicate languages."); + "Display name must specify unique languages."); } if (!( @@ -6387,7 +6387,7 @@ Aas.IFile that { yield return new Reporting.Error( "Invariant violated:\n" + - "Description specifies no duplicate languages."); + "Description must specify unique languages."); } if (!( @@ -6406,7 +6406,7 @@ Aas.IFile that { yield return new Reporting.Error( "Invariant violated:\n" + - "Display name specifies no duplicate languages."); + "Display name must specify unique languages."); } if (!( @@ -6676,7 +6676,7 @@ Aas.IAnnotatedRelationshipElement that { yield return new Reporting.Error( "Invariant violated:\n" + - "Description specifies no duplicate languages."); + "Description must specify unique languages."); } if (!( @@ -6695,7 +6695,7 @@ Aas.IAnnotatedRelationshipElement that { yield return new Reporting.Error( "Invariant violated:\n" + - "Display name specifies no duplicate languages."); + "Display name must specify unique languages."); } if (!( @@ -6995,7 +6995,7 @@ Aas.IEntity that { yield return new Reporting.Error( "Invariant violated:\n" + - "Description specifies no duplicate languages."); + "Description must specify unique languages."); } if (!( @@ -7014,7 +7014,7 @@ Aas.IEntity that { yield return new Reporting.Error( "Invariant violated:\n" + - "Display name specifies no duplicate languages."); + "Display name must specify unique languages."); } if (!( @@ -7476,7 +7476,7 @@ Aas.IBasicEventElement that { yield return new Reporting.Error( "Invariant violated:\n" + - "Description specifies no duplicate languages."); + "Description must specify unique languages."); } if (!( @@ -7495,7 +7495,7 @@ Aas.IBasicEventElement that { yield return new Reporting.Error( "Invariant violated:\n" + - "Display name specifies no duplicate languages."); + "Display name must specify unique languages."); } if (!( @@ -7840,7 +7840,7 @@ Aas.IOperation that { yield return new Reporting.Error( "Invariant violated:\n" + - "Description specifies no duplicate languages."); + "Description must specify unique languages."); } if (!( @@ -7859,7 +7859,7 @@ Aas.IOperation that { yield return new Reporting.Error( "Invariant violated:\n" + - "Display name specifies no duplicate languages."); + "Display name must specify unique languages."); } if (!( @@ -8222,7 +8222,7 @@ Aas.ICapability that { yield return new Reporting.Error( "Invariant violated:\n" + - "Description specifies no duplicate languages."); + "Description must specify unique languages."); } if (!( @@ -8241,7 +8241,7 @@ Aas.ICapability that { yield return new Reporting.Error( "Invariant violated:\n" + - "Display name specifies no duplicate languages."); + "Display name must specify unique languages."); } if (!( @@ -8481,7 +8481,7 @@ Aas.IConceptDescription that { yield return new Reporting.Error( "Invariant violated:\n" + - "Description specifies no duplicate languages."); + "Description must specify unique languages."); } if (!( @@ -8500,7 +8500,7 @@ Aas.IConceptDescription that { yield return new Reporting.Error( "Invariant violated:\n" + - "Display name specifies no duplicate languages."); + "Display name must specify unique languages."); } if (!( @@ -9197,7 +9197,7 @@ Aas.ILangStringPreferredNameTypeIec61360 that { yield return new Reporting.Error( "Invariant violated:\n" + - "String shall have a maximum length of 1023 characters."); + "String shall have a maximum length of 255 characters."); } foreach (var error in Verification.VerifyBcp47LanguageTag(that.Language)) @@ -9228,7 +9228,7 @@ Aas.ILangStringShortNameTypeIec61360 that { yield return new Reporting.Error( "Invariant violated:\n" + - "String shall have a maximum length of 1023 characters."); + "String shall have a maximum length of 18 characters."); } foreach (var error in Verification.VerifyBcp47LanguageTag(that.Language)) @@ -9328,7 +9328,7 @@ Aas.IDataSpecificationIec61360 that { yield return new Reporting.Error( "Invariant violated:\n" + - "Definition specifies no duplicate languages."); + "Definition must specify unique languages."); } if (!( @@ -9346,7 +9346,7 @@ Aas.IDataSpecificationIec61360 that { yield return new Reporting.Error( "Invariant violated:\n" + - "Short name specifies no duplicate languages."); + "Short name must specify unique languages."); } if (!(that.PreferredName.Count >= 1)) @@ -9361,7 +9361,7 @@ Aas.IDataSpecificationIec61360 that { yield return new Reporting.Error( "Invariant violated:\n" + - "Preferred name specifies no duplicate languages."); + "Preferred name must specify unique languages."); } if (!( diff --git a/test_data/golang/test_main/aas_core_meta.v3/expected_output/types/types.go b/test_data/golang/test_main/aas_core_meta.v3/expected_output/types/types.go index 0531e055a..dec9d69c3 100644 --- a/test_data/golang/test_main/aas_core_meta.v3/expected_output/types/types.go +++ b/test_data/golang/test_main/aas_core_meta.v3/expected_output/types/types.go @@ -3543,6 +3543,10 @@ var LiteralsOfAASSubmodelElements = [...]AASSubmodelElements { // specify a [IHasSemantics.SemanticID] then the value is assumed to be // identical to [ISubmodelElementList.SemanticIDListElement]. // +// Constraint AASd-120: +// The [ISubmodelElementList.IDShort] of a [ISubmodelElement] being a direct child of a +// [ISubmodelElementList] shall not be specified. +// // Constraint AASd-108: // All first level child elements in a [ISubmodelElementList] shall have // the same submodel element type as specified in [ISubmodelElementList.TypeValueListElement]. diff --git a/test_data/golang/test_main/aas_core_meta.v3/expected_output/verification/verification.go b/test_data/golang/test_main/aas_core_meta.v3/expected_output/verification/verification.go index dda742190..e1d0d26e3 100644 --- a/test_data/golang/test_main/aas_core_meta.v3/expected_output/verification/verification.go +++ b/test_data/golang/test_main/aas_core_meta.v3/expected_output/verification/verification.go @@ -3347,7 +3347,7 @@ func VerifyAssetAdministrationShell( LangStringsHaveUniqueLanguages(that.Description())) { abort = onError( newVerificationError( - "Description specifies no duplicate languages.",), + "Description must specify unique languages.",), ) if abort { return @@ -3373,7 +3373,7 @@ func VerifyAssetAdministrationShell( LangStringsHaveUniqueLanguages(that.DisplayName())) { abort = onError( newVerificationError( - "Display name specifies no duplicate languages.",), + "Display name must specify unique languages.",), ) if abort { return @@ -4102,7 +4102,7 @@ func VerifySubmodel( LangStringsHaveUniqueLanguages(that.Description())) { abort = onError( newVerificationError( - "Description specifies no duplicate languages.",), + "Description must specify unique languages.",), ) if abort { return @@ -4128,7 +4128,7 @@ func VerifySubmodel( LangStringsHaveUniqueLanguages(that.DisplayName())) { abort = onError( newVerificationError( - "Display name specifies no duplicate languages.",), + "Display name must specify unique languages.",), ) if abort { return @@ -4652,7 +4652,7 @@ func VerifyRelationshipElement( LangStringsHaveUniqueLanguages(that.Description())) { abort = onError( newVerificationError( - "Description specifies no duplicate languages.",), + "Description must specify unique languages.",), ) if abort { return @@ -4678,7 +4678,7 @@ func VerifyRelationshipElement( LangStringsHaveUniqueLanguages(that.DisplayName())) { abort = onError( newVerificationError( - "Display name specifies no duplicate languages.",), + "Display name must specify unique languages.",), ) if abort { return @@ -5072,7 +5072,7 @@ func VerifySubmodelElementList( LangStringsHaveUniqueLanguages(that.Description())) { abort = onError( newVerificationError( - "Description specifies no duplicate languages.",), + "Description must specify unique languages.",), ) if abort { return @@ -5098,7 +5098,7 @@ func VerifySubmodelElementList( LangStringsHaveUniqueLanguages(that.DisplayName())) { abort = onError( newVerificationError( - "Display name specifies no duplicate languages.",), + "Display name must specify unique languages.",), ) if abort { return @@ -5643,7 +5643,7 @@ func VerifySubmodelElementCollection( LangStringsHaveUniqueLanguages(that.Description())) { abort = onError( newVerificationError( - "Description specifies no duplicate languages.",), + "Description must specify unique languages.",), ) if abort { return @@ -5669,7 +5669,7 @@ func VerifySubmodelElementCollection( LangStringsHaveUniqueLanguages(that.DisplayName())) { abort = onError( newVerificationError( - "Display name specifies no duplicate languages.",), + "Display name must specify unique languages.",), ) if abort { return @@ -6082,7 +6082,7 @@ func VerifyProperty( LangStringsHaveUniqueLanguages(that.Description())) { abort = onError( newVerificationError( - "Description specifies no duplicate languages.",), + "Description must specify unique languages.",), ) if abort { return @@ -6108,7 +6108,7 @@ func VerifyProperty( LangStringsHaveUniqueLanguages(that.DisplayName())) { abort = onError( newVerificationError( - "Display name specifies no duplicate languages.",), + "Display name must specify unique languages.",), ) if abort { return @@ -6537,7 +6537,7 @@ func VerifyMultiLanguageProperty( LangStringsHaveUniqueLanguages(that.Description())) { abort = onError( newVerificationError( - "Description specifies no duplicate languages.",), + "Description must specify unique languages.",), ) if abort { return @@ -6563,7 +6563,7 @@ func VerifyMultiLanguageProperty( LangStringsHaveUniqueLanguages(that.DisplayName())) { abort = onError( newVerificationError( - "Display name specifies no duplicate languages.",), + "Display name must specify unique languages.",), ) if abort { return @@ -6661,7 +6661,7 @@ func VerifyMultiLanguageProperty( LangStringsHaveUniqueLanguages(that.Value())) { abort = onError( newVerificationError( - "Value specifies no duplicate languages.",), + "Value must specify unique languages.",), ) if abort { return @@ -6990,7 +6990,7 @@ func VerifyRange( LangStringsHaveUniqueLanguages(that.Description())) { abort = onError( newVerificationError( - "Description specifies no duplicate languages.",), + "Description must specify unique languages.",), ) if abort { return @@ -7016,7 +7016,7 @@ func VerifyRange( LangStringsHaveUniqueLanguages(that.DisplayName())) { abort = onError( newVerificationError( - "Display name specifies no duplicate languages.",), + "Display name must specify unique languages.",), ) if abort { return @@ -7460,7 +7460,7 @@ func VerifyReferenceElement( LangStringsHaveUniqueLanguages(that.Description())) { abort = onError( newVerificationError( - "Description specifies no duplicate languages.",), + "Description must specify unique languages.",), ) if abort { return @@ -7486,7 +7486,7 @@ func VerifyReferenceElement( LangStringsHaveUniqueLanguages(that.DisplayName())) { abort = onError( newVerificationError( - "Display name specifies no duplicate languages.",), + "Display name must specify unique languages.",), ) if abort { return @@ -7863,7 +7863,7 @@ func VerifyBlob( LangStringsHaveUniqueLanguages(that.Description())) { abort = onError( newVerificationError( - "Description specifies no duplicate languages.",), + "Description must specify unique languages.",), ) if abort { return @@ -7889,7 +7889,7 @@ func VerifyBlob( LangStringsHaveUniqueLanguages(that.DisplayName())) { abort = onError( newVerificationError( - "Display name specifies no duplicate languages.",), + "Display name must specify unique languages.",), ) if abort { return @@ -8281,7 +8281,7 @@ func VerifyFile( LangStringsHaveUniqueLanguages(that.Description())) { abort = onError( newVerificationError( - "Description specifies no duplicate languages.",), + "Description must specify unique languages.",), ) if abort { return @@ -8307,7 +8307,7 @@ func VerifyFile( LangStringsHaveUniqueLanguages(that.DisplayName())) { abort = onError( newVerificationError( - "Display name specifies no duplicate languages.",), + "Display name must specify unique languages.",), ) if abort { return @@ -8699,7 +8699,7 @@ func VerifyAnnotatedRelationshipElement( LangStringsHaveUniqueLanguages(that.Description())) { abort = onError( newVerificationError( - "Description specifies no duplicate languages.",), + "Description must specify unique languages.",), ) if abort { return @@ -8725,7 +8725,7 @@ func VerifyAnnotatedRelationshipElement( LangStringsHaveUniqueLanguages(that.DisplayName())) { abort = onError( newVerificationError( - "Display name specifies no duplicate languages.",), + "Display name must specify unique languages.",), ) if abort { return @@ -9180,7 +9180,7 @@ func VerifyEntity( LangStringsHaveUniqueLanguages(that.Description())) { abort = onError( newVerificationError( - "Description specifies no duplicate languages.",), + "Description must specify unique languages.",), ) if abort { return @@ -9206,7 +9206,7 @@ func VerifyEntity( LangStringsHaveUniqueLanguages(that.DisplayName())) { abort = onError( newVerificationError( - "Display name specifies no duplicate languages.",), + "Display name must specify unique languages.",), ) if abort { return @@ -9906,7 +9906,7 @@ func VerifyBasicEventElement( LangStringsHaveUniqueLanguages(that.Description())) { abort = onError( newVerificationError( - "Description specifies no duplicate languages.",), + "Description must specify unique languages.",), ) if abort { return @@ -9932,7 +9932,7 @@ func VerifyBasicEventElement( LangStringsHaveUniqueLanguages(that.DisplayName())) { abort = onError( newVerificationError( - "Display name specifies no duplicate languages.",), + "Display name must specify unique languages.",), ) if abort { return @@ -10459,7 +10459,7 @@ func VerifyOperation( LangStringsHaveUniqueLanguages(that.Description())) { abort = onError( newVerificationError( - "Description specifies no duplicate languages.",), + "Description must specify unique languages.",), ) if abort { return @@ -10485,7 +10485,7 @@ func VerifyOperation( LangStringsHaveUniqueLanguages(that.DisplayName())) { abort = onError( newVerificationError( - "Display name specifies no duplicate languages.",), + "Display name must specify unique languages.",), ) if abort { return @@ -11019,7 +11019,7 @@ func VerifyCapability( LangStringsHaveUniqueLanguages(that.Description())) { abort = onError( newVerificationError( - "Description specifies no duplicate languages.",), + "Description must specify unique languages.",), ) if abort { return @@ -11045,7 +11045,7 @@ func VerifyCapability( LangStringsHaveUniqueLanguages(that.DisplayName())) { abort = onError( newVerificationError( - "Display name specifies no duplicate languages.",), + "Display name must specify unique languages.",), ) if abort { return @@ -11387,7 +11387,7 @@ func VerifyConceptDescription( LangStringsHaveUniqueLanguages(that.Description())) { abort = onError( newVerificationError( - "Description specifies no duplicate languages.",), + "Description must specify unique languages.",), ) if abort { return @@ -11413,7 +11413,7 @@ func VerifyConceptDescription( LangStringsHaveUniqueLanguages(that.DisplayName())) { abort = onError( newVerificationError( - "Display name specifies no duplicate languages.",), + "Display name must specify unique languages.",), ) if abort { return @@ -12528,7 +12528,7 @@ func VerifyLangStringPreferredNameTypeIEC61360( if !(len(that.Text()) <= 255) { abort = onError( newVerificationError( - "String shall have a maximum length of 1023 characters.",), + "String shall have a maximum length of 255 characters.",), ) if abort { return @@ -12583,7 +12583,7 @@ func VerifyLangStringShortNameTypeIEC61360( if !(len(that.Text()) <= 18) { abort = onError( newVerificationError( - "String shall have a maximum length of 1023 characters.",), + "String shall have a maximum length of 18 characters.",), ) if abort { return @@ -12741,7 +12741,7 @@ func VerifyDataSpecificationIEC61360( LangStringsHaveUniqueLanguages(that.Definition())) { abort = onError( newVerificationError( - "Definition specifies no duplicate languages.",), + "Definition must specify unique languages.",), ) if abort { return @@ -12765,7 +12765,7 @@ func VerifyDataSpecificationIEC61360( LangStringsHaveUniqueLanguages(that.ShortName())) { abort = onError( newVerificationError( - "Short name specifies no duplicate languages.",), + "Short name must specify unique languages.",), ) if abort { return @@ -12786,7 +12786,7 @@ func VerifyDataSpecificationIEC61360( LangStringsHaveUniqueLanguages(that.PreferredName())) { abort = onError( newVerificationError( - "Preferred name specifies no duplicate languages.",), + "Preferred name must specify unique languages.",), ) if abort { return diff --git a/test_data/intermediate/real_meta_models/aas_core_meta.v3/expected_symbol_table.txt b/test_data/intermediate/real_meta_models/aas_core_meta.v3/expected_symbol_table.txt index 24c74223c..d8b51d857 100644 Binary files a/test_data/intermediate/real_meta_models/aas_core_meta.v3/expected_symbol_table.txt and b/test_data/intermediate/real_meta_models/aas_core_meta.v3/expected_symbol_table.txt differ diff --git a/test_data/jsonld_context/aas_core_meta.v3/output/context.jsonld b/test_data/jsonld_context/aas_core_meta.v3/output/context.jsonld new file mode 100644 index 000000000..c30d78e07 --- /dev/null +++ b/test_data/jsonld_context/aas_core_meta.v3/output/context.jsonld @@ -0,0 +1,1487 @@ +{ + "aas": "https://admin-shell.io/aas/3/0/", + "xs": "http://www.w3.org/2001/XMLSchema#", + "@vocab": "https://admin-shell.io/aas/3/0/", + "modelType": "@type", + "semanticId": { + "@id": "aas:HasSemantics/semanticId", + "@type": "@id", + "@context": { + "type": { + "@id": "aas:Reference/type", + "@context": { + "@vocab": "aas:ReferenceTypes/" + }, + "@type": "@vocab" + } + } + }, + "supplementalSemanticIds": { + "@id": "aas:HasSemantics/supplementalSemanticIds", + "@container": "@set", + "@type": "@id", + "@context": { + "type": { + "@id": "aas:Reference/type", + "@context": { + "@vocab": "aas:ReferenceTypes/" + }, + "@type": "@vocab" + } + } + }, + "refersTo": { + "@id": "aas:Extension/refersTo", + "@container": "@set", + "@type": "@id", + "@context": { + "type": { + "@id": "aas:Reference/type", + "@context": { + "@vocab": "aas:ReferenceTypes/" + }, + "@type": "@vocab" + } + } + }, + "extensions": { + "@id": "aas:HasExtensions/extensions", + "@container": "@set", + "@type": "@id", + "@context": { + "name": { + "@id": "aas:Extension/name" + }, + "valueType": { + "@id": "aas:Extension/valueType", + "@context": { + "@vocab": "aas:DataTypeDefXsd/" + }, + "@type": "@vocab" + }, + "value": { + "@id": "aas:Extension/value" + } + } + }, + "category": { + "@id": "aas:Referable/category" + }, + "idShort": { + "@id": "aas:Referable/idShort" + }, + "displayName": { + "@id": "aas:Referable/displayName", + "@container": "@set", + "@type": "@id", + "@context": {} + }, + "description": { + "@id": "aas:Referable/description", + "@container": "@set", + "@type": "@id", + "@context": {} + }, + "administration": { + "@id": "aas:Identifiable/administration", + "@type": "@id", + "@context": {} + }, + "id": { + "@id": "aas:Identifiable/id" + }, + "embeddedDataSpecifications": { + "@id": "aas:HasDataSpecification/embeddedDataSpecifications", + "@container": "@set", + "@type": "@id", + "@context": {} + }, + "version": { + "@id": "aas:AdministrativeInformation/version" + }, + "revision": { + "@id": "aas:AdministrativeInformation/revision" + }, + "creator": { + "@id": "aas:AdministrativeInformation/creator", + "@type": "@id", + "@context": { + "type": { + "@id": "aas:Reference/type", + "@context": { + "@vocab": "aas:ReferenceTypes/" + }, + "@type": "@vocab" + } + } + }, + "templateId": { + "@id": "aas:AdministrativeInformation/templateId" + }, + "qualifiers": { + "@id": "aas:Qualifiable/qualifiers", + "@container": "@set", + "@type": "@id", + "@context": { + "kind": { + "@id": "aas:Qualifier/kind", + "@context": { + "@vocab": "aas:QualifierKind/" + }, + "@type": "@vocab" + }, + "type": { + "@id": "aas:Qualifier/type" + }, + "valueType": { + "@id": "aas:Qualifier/valueType", + "@context": { + "@vocab": "aas:DataTypeDefXsd/" + }, + "@type": "@vocab" + }, + "value": { + "@id": "aas:Qualifier/value" + }, + "valueId": { + "@id": "aas:Qualifier/valueId", + "@type": "@id", + "@context": { + "type": { + "@id": "aas:Reference/type", + "@context": { + "@vocab": "aas:ReferenceTypes/" + }, + "@type": "@vocab" + } + } + } + } + }, + "derivedFrom": { + "@id": "aas:AssetAdministrationShell/derivedFrom", + "@type": "@id", + "@context": { + "type": { + "@id": "aas:Reference/type", + "@context": { + "@vocab": "aas:ReferenceTypes/" + }, + "@type": "@vocab" + } + } + }, + "assetInformation": { + "@id": "aas:AssetAdministrationShell/assetInformation", + "@type": "@id", + "@context": { + "globalAssetId": { + "@id": "aas:AssetInformation/globalAssetId" + }, + "specificAssetIds": { + "@id": "aas:AssetInformation/specificAssetIds", + "@container": "@set", + "@type": "@id", + "@context": { + "name": { + "@id": "aas:SpecificAssetId/name" + }, + "value": { + "@id": "aas:SpecificAssetId/value" + } + } + } + } + }, + "assetKind": { + "@id": "aas:AssetInformation/assetKind", + "@context": { + "@vocab": "aas:AssetKind/" + }, + "@type": "@vocab" + }, + "assetType": { + "@id": "aas:AssetInformation/assetType" + }, + "defaultThumbnail": { + "@id": "aas:AssetInformation/defaultThumbnail", + "@type": "@id", + "@context": { + "contentType": { + "@id": "aas:Resource/contentType" + } + } + }, + "path": { + "@id": "aas:Resource/path" + }, + "externalSubjectId": { + "@id": "aas:SpecificAssetId/externalSubjectId", + "@type": "@id", + "@context": { + "type": { + "@id": "aas:Reference/type", + "@context": { + "@vocab": "aas:ReferenceTypes/" + }, + "@type": "@vocab" + } + } + }, + "submodelElements": { + "@id": "aas:Submodel/submodelElements", + "@container": "@set", + "@type": "@id", + "@context": {} + }, + "first": { + "@id": "aas:RelationshipElement/first", + "@type": "@id", + "@context": { + "type": { + "@id": "aas:Reference/type", + "@context": { + "@vocab": "aas:ReferenceTypes/" + }, + "@type": "@vocab" + } + } + }, + "second": { + "@id": "aas:RelationshipElement/second", + "@type": "@id", + "@context": { + "type": { + "@id": "aas:Reference/type", + "@context": { + "@vocab": "aas:ReferenceTypes/" + }, + "@type": "@vocab" + } + } + }, + "orderRelevant": { + "@id": "aas:SubmodelElementList/orderRelevant" + }, + "semanticIdListElement": { + "@id": "aas:SubmodelElementList/semanticIdListElement", + "@type": "@id", + "@context": { + "type": { + "@id": "aas:Reference/type", + "@context": { + "@vocab": "aas:ReferenceTypes/" + }, + "@type": "@vocab" + } + } + }, + "typeValueListElement": { + "@id": "aas:SubmodelElementList/typeValueListElement", + "@context": { + "@vocab": "aas:AasSubmodelElements/", + "AnnotatedRelationshipElement": { + "@id": "aas:AasSubmodelElements/AnnotatedRelationshipElement" + }, + "BasicEventElement": { + "@id": "aas:AasSubmodelElements/BasicEventElement" + }, + "Blob": { + "@id": "aas:AasSubmodelElements/Blob" + }, + "Capability": { + "@id": "aas:AasSubmodelElements/Capability" + }, + "DataElement": { + "@id": "aas:AasSubmodelElements/DataElement" + }, + "Entity": { + "@id": "aas:AasSubmodelElements/Entity" + }, + "EventElement": { + "@id": "aas:AasSubmodelElements/EventElement" + }, + "File": { + "@id": "aas:AasSubmodelElements/File" + }, + "MultiLanguageProperty": { + "@id": "aas:AasSubmodelElements/MultiLanguageProperty" + }, + "Operation": { + "@id": "aas:AasSubmodelElements/Operation" + }, + "Property": { + "@id": "aas:AasSubmodelElements/Property" + }, + "Range": { + "@id": "aas:AasSubmodelElements/Range" + }, + "ReferenceElement": { + "@id": "aas:AasSubmodelElements/ReferenceElement" + }, + "RelationshipElement": { + "@id": "aas:AasSubmodelElements/RelationshipElement" + }, + "SubmodelElement": { + "@id": "aas:AasSubmodelElements/SubmodelElement" + }, + "SubmodelElementList": { + "@id": "aas:AasSubmodelElements/SubmodelElementList" + }, + "SubmodelElementCollection": { + "@id": "aas:AasSubmodelElements/SubmodelElementCollection" + } + }, + "@type": "@vocab" + }, + "valueTypeListElement": { + "@id": "aas:SubmodelElementList/valueTypeListElement", + "@context": { + "@vocab": "aas:DataTypeDefXsd/" + }, + "@type": "@vocab" + }, + "annotations": { + "@id": "aas:AnnotatedRelationshipElement/annotations", + "@container": "@set", + "@type": "@id", + "@context": {} + }, + "statements": { + "@id": "aas:Entity/statements", + "@container": "@set", + "@type": "@id", + "@context": {} + }, + "entityType": { + "@id": "aas:Entity/entityType", + "@context": { + "@vocab": "aas:EntityType/" + }, + "@type": "@vocab" + }, + "source": { + "@id": "aas:EventPayload/source", + "@type": "@id", + "@context": { + "type": { + "@id": "aas:Reference/type", + "@context": { + "@vocab": "aas:ReferenceTypes/" + }, + "@type": "@vocab" + } + } + }, + "sourceSemanticId": { + "@id": "aas:EventPayload/sourceSemanticId", + "@type": "@id", + "@context": { + "type": { + "@id": "aas:Reference/type", + "@context": { + "@vocab": "aas:ReferenceTypes/" + }, + "@type": "@vocab" + } + } + }, + "observableReference": { + "@id": "aas:EventPayload/observableReference", + "@type": "@id", + "@context": { + "type": { + "@id": "aas:Reference/type", + "@context": { + "@vocab": "aas:ReferenceTypes/" + }, + "@type": "@vocab" + } + } + }, + "observableSemanticId": { + "@id": "aas:EventPayload/observableSemanticId", + "@type": "@id", + "@context": { + "type": { + "@id": "aas:Reference/type", + "@context": { + "@vocab": "aas:ReferenceTypes/" + }, + "@type": "@vocab" + } + } + }, + "topic": { + "@id": "aas:EventPayload/topic" + }, + "subjectId": { + "@id": "aas:EventPayload/subjectId", + "@type": "@id", + "@context": { + "type": { + "@id": "aas:Reference/type", + "@context": { + "@vocab": "aas:ReferenceTypes/" + }, + "@type": "@vocab" + } + } + }, + "timeStamp": { + "@id": "aas:EventPayload/timeStamp" + }, + "payload": { + "@id": "aas:EventPayload/payload", + "@type": "xs:base64Binary" + }, + "observed": { + "@id": "aas:BasicEventElement/observed", + "@type": "@id", + "@context": { + "type": { + "@id": "aas:Reference/type", + "@context": { + "@vocab": "aas:ReferenceTypes/" + }, + "@type": "@vocab" + } + } + }, + "direction": { + "@id": "aas:BasicEventElement/direction", + "@context": { + "@vocab": "aas:Direction/", + "input": { + "@id": "aas:Direction/Input" + }, + "output": { + "@id": "aas:Direction/Output" + } + }, + "@type": "@vocab" + }, + "state": { + "@id": "aas:BasicEventElement/state", + "@context": { + "@vocab": "aas:StateOfEvent/", + "on": { + "@id": "aas:StateOfEvent/On" + }, + "off": { + "@id": "aas:StateOfEvent/Off" + } + }, + "@type": "@vocab" + }, + "messageTopic": { + "@id": "aas:BasicEventElement/messageTopic" + }, + "messageBroker": { + "@id": "aas:BasicEventElement/messageBroker", + "@type": "@id", + "@context": { + "type": { + "@id": "aas:Reference/type", + "@context": { + "@vocab": "aas:ReferenceTypes/" + }, + "@type": "@vocab" + } + } + }, + "lastUpdate": { + "@id": "aas:BasicEventElement/lastUpdate" + }, + "minInterval": { + "@id": "aas:BasicEventElement/minInterval" + }, + "maxInterval": { + "@id": "aas:BasicEventElement/maxInterval" + }, + "inputVariables": { + "@id": "aas:Operation/inputVariables", + "@container": "@set", + "@type": "@id", + "@context": { + "value": { + "@id": "aas:OperationVariable/value", + "@type": "@id", + "@context": {} + } + } + }, + "outputVariables": { + "@id": "aas:Operation/outputVariables", + "@container": "@set", + "@type": "@id", + "@context": { + "value": { + "@id": "aas:OperationVariable/value", + "@type": "@id", + "@context": {} + } + } + }, + "inoutputVariables": { + "@id": "aas:Operation/inoutputVariables", + "@container": "@set", + "@type": "@id", + "@context": { + "value": { + "@id": "aas:OperationVariable/value", + "@type": "@id", + "@context": {} + } + } + }, + "isCaseOf": { + "@id": "aas:ConceptDescription/isCaseOf", + "@container": "@set", + "@type": "@id", + "@context": { + "type": { + "@id": "aas:Reference/type", + "@context": { + "@vocab": "aas:ReferenceTypes/" + }, + "@type": "@vocab" + } + } + }, + "referredSemanticId": { + "@id": "aas:Reference/referredSemanticId", + "@type": "@id", + "@context": { + "type": { + "@id": "aas:Reference/type", + "@context": { + "@vocab": "aas:ReferenceTypes/" + }, + "@type": "@vocab" + } + } + }, + "keys": { + "@id": "aas:Reference/keys", + "@container": "@set", + "@type": "@id", + "@context": { + "type": { + "@id": "aas:Key/type", + "@context": { + "@vocab": "aas:KeyTypes/", + "AnnotatedRelationshipElement": { + "@id": "aas:KeyTypes/AnnotatedRelationshipElement" + }, + "AssetAdministrationShell": { + "@id": "aas:KeyTypes/AssetAdministrationShell" + }, + "BasicEventElement": { + "@id": "aas:KeyTypes/BasicEventElement" + }, + "Blob": { + "@id": "aas:KeyTypes/Blob" + }, + "Capability": { + "@id": "aas:KeyTypes/Capability" + }, + "ConceptDescription": { + "@id": "aas:KeyTypes/ConceptDescription" + }, + "DataElement": { + "@id": "aas:KeyTypes/DataElement" + }, + "Entity": { + "@id": "aas:KeyTypes/Entity" + }, + "EventElement": { + "@id": "aas:KeyTypes/EventElement" + }, + "File": { + "@id": "aas:KeyTypes/File" + }, + "Identifiable": { + "@id": "aas:KeyTypes/Identifiable" + }, + "MultiLanguageProperty": { + "@id": "aas:KeyTypes/MultiLanguageProperty" + }, + "Operation": { + "@id": "aas:KeyTypes/Operation" + }, + "Property": { + "@id": "aas:KeyTypes/Property" + }, + "Range": { + "@id": "aas:KeyTypes/Range" + }, + "Referable": { + "@id": "aas:KeyTypes/Referable" + }, + "ReferenceElement": { + "@id": "aas:KeyTypes/ReferenceElement" + }, + "RelationshipElement": { + "@id": "aas:KeyTypes/RelationshipElement" + }, + "Submodel": { + "@id": "aas:KeyTypes/Submodel" + }, + "SubmodelElement": { + "@id": "aas:KeyTypes/SubmodelElement" + }, + "SubmodelElementCollection": { + "@id": "aas:KeyTypes/SubmodelElementCollection" + }, + "SubmodelElementList": { + "@id": "aas:KeyTypes/SubmodelElementList" + } + }, + "@type": "@vocab" + }, + "value": { + "@id": "aas:Key/value" + } + } + }, + "language": { + "@id": "aas:AbstractLangString/language" + }, + "text": { + "@id": "aas:AbstractLangString/text" + }, + "assetAdministrationShells": { + "@id": "aas:Environment/assetAdministrationShells", + "@container": "@set", + "@type": "@id", + "@context": { + "submodels": { + "@id": "aas:AssetAdministrationShell/submodels", + "@container": "@set", + "@type": "@id", + "@context": { + "type": { + "@id": "aas:Reference/type", + "@context": { + "@vocab": "aas:ReferenceTypes/" + }, + "@type": "@vocab" + } + } + } + } + }, + "conceptDescriptions": { + "@id": "aas:Environment/conceptDescriptions", + "@container": "@set", + "@type": "@id", + "@context": {} + }, + "dataSpecification": { + "@id": "aas:EmbeddedDataSpecification/dataSpecification", + "@type": "@id", + "@context": { + "type": { + "@id": "aas:Reference/type", + "@context": { + "@vocab": "aas:ReferenceTypes/" + }, + "@type": "@vocab" + } + } + }, + "dataSpecificationContent": { + "@id": "aas:EmbeddedDataSpecification/dataSpecificationContent", + "@type": "@id", + "@context": {} + }, + "nom": { + "@id": "aas:LevelType/nom" + }, + "typ": { + "@id": "aas:LevelType/typ" + }, + "valueReferencePairs": { + "@id": "aas:ValueList/valueReferencePairs", + "@container": "@set", + "@type": "@id", + "@context": { + "value": { + "@id": "aas:ValueReferencePair/value" + }, + "valueId": { + "@id": "aas:ValueReferencePair/valueId", + "@type": "@id", + "@context": { + "type": { + "@id": "aas:Reference/type", + "@context": { + "@vocab": "aas:ReferenceTypes/" + }, + "@type": "@vocab" + } + } + } + } + }, + "preferredName": { + "@id": "aas:DataSpecificationIec61360/preferredName", + "@container": "@set", + "@type": "@id", + "@context": {} + }, + "shortName": { + "@id": "aas:DataSpecificationIec61360/shortName", + "@container": "@set", + "@type": "@id", + "@context": {} + }, + "unit": { + "@id": "aas:DataSpecificationIec61360/unit" + }, + "unitId": { + "@id": "aas:DataSpecificationIec61360/unitId", + "@type": "@id", + "@context": { + "type": { + "@id": "aas:Reference/type", + "@context": { + "@vocab": "aas:ReferenceTypes/" + }, + "@type": "@vocab" + } + } + }, + "sourceOfDefinition": { + "@id": "aas:DataSpecificationIec61360/sourceOfDefinition" + }, + "symbol": { + "@id": "aas:DataSpecificationIec61360/symbol" + }, + "dataType": { + "@id": "aas:DataSpecificationIec61360/dataType", + "@context": { + "@vocab": "aas:DataTypeIec61360/", + "DATE": { + "@id": "aas:DataTypeIec61360/Date" + }, + "STRING": { + "@id": "aas:DataTypeIec61360/String" + }, + "STRING_TRANSLATABLE": { + "@id": "aas:DataTypeIec61360/StringTranslatable" + }, + "INTEGER_MEASURE": { + "@id": "aas:DataTypeIec61360/IntegerMeasure" + }, + "INTEGER_COUNT": { + "@id": "aas:DataTypeIec61360/IntegerCount" + }, + "INTEGER_CURRENCY": { + "@id": "aas:DataTypeIec61360/IntegerCurrency" + }, + "REAL_MEASURE": { + "@id": "aas:DataTypeIec61360/RealMeasure" + }, + "REAL_COUNT": { + "@id": "aas:DataTypeIec61360/RealCount" + }, + "REAL_CURRENCY": { + "@id": "aas:DataTypeIec61360/RealCurrency" + }, + "BOOLEAN": { + "@id": "aas:DataTypeIec61360/Boolean" + }, + "IRI": { + "@id": "aas:DataTypeIec61360/Iri" + }, + "IRDI": { + "@id": "aas:DataTypeIec61360/Irdi" + }, + "RATIONAL": { + "@id": "aas:DataTypeIec61360/Rational" + }, + "RATIONAL_MEASURE": { + "@id": "aas:DataTypeIec61360/RationalMeasure" + }, + "TIME": { + "@id": "aas:DataTypeIec61360/Time" + }, + "TIMESTAMP": { + "@id": "aas:DataTypeIec61360/Timestamp" + }, + "FILE": { + "@id": "aas:DataTypeIec61360/File" + }, + "HTML": { + "@id": "aas:DataTypeIec61360/Html" + }, + "BLOB": { + "@id": "aas:DataTypeIec61360/Blob" + } + }, + "@type": "@vocab" + }, + "definition": { + "@id": "aas:DataSpecificationIec61360/definition", + "@container": "@set", + "@type": "@id", + "@context": {} + }, + "valueFormat": { + "@id": "aas:DataSpecificationIec61360/valueFormat" + }, + "valueList": { + "@id": "aas:DataSpecificationIec61360/valueList", + "@type": "@id", + "@context": {} + }, + "levelType": { + "@id": "aas:DataSpecificationIec61360/levelType", + "@type": "@id", + "@context": { + "min": { + "@id": "aas:LevelType/min" + }, + "max": { + "@id": "aas:LevelType/max" + } + } + }, + "HasSemantics": { + "@id": "HasSemantics", + "@context": { + "@vocab": "https://admin-shell.io/aas/3/0/HasSemantics/" + } + }, + "Extension": { + "@id": "Extension", + "@context": { + "@vocab": "https://admin-shell.io/aas/3/0/Extension/", + "name": { + "@id": "aas:Extension/name" + }, + "valueType": { + "@id": "aas:Extension/valueType", + "@context": { + "@vocab": "aas:DataTypeDefXsd/" + }, + "@type": "@vocab" + }, + "value": { + "@id": "aas:Extension/value" + } + } + }, + "HasExtensions": { + "@id": "HasExtensions", + "@context": { + "@vocab": "https://admin-shell.io/aas/3/0/HasExtensions/" + } + }, + "Referable": { + "@id": "Referable", + "@context": { + "@vocab": "https://admin-shell.io/aas/3/0/Referable/" + } + }, + "Identifiable": { + "@id": "Identifiable", + "@context": { + "@vocab": "https://admin-shell.io/aas/3/0/Identifiable/" + } + }, + "HasKind": { + "@id": "HasKind", + "@context": { + "@vocab": "https://admin-shell.io/aas/3/0/HasKind/", + "kind": { + "@id": "aas:HasKind/kind", + "@context": { + "@vocab": "aas:ModellingKind/" + }, + "@type": "@vocab" + } + } + }, + "HasDataSpecification": { + "@id": "HasDataSpecification", + "@context": { + "@vocab": "https://admin-shell.io/aas/3/0/HasDataSpecification/" + } + }, + "AdministrativeInformation": { + "@id": "AdministrativeInformation", + "@context": { + "@vocab": "https://admin-shell.io/aas/3/0/AdministrativeInformation/" + } + }, + "Qualifiable": { + "@id": "Qualifiable", + "@context": { + "@vocab": "https://admin-shell.io/aas/3/0/Qualifiable/" + } + }, + "Qualifier": { + "@id": "Qualifier", + "@context": { + "@vocab": "https://admin-shell.io/aas/3/0/Qualifier/", + "kind": { + "@id": "aas:Qualifier/kind", + "@context": { + "@vocab": "aas:QualifierKind/" + }, + "@type": "@vocab" + }, + "type": { + "@id": "aas:Qualifier/type" + }, + "valueType": { + "@id": "aas:Qualifier/valueType", + "@context": { + "@vocab": "aas:DataTypeDefXsd/" + }, + "@type": "@vocab" + }, + "value": { + "@id": "aas:Qualifier/value" + }, + "valueId": { + "@id": "aas:Qualifier/valueId", + "@type": "@id", + "@context": { + "type": { + "@id": "aas:Reference/type", + "@context": { + "@vocab": "aas:ReferenceTypes/" + }, + "@type": "@vocab" + } + } + } + } + }, + "AssetAdministrationShell": { + "@id": "AssetAdministrationShell", + "@context": { + "@vocab": "https://admin-shell.io/aas/3/0/AssetAdministrationShell/", + "submodels": { + "@id": "aas:AssetAdministrationShell/submodels", + "@container": "@set", + "@type": "@id", + "@context": { + "type": { + "@id": "aas:Reference/type", + "@context": { + "@vocab": "aas:ReferenceTypes/" + }, + "@type": "@vocab" + } + } + } + } + }, + "AssetInformation": { + "@id": "AssetInformation", + "@context": { + "@vocab": "https://admin-shell.io/aas/3/0/AssetInformation/", + "globalAssetId": { + "@id": "aas:AssetInformation/globalAssetId" + }, + "specificAssetIds": { + "@id": "aas:AssetInformation/specificAssetIds", + "@container": "@set", + "@type": "@id", + "@context": { + "name": { + "@id": "aas:SpecificAssetId/name" + }, + "value": { + "@id": "aas:SpecificAssetId/value" + } + } + } + } + }, + "Resource": { + "@id": "Resource", + "@context": { + "@vocab": "https://admin-shell.io/aas/3/0/Resource/", + "contentType": { + "@id": "aas:Resource/contentType" + } + } + }, + "SpecificAssetId": { + "@id": "SpecificAssetId", + "@context": { + "@vocab": "https://admin-shell.io/aas/3/0/SpecificAssetId/", + "name": { + "@id": "aas:SpecificAssetId/name" + }, + "value": { + "@id": "aas:SpecificAssetId/value" + } + } + }, + "Submodel": { + "@id": "Submodel", + "@context": { + "@vocab": "https://admin-shell.io/aas/3/0/Submodel/", + "kind": { + "@id": "aas:HasKind/kind", + "@context": { + "@vocab": "aas:ModellingKind/" + }, + "@type": "@vocab" + } + } + }, + "SubmodelElement": { + "@id": "SubmodelElement", + "@context": { + "@vocab": "https://admin-shell.io/aas/3/0/SubmodelElement/" + } + }, + "RelationshipElement": { + "@id": "RelationshipElement", + "@context": { + "@vocab": "https://admin-shell.io/aas/3/0/RelationshipElement/" + } + }, + "SubmodelElementList": { + "@id": "SubmodelElementList", + "@context": { + "@vocab": "https://admin-shell.io/aas/3/0/SubmodelElementList/", + "value": { + "@id": "aas:SubmodelElementList/value", + "@container": "@set", + "@type": "@id", + "@context": {} + } + } + }, + "SubmodelElementCollection": { + "@id": "SubmodelElementCollection", + "@context": { + "@vocab": "https://admin-shell.io/aas/3/0/SubmodelElementCollection/", + "value": { + "@id": "aas:SubmodelElementCollection/value", + "@container": "@set", + "@type": "@id", + "@context": {} + } + } + }, + "DataElement": { + "@id": "DataElement", + "@context": { + "@vocab": "https://admin-shell.io/aas/3/0/DataElement/" + } + }, + "Property": { + "@id": "Property", + "@context": { + "@vocab": "https://admin-shell.io/aas/3/0/Property/", + "valueType": { + "@id": "aas:Property/valueType", + "@context": { + "@vocab": "aas:DataTypeDefXsd/" + }, + "@type": "@vocab" + }, + "value": { + "@id": "aas:Property/value" + }, + "valueId": { + "@id": "aas:Property/valueId", + "@type": "@id", + "@context": { + "type": { + "@id": "aas:Reference/type", + "@context": { + "@vocab": "aas:ReferenceTypes/" + }, + "@type": "@vocab" + } + } + } + } + }, + "MultiLanguageProperty": { + "@id": "MultiLanguageProperty", + "@context": { + "@vocab": "https://admin-shell.io/aas/3/0/MultiLanguageProperty/", + "value": { + "@id": "aas:MultiLanguageProperty/value", + "@container": "@set", + "@type": "@id", + "@context": {} + }, + "valueId": { + "@id": "aas:MultiLanguageProperty/valueId", + "@type": "@id", + "@context": { + "type": { + "@id": "aas:Reference/type", + "@context": { + "@vocab": "aas:ReferenceTypes/" + }, + "@type": "@vocab" + } + } + } + } + }, + "Range": { + "@id": "Range", + "@context": { + "@vocab": "https://admin-shell.io/aas/3/0/Range/", + "valueType": { + "@id": "aas:Range/valueType", + "@context": { + "@vocab": "aas:DataTypeDefXsd/" + }, + "@type": "@vocab" + }, + "min": { + "@id": "aas:Range/min" + }, + "max": { + "@id": "aas:Range/max" + } + } + }, + "ReferenceElement": { + "@id": "ReferenceElement", + "@context": { + "@vocab": "https://admin-shell.io/aas/3/0/ReferenceElement/", + "value": { + "@id": "aas:ReferenceElement/value", + "@type": "@id", + "@context": { + "type": { + "@id": "aas:Reference/type", + "@context": { + "@vocab": "aas:ReferenceTypes/" + }, + "@type": "@vocab" + } + } + } + } + }, + "Blob": { + "@id": "Blob", + "@context": { + "@vocab": "https://admin-shell.io/aas/3/0/Blob/", + "value": { + "@id": "aas:Blob/value", + "@type": "xs:base64Binary" + }, + "contentType": { + "@id": "aas:Blob/contentType" + } + } + }, + "File": { + "@id": "File", + "@context": { + "@vocab": "https://admin-shell.io/aas/3/0/File/", + "value": { + "@id": "aas:File/value" + }, + "contentType": { + "@id": "aas:File/contentType" + } + } + }, + "AnnotatedRelationshipElement": { + "@id": "AnnotatedRelationshipElement", + "@context": { + "@vocab": "https://admin-shell.io/aas/3/0/AnnotatedRelationshipElement/" + } + }, + "Entity": { + "@id": "Entity", + "@context": { + "@vocab": "https://admin-shell.io/aas/3/0/Entity/", + "globalAssetId": { + "@id": "aas:Entity/globalAssetId" + }, + "specificAssetIds": { + "@id": "aas:Entity/specificAssetIds", + "@container": "@set", + "@type": "@id", + "@context": { + "name": { + "@id": "aas:SpecificAssetId/name" + }, + "value": { + "@id": "aas:SpecificAssetId/value" + } + } + } + } + }, + "EventPayload": { + "@id": "EventPayload", + "@context": { + "@vocab": "https://admin-shell.io/aas/3/0/EventPayload/" + } + }, + "EventElement": { + "@id": "EventElement", + "@context": { + "@vocab": "https://admin-shell.io/aas/3/0/EventElement/" + } + }, + "BasicEventElement": { + "@id": "BasicEventElement", + "@context": { + "@vocab": "https://admin-shell.io/aas/3/0/BasicEventElement/" + } + }, + "Operation": { + "@id": "Operation", + "@context": { + "@vocab": "https://admin-shell.io/aas/3/0/Operation/" + } + }, + "OperationVariable": { + "@id": "OperationVariable", + "@context": { + "@vocab": "https://admin-shell.io/aas/3/0/OperationVariable/", + "value": { + "@id": "aas:OperationVariable/value", + "@type": "@id", + "@context": {} + } + } + }, + "Capability": { + "@id": "Capability", + "@context": { + "@vocab": "https://admin-shell.io/aas/3/0/Capability/" + } + }, + "ConceptDescription": { + "@id": "ConceptDescription", + "@context": { + "@vocab": "https://admin-shell.io/aas/3/0/ConceptDescription/" + } + }, + "Reference": { + "@id": "Reference", + "@context": { + "@vocab": "https://admin-shell.io/aas/3/0/Reference/", + "type": { + "@id": "aas:Reference/type", + "@context": { + "@vocab": "aas:ReferenceTypes/" + }, + "@type": "@vocab" + } + } + }, + "Key": { + "@id": "Key", + "@context": { + "@vocab": "https://admin-shell.io/aas/3/0/Key/", + "type": { + "@id": "aas:Key/type", + "@context": { + "@vocab": "aas:KeyTypes/", + "AnnotatedRelationshipElement": { + "@id": "aas:KeyTypes/AnnotatedRelationshipElement" + }, + "AssetAdministrationShell": { + "@id": "aas:KeyTypes/AssetAdministrationShell" + }, + "BasicEventElement": { + "@id": "aas:KeyTypes/BasicEventElement" + }, + "Blob": { + "@id": "aas:KeyTypes/Blob" + }, + "Capability": { + "@id": "aas:KeyTypes/Capability" + }, + "ConceptDescription": { + "@id": "aas:KeyTypes/ConceptDescription" + }, + "DataElement": { + "@id": "aas:KeyTypes/DataElement" + }, + "Entity": { + "@id": "aas:KeyTypes/Entity" + }, + "EventElement": { + "@id": "aas:KeyTypes/EventElement" + }, + "File": { + "@id": "aas:KeyTypes/File" + }, + "Identifiable": { + "@id": "aas:KeyTypes/Identifiable" + }, + "MultiLanguageProperty": { + "@id": "aas:KeyTypes/MultiLanguageProperty" + }, + "Operation": { + "@id": "aas:KeyTypes/Operation" + }, + "Property": { + "@id": "aas:KeyTypes/Property" + }, + "Range": { + "@id": "aas:KeyTypes/Range" + }, + "Referable": { + "@id": "aas:KeyTypes/Referable" + }, + "ReferenceElement": { + "@id": "aas:KeyTypes/ReferenceElement" + }, + "RelationshipElement": { + "@id": "aas:KeyTypes/RelationshipElement" + }, + "Submodel": { + "@id": "aas:KeyTypes/Submodel" + }, + "SubmodelElement": { + "@id": "aas:KeyTypes/SubmodelElement" + }, + "SubmodelElementCollection": { + "@id": "aas:KeyTypes/SubmodelElementCollection" + }, + "SubmodelElementList": { + "@id": "aas:KeyTypes/SubmodelElementList" + } + }, + "@type": "@vocab" + }, + "value": { + "@id": "aas:Key/value" + } + } + }, + "AbstractLangString": { + "@id": "AbstractLangString", + "@context": { + "@vocab": "https://admin-shell.io/aas/3/0/AbstractLangString/" + } + }, + "LangStringNameType": { + "@id": "LangStringNameType", + "@context": { + "@vocab": "https://admin-shell.io/aas/3/0/LangStringNameType/" + } + }, + "LangStringTextType": { + "@id": "LangStringTextType", + "@context": { + "@vocab": "https://admin-shell.io/aas/3/0/LangStringTextType/" + } + }, + "Environment": { + "@id": "Environment", + "@context": { + "@vocab": "https://admin-shell.io/aas/3/0/Environment/", + "submodels": { + "@id": "aas:Environment/submodels", + "@container": "@set", + "@type": "@id", + "@context": { + "kind": { + "@id": "aas:HasKind/kind", + "@context": { + "@vocab": "aas:ModellingKind/" + }, + "@type": "@vocab" + } + } + } + } + }, + "DataSpecificationContent": { + "@id": "DataSpecificationContent", + "@context": { + "@vocab": "https://admin-shell.io/aas/3/0/DataSpecificationContent/" + } + }, + "EmbeddedDataSpecification": { + "@id": "EmbeddedDataSpecification", + "@context": { + "@vocab": "https://admin-shell.io/aas/3/0/EmbeddedDataSpecification/" + } + }, + "LevelType": { + "@id": "LevelType", + "@context": { + "@vocab": "https://admin-shell.io/aas/3/0/LevelType/", + "min": { + "@id": "aas:LevelType/min" + }, + "max": { + "@id": "aas:LevelType/max" + } + } + }, + "ValueReferencePair": { + "@id": "ValueReferencePair", + "@context": { + "@vocab": "https://admin-shell.io/aas/3/0/ValueReferencePair/", + "value": { + "@id": "aas:ValueReferencePair/value" + }, + "valueId": { + "@id": "aas:ValueReferencePair/valueId", + "@type": "@id", + "@context": { + "type": { + "@id": "aas:Reference/type", + "@context": { + "@vocab": "aas:ReferenceTypes/" + }, + "@type": "@vocab" + } + } + } + } + }, + "ValueList": { + "@id": "ValueList", + "@context": { + "@vocab": "https://admin-shell.io/aas/3/0/ValueList/" + } + }, + "LangStringPreferredNameTypeIec61360": { + "@id": "LangStringPreferredNameTypeIec61360", + "@context": { + "@vocab": "https://admin-shell.io/aas/3/0/LangStringPreferredNameTypeIec61360/" + } + }, + "LangStringShortNameTypeIec61360": { + "@id": "LangStringShortNameTypeIec61360", + "@context": { + "@vocab": "https://admin-shell.io/aas/3/0/LangStringShortNameTypeIec61360/" + } + }, + "LangStringDefinitionTypeIec61360": { + "@id": "LangStringDefinitionTypeIec61360", + "@context": { + "@vocab": "https://admin-shell.io/aas/3/0/LangStringDefinitionTypeIec61360/" + } + }, + "DataSpecificationIec61360": { + "@id": "DataSpecificationIec61360", + "@context": { + "@vocab": "https://admin-shell.io/aas/3/0/DataSpecificationIec61360/", + "value": { + "@id": "aas:DataSpecificationIec61360/value" + } + } + } +} \ No newline at end of file diff --git a/test_data/parse/real_meta_models/aas_core_meta.v3/expected_symbol_table.txt b/test_data/parse/real_meta_models/aas_core_meta.v3/expected_symbol_table.txt index 56b10140a..b0f31e452 100644 --- a/test_data/parse/real_meta_models/aas_core_meta.v3/expected_symbol_table.txt +++ b/test_data/parse/real_meta_models/aas_core_meta.v3/expected_symbol_table.txt @@ -1215,7 +1215,7 @@ UnverifiedSymbolTable( original_node=...)"""), node=...), Invariant( - description='Description specifies no duplicate languages.', + description='Description must specify unique languages.', body=textwrap.dedent("""\ Implication( antecedent=IsNotNone( @@ -1269,7 +1269,7 @@ UnverifiedSymbolTable( original_node=...)"""), node=...), Invariant( - description='Display name specifies no duplicate languages.', + description='Display name must specify unique languages.', body=textwrap.dedent("""\ Implication( antecedent=IsNotNone( @@ -5574,7 +5574,7 @@ UnverifiedSymbolTable( body=...)], invariants=[ Invariant( - description='Value specifies no duplicate languages.', + description='Value must specify unique languages.', body=textwrap.dedent("""\ Implication( antecedent=IsNotNone( @@ -11312,7 +11312,7 @@ UnverifiedSymbolTable( body=...)], invariants=[ Invariant( - description='String shall have a maximum length of 1023 characters.', + description='String shall have a maximum length of 255 characters.', body=textwrap.dedent("""\ Comparison( left=FunctionCall( @@ -11380,7 +11380,7 @@ UnverifiedSymbolTable( body=...)], invariants=[ Invariant( - description='String shall have a maximum length of 1023 characters.', + description='String shall have a maximum length of 18 characters.', body=textwrap.dedent("""\ Comparison( left=FunctionCall( @@ -11919,7 +11919,7 @@ UnverifiedSymbolTable( original_node=...)"""), node=...), Invariant( - description='Definition specifies no duplicate languages.', + description='Definition must specify unique languages.', body=textwrap.dedent("""\ Implication( antecedent=IsNotNone( @@ -11973,7 +11973,7 @@ UnverifiedSymbolTable( original_node=...)"""), node=...), Invariant( - description='Short name specifies no duplicate languages.', + description='Short name must specify unique languages.', body=textwrap.dedent("""\ Implication( antecedent=IsNotNone( @@ -12017,7 +12017,7 @@ UnverifiedSymbolTable( original_node=...)"""), node=...), Invariant( - description='Preferred name specifies no duplicate languages.', + description='Preferred name must specify unique languages.', body=textwrap.dedent("""\ FunctionCall( name='lang_strings_have_unique_languages', diff --git a/test_data/python/test_main/aas_core_meta.v3/expected_output/types.py b/test_data/python/test_main/aas_core_meta.v3/expected_output/types.py index 071f7fdc5..ad701d461 100644 --- a/test_data/python/test_main/aas_core_meta.v3/expected_output/types.py +++ b/test_data/python/test_main/aas_core_meta.v3/expected_output/types.py @@ -1906,6 +1906,12 @@ class SubmodelElementList(SubmodelElement): specify a :py:attr:`HasSemantics.semantic_id` then the value is assumed to be identical to :py:attr:`semantic_id_list_element`. + :constraint AASd-120: + .. _constraint_AASd-120: + + The :py:attr:`id_short` of a :py:class:`SubmodelElement` being a direct child of a + :py:class:`SubmodelElementList` shall not be specified. + :constraint AASd-108: .. _constraint_AASd-108: diff --git a/test_data/python/test_main/aas_core_meta.v3/expected_output/verification.py b/test_data/python/test_main/aas_core_meta.v3/expected_output/verification.py index b5696062f..d84edb61f 100644 --- a/test_data/python/test_main/aas_core_meta.v3/expected_output/verification.py +++ b/test_data/python/test_main/aas_core_meta.v3/expected_output/verification.py @@ -2219,7 +2219,7 @@ def transform_asset_administration_shell( or lang_strings_have_unique_languages(that.description) ): yield Error( - 'Description specifies no duplicate languages.' + 'Description must specify unique languages.' ) if not ( @@ -2238,7 +2238,7 @@ def transform_asset_administration_shell( ) ): yield Error( - 'Display name specifies no duplicate languages.' + 'Display name must specify unique languages.' ) if not ( @@ -2683,7 +2683,7 @@ def transform_submodel( or lang_strings_have_unique_languages(that.description) ): yield Error( - 'Description specifies no duplicate languages.' + 'Description must specify unique languages.' ) if not ( @@ -2702,7 +2702,7 @@ def transform_submodel( ) ): yield Error( - 'Display name specifies no duplicate languages.' + 'Display name must specify unique languages.' ) if not ( @@ -3040,7 +3040,7 @@ def transform_relationship_element( or lang_strings_have_unique_languages(that.description) ): yield Error( - 'Description specifies no duplicate languages.' + 'Description must specify unique languages.' ) if not ( @@ -3059,7 +3059,7 @@ def transform_relationship_element( ) ): yield Error( - 'Display name specifies no duplicate languages.' + 'Display name must specify unique languages.' ) if not ( @@ -3296,7 +3296,7 @@ def transform_submodel_element_list( or lang_strings_have_unique_languages(that.description) ): yield Error( - 'Description specifies no duplicate languages.' + 'Description must specify unique languages.' ) if not ( @@ -3315,7 +3315,7 @@ def transform_submodel_element_list( ) ): yield Error( - 'Display name specifies no duplicate languages.' + 'Display name must specify unique languages.' ) if not ( @@ -3666,7 +3666,7 @@ def transform_submodel_element_collection( or lang_strings_have_unique_languages(that.description) ): yield Error( - 'Description specifies no duplicate languages.' + 'Description must specify unique languages.' ) if not ( @@ -3685,7 +3685,7 @@ def transform_submodel_element_collection( ) ): yield Error( - 'Display name specifies no duplicate languages.' + 'Display name must specify unique languages.' ) if not ( @@ -3953,7 +3953,7 @@ def transform_property( or lang_strings_have_unique_languages(that.description) ): yield Error( - 'Description specifies no duplicate languages.' + 'Description must specify unique languages.' ) if not ( @@ -3972,7 +3972,7 @@ def transform_property( ) ): yield Error( - 'Display name specifies no duplicate languages.' + 'Display name must specify unique languages.' ) if not ( @@ -4232,7 +4232,7 @@ def transform_multi_language_property( or lang_strings_have_unique_languages(that.description) ): yield Error( - 'Description specifies no duplicate languages.' + 'Description must specify unique languages.' ) if not ( @@ -4251,7 +4251,7 @@ def transform_multi_language_property( ) ): yield Error( - 'Display name specifies no duplicate languages.' + 'Display name must specify unique languages.' ) if not ( @@ -4313,7 +4313,7 @@ def transform_multi_language_property( or lang_strings_have_unique_languages(that.value) ): yield Error( - 'Value specifies no duplicate languages.' + 'Value must specify unique languages.' ) if not ( @@ -4523,7 +4523,7 @@ def transform_range( or lang_strings_have_unique_languages(that.description) ): yield Error( - 'Description specifies no duplicate languages.' + 'Description must specify unique languages.' ) if not ( @@ -4542,7 +4542,7 @@ def transform_range( ) ): yield Error( - 'Display name specifies no duplicate languages.' + 'Display name must specify unique languages.' ) if not ( @@ -4813,7 +4813,7 @@ def transform_reference_element( or lang_strings_have_unique_languages(that.description) ): yield Error( - 'Description specifies no duplicate languages.' + 'Description must specify unique languages.' ) if not ( @@ -4832,7 +4832,7 @@ def transform_reference_element( ) ): yield Error( - 'Display name specifies no duplicate languages.' + 'Display name must specify unique languages.' ) if not ( @@ -5071,7 +5071,7 @@ def transform_blob( or lang_strings_have_unique_languages(that.description) ): yield Error( - 'Description specifies no duplicate languages.' + 'Description must specify unique languages.' ) if not ( @@ -5090,7 +5090,7 @@ def transform_blob( ) ): yield Error( - 'Display name specifies no duplicate languages.' + 'Display name must specify unique languages.' ) if not ( @@ -5338,7 +5338,7 @@ def transform_file( or lang_strings_have_unique_languages(that.description) ): yield Error( - 'Description specifies no duplicate languages.' + 'Description must specify unique languages.' ) if not ( @@ -5357,7 +5357,7 @@ def transform_file( ) ): yield Error( - 'Display name specifies no duplicate languages.' + 'Display name must specify unique languages.' ) if not ( @@ -5605,7 +5605,7 @@ def transform_annotated_relationship_element( or lang_strings_have_unique_languages(that.description) ): yield Error( - 'Description specifies no duplicate languages.' + 'Description must specify unique languages.' ) if not ( @@ -5624,7 +5624,7 @@ def transform_annotated_relationship_element( ) ): yield Error( - 'Display name specifies no duplicate languages.' + 'Display name must specify unique languages.' ) if not ( @@ -5903,7 +5903,7 @@ def transform_entity( or lang_strings_have_unique_languages(that.description) ): yield Error( - 'Description specifies no duplicate languages.' + 'Description must specify unique languages.' ) if not ( @@ -5922,7 +5922,7 @@ def transform_entity( ) ): yield Error( - 'Display name specifies no duplicate languages.' + 'Display name must specify unique languages.' ) if not ( @@ -6367,7 +6367,7 @@ def transform_basic_event_element( or lang_strings_have_unique_languages(that.description) ): yield Error( - 'Description specifies no duplicate languages.' + 'Description must specify unique languages.' ) if not ( @@ -6386,7 +6386,7 @@ def transform_basic_event_element( ) ): yield Error( - 'Display name specifies no duplicate languages.' + 'Display name must specify unique languages.' ) if not ( @@ -6685,7 +6685,7 @@ def transform_operation( or lang_strings_have_unique_languages(that.description) ): yield Error( - 'Description specifies no duplicate languages.' + 'Description must specify unique languages.' ) if not ( @@ -6704,7 +6704,7 @@ def transform_operation( ) ): yield Error( - 'Display name specifies no duplicate languages.' + 'Display name must specify unique languages.' ) if not ( @@ -7041,7 +7041,7 @@ def transform_capability( or lang_strings_have_unique_languages(that.description) ): yield Error( - 'Description specifies no duplicate languages.' + 'Description must specify unique languages.' ) if not ( @@ -7060,7 +7060,7 @@ def transform_capability( ) ): yield Error( - 'Display name specifies no duplicate languages.' + 'Display name must specify unique languages.' ) if not ( @@ -7279,7 +7279,7 @@ def transform_concept_description( or lang_strings_have_unique_languages(that.description) ): yield Error( - 'Description specifies no duplicate languages.' + 'Description must specify unique languages.' ) if not ( @@ -7298,7 +7298,7 @@ def transform_concept_description( ) ): yield Error( - 'Display name specifies no duplicate languages.' + 'Display name must specify unique languages.' ) if not ( @@ -7981,7 +7981,7 @@ def transform_lang_string_preferred_name_type_iec_61360( ) -> Iterator[Error]: if not (len(that.text) <= 255): yield Error( - 'String shall have a maximum length of 1023 characters.' + 'String shall have a maximum length of 255 characters.' ) for error in verify_bcp_47_language_tag(that.language): @@ -8009,7 +8009,7 @@ def transform_lang_string_short_name_type_iec_61360( ) -> Iterator[Error]: if not (len(that.text) <= 18): yield Error( - 'String shall have a maximum length of 1023 characters.' + 'String shall have a maximum length of 18 characters.' ) for error in verify_bcp_47_language_tag(that.language): @@ -8107,7 +8107,7 @@ def transform_data_specification_iec_61360( or lang_strings_have_unique_languages(that.definition) ): yield Error( - 'Definition specifies no duplicate languages.' + 'Definition must specify unique languages.' ) if not ( @@ -8123,7 +8123,7 @@ def transform_data_specification_iec_61360( or lang_strings_have_unique_languages(that.short_name) ): yield Error( - 'Short name specifies no duplicate languages.' + 'Short name must specify unique languages.' ) if not (len(that.preferred_name) >= 1): @@ -8137,7 +8137,7 @@ def transform_data_specification_iec_61360( ) ): yield Error( - 'Preferred name specifies no duplicate languages.' + 'Preferred name must specify unique languages.' ) if not ( diff --git a/test_data/typescript/test_main/aas_core_meta.v3/expected_output/types.ts b/test_data/typescript/test_main/aas_core_meta.v3/expected_output/types.ts index 22b45baaf..56be620d5 100644 --- a/test_data/typescript/test_main/aas_core_meta.v3/expected_output/types.ts +++ b/test_data/typescript/test_main/aas_core_meta.v3/expected_output/types.ts @@ -2962,6 +2962,10 @@ export function *overAasSubmodelElements( * specify a {@link IHasSemantics.semanticId} then the value is assumed to be * identical to {@link SubmodelElementList.semanticIdListElement}. * + * Constraint `AASd-120`: + * The {@link SubmodelElementList.idShort} of a {@link ISubmodelElement} being a direct child of a + * {@link SubmodelElementList} shall not be specified. + * * Constraint `AASd-108`: * All first level child elements in a {@link SubmodelElementList} shall have * the same submodel element type as specified in {@link SubmodelElementList.typeValueListElement}. diff --git a/test_data/typescript/test_main/aas_core_meta.v3/expected_output/verification.ts b/test_data/typescript/test_main/aas_core_meta.v3/expected_output/verification.ts index afc975195..2823cef17 100644 --- a/test_data/typescript/test_main/aas_core_meta.v3/expected_output/verification.ts +++ b/test_data/typescript/test_main/aas_core_meta.v3/expected_output/verification.ts @@ -2553,7 +2553,7 @@ class Verifier || langStringsHaveUniqueLanguages(that.description) )) { yield new VerificationError( - "Description specifies no duplicate languages." + "Description must specify unique languages." ) } @@ -2572,7 +2572,7 @@ class Verifier || langStringsHaveUniqueLanguages(that.displayName) )) { yield new VerificationError( - "Display name specifies no duplicate languages." + "Display name must specify unique languages." ) } @@ -3114,7 +3114,7 @@ class Verifier || langStringsHaveUniqueLanguages(that.description) )) { yield new VerificationError( - "Description specifies no duplicate languages." + "Description must specify unique languages." ) } @@ -3133,7 +3133,7 @@ class Verifier || langStringsHaveUniqueLanguages(that.displayName) )) { yield new VerificationError( - "Display name specifies no duplicate languages." + "Display name must specify unique languages." ) } @@ -3541,7 +3541,7 @@ class Verifier || langStringsHaveUniqueLanguages(that.description) )) { yield new VerificationError( - "Description specifies no duplicate languages." + "Description must specify unique languages." ) } @@ -3560,7 +3560,7 @@ class Verifier || langStringsHaveUniqueLanguages(that.displayName) )) { yield new VerificationError( - "Display name specifies no duplicate languages." + "Display name must specify unique languages." ) } @@ -3844,7 +3844,7 @@ class Verifier || langStringsHaveUniqueLanguages(that.description) )) { yield new VerificationError( - "Description specifies no duplicate languages." + "Description must specify unique languages." ) } @@ -3863,7 +3863,7 @@ class Verifier || langStringsHaveUniqueLanguages(that.displayName) )) { yield new VerificationError( - "Display name specifies no duplicate languages." + "Display name must specify unique languages." ) } @@ -4281,7 +4281,7 @@ class Verifier || langStringsHaveUniqueLanguages(that.description) )) { yield new VerificationError( - "Description specifies no duplicate languages." + "Description must specify unique languages." ) } @@ -4300,7 +4300,7 @@ class Verifier || langStringsHaveUniqueLanguages(that.displayName) )) { yield new VerificationError( - "Display name specifies no duplicate languages." + "Display name must specify unique languages." ) } @@ -4624,7 +4624,7 @@ class Verifier || langStringsHaveUniqueLanguages(that.description) )) { yield new VerificationError( - "Description specifies no duplicate languages." + "Description must specify unique languages." ) } @@ -4643,7 +4643,7 @@ class Verifier || langStringsHaveUniqueLanguages(that.displayName) )) { yield new VerificationError( - "Display name specifies no duplicate languages." + "Display name must specify unique languages." ) } @@ -4954,7 +4954,7 @@ class Verifier || langStringsHaveUniqueLanguages(that.description) )) { yield new VerificationError( - "Description specifies no duplicate languages." + "Description must specify unique languages." ) } @@ -4973,7 +4973,7 @@ class Verifier || langStringsHaveUniqueLanguages(that.displayName) )) { yield new VerificationError( - "Display name specifies no duplicate languages." + "Display name must specify unique languages." ) } @@ -5042,7 +5042,7 @@ class Verifier || langStringsHaveUniqueLanguages(that.value) )) { yield new VerificationError( - "Value specifies no duplicate languages." + "Value must specify unique languages." ) } @@ -5300,7 +5300,7 @@ class Verifier || langStringsHaveUniqueLanguages(that.description) )) { yield new VerificationError( - "Description specifies no duplicate languages." + "Description must specify unique languages." ) } @@ -5319,7 +5319,7 @@ class Verifier || langStringsHaveUniqueLanguages(that.displayName) )) { yield new VerificationError( - "Display name specifies no duplicate languages." + "Display name must specify unique languages." ) } @@ -5636,7 +5636,7 @@ class Verifier || langStringsHaveUniqueLanguages(that.description) )) { yield new VerificationError( - "Description specifies no duplicate languages." + "Description must specify unique languages." ) } @@ -5655,7 +5655,7 @@ class Verifier || langStringsHaveUniqueLanguages(that.displayName) )) { yield new VerificationError( - "Display name specifies no duplicate languages." + "Display name must specify unique languages." ) } @@ -5942,7 +5942,7 @@ class Verifier || langStringsHaveUniqueLanguages(that.description) )) { yield new VerificationError( - "Description specifies no duplicate languages." + "Description must specify unique languages." ) } @@ -5961,7 +5961,7 @@ class Verifier || langStringsHaveUniqueLanguages(that.displayName) )) { yield new VerificationError( - "Display name specifies no duplicate languages." + "Display name must specify unique languages." ) } @@ -6258,7 +6258,7 @@ class Verifier || langStringsHaveUniqueLanguages(that.description) )) { yield new VerificationError( - "Description specifies no duplicate languages." + "Description must specify unique languages." ) } @@ -6277,7 +6277,7 @@ class Verifier || langStringsHaveUniqueLanguages(that.displayName) )) { yield new VerificationError( - "Display name specifies no duplicate languages." + "Display name must specify unique languages." ) } @@ -6574,7 +6574,7 @@ class Verifier || langStringsHaveUniqueLanguages(that.description) )) { yield new VerificationError( - "Description specifies no duplicate languages." + "Description must specify unique languages." ) } @@ -6593,7 +6593,7 @@ class Verifier || langStringsHaveUniqueLanguages(that.displayName) )) { yield new VerificationError( - "Display name specifies no duplicate languages." + "Display name must specify unique languages." ) } @@ -6929,7 +6929,7 @@ class Verifier || langStringsHaveUniqueLanguages(that.description) )) { yield new VerificationError( - "Description specifies no duplicate languages." + "Description must specify unique languages." ) } @@ -6948,7 +6948,7 @@ class Verifier || langStringsHaveUniqueLanguages(that.displayName) )) { yield new VerificationError( - "Display name specifies no duplicate languages." + "Display name must specify unique languages." ) } @@ -7480,7 +7480,7 @@ class Verifier || langStringsHaveUniqueLanguages(that.description) )) { yield new VerificationError( - "Description specifies no duplicate languages." + "Description must specify unique languages." ) } @@ -7499,7 +7499,7 @@ class Verifier || langStringsHaveUniqueLanguages(that.displayName) )) { yield new VerificationError( - "Display name specifies no duplicate languages." + "Display name must specify unique languages." ) } @@ -7859,7 +7859,7 @@ class Verifier || langStringsHaveUniqueLanguages(that.description) )) { yield new VerificationError( - "Description specifies no duplicate languages." + "Description must specify unique languages." ) } @@ -7878,7 +7878,7 @@ class Verifier || langStringsHaveUniqueLanguages(that.displayName) )) { yield new VerificationError( - "Display name specifies no duplicate languages." + "Display name must specify unique languages." ) } @@ -8277,7 +8277,7 @@ class Verifier || langStringsHaveUniqueLanguages(that.description) )) { yield new VerificationError( - "Description specifies no duplicate languages." + "Description must specify unique languages." ) } @@ -8296,7 +8296,7 @@ class Verifier || langStringsHaveUniqueLanguages(that.displayName) )) { yield new VerificationError( - "Display name specifies no duplicate languages." + "Display name must specify unique languages." ) } @@ -8560,7 +8560,7 @@ class Verifier || langStringsHaveUniqueLanguages(that.description) )) { yield new VerificationError( - "Description specifies no duplicate languages." + "Description must specify unique languages." ) } @@ -8579,7 +8579,7 @@ class Verifier || langStringsHaveUniqueLanguages(that.displayName) )) { yield new VerificationError( - "Display name specifies no duplicate languages." + "Display name must specify unique languages." ) } @@ -9381,7 +9381,7 @@ class Verifier ): IterableIterator { if (!(that.text.length <= 255)) { yield new VerificationError( - "String shall have a maximum length of 1023 characters." + "String shall have a maximum length of 255 characters." ) } @@ -9413,7 +9413,7 @@ class Verifier ): IterableIterator { if (!(that.text.length <= 18)) { yield new VerificationError( - "String shall have a maximum length of 1023 characters." + "String shall have a maximum length of 18 characters." ) } @@ -9521,7 +9521,7 @@ class Verifier || langStringsHaveUniqueLanguages(that.definition) )) { yield new VerificationError( - "Definition specifies no duplicate languages." + "Definition must specify unique languages." ) } @@ -9539,7 +9539,7 @@ class Verifier || langStringsHaveUniqueLanguages(that.shortName) )) { yield new VerificationError( - "Short name specifies no duplicate languages." + "Short name must specify unique languages." ) } @@ -9551,7 +9551,7 @@ class Verifier if (!langStringsHaveUniqueLanguages(that.preferredName)) { yield new VerificationError( - "Preferred name specifies no duplicate languages." + "Preferred name must specify unique languages." ) }