Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Specify namespace in URN structure #289

Merged
merged 4 commits into from
Mar 21, 2024
Merged

Specify namespace in URN structure #289

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6c94151
Specify namespace in URN structure
Yauhenikapl Mar 18, 2024
a5a528f
Update Copyright
Yauhenikapl Mar 18, 2024
8254d5d
Merge branch 'main' into 285-specify-format-for-urn-namespace-parts
Yauhenikapl Mar 19, 2024
c79dfe5
Refactoring
Yauhenikapl Mar 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...c-aspect-meta-model/src/main/resources/samm/meta-model/2.2.0/aspect-meta-model-shapes.ttl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ samm:NamespaceShape
select $this ?value ?code
where {
bind( str( $this ) as ?value )
filter( !regex( ?value, "^urn:samm:[^:]+:[0-9]+.[0-9]+.[0-9]+#$" ))
filter( !regex( ?value, "^urn:samm:[a-zA-Z0-9._-]+:[0-9]+.[0-9]+.[0-9]+#$" ))
Yauhenikapl marked this conversation as resolved.
Show resolved Hide resolved
bind( 'ERR_WRONG_URN' as ?code )
}
""" ;
Expand Down
29 changes: 27 additions & 2 deletions esmf-semantic-aspect-meta-model/src/test/java/org/eclipse/esmf/samm/NamespaceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,39 @@ void testEmptyPropertiesExpectFailureSamm_2_2_0( final KnownVersion metaModelVer

@ParameterizedTest
@MethodSource( value = "versionsStartingWith2_2_0")
void testNamespaceInvalidUrn( final KnownVersion metaModelVersion) {
void testNamespaceInvalidUrnPattern( final KnownVersion metaModelVersion) {
final String focusNode = "urn:samm:org.eclipse.esmf.samm.test:1.q.0#";

final SemanticError resultForInvalidUrnNamespace = new SemanticError(
"Namespace '<urn:samm:org.eclipse.esmf.samm.test:1.q.0#>' uses an invalid URN pattern",
focusNode, "", violationUrn, focusNode
);
expectSemanticValidationErrors( "namespace", "TestNamespaceInvalidUrn",
expectSemanticValidationErrors( "namespace", "TestNamespaceInvalidUrnVersion",
metaModelVersion, resultForInvalidUrnNamespace );
}

@ParameterizedTest
@MethodSource( value = "versionsStartingWith2_2_0")
void testNamespaceInvalidUrn( final KnownVersion metaModelVersion) {
final String focusNode = "urn:samm:org.eclipse.esmf.samm+test:1.0.0#";

final SemanticError resultForInvalidUrnNamespace = new SemanticError(
"Namespace '<urn:samm:org.eclipse.esmf.samm+test:1.0.0#>' uses an invalid URN pattern",
focusNode, "", violationUrn, focusNode
);
expectSemanticValidationErrors( "namespace", "TestNamespaceInvalidUrn",
metaModelVersion, resultForInvalidUrnNamespace );
}

@ParameterizedTest
@MethodSource( value = "versionsStartingWith2_2_0")
void testNamespaceValidWithDash( final KnownVersion metaModelVersion) {
checkValidity( "namespace", "TestNamespaceValidWithDash", metaModelVersion );
}

@ParameterizedTest
@MethodSource( value = "versionsStartingWith2_2_0")
void testNamespaceValidWithUnderscore( final KnownVersion metaModelVersion) {
checkValidity( "namespace", "TestNamespaceValidWithUnderscore", metaModelVersion );
}
}
4 changes: 2 additions & 2 deletions ...st/resources/samm_2_2_0/namespace/org.eclipse.esmf.test/1.0.0/TestNamespaceInvalidUrn.ttl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (c) 2023 Robert Bosch Manufacturing Solutions GmbH
# Copyright (c) 2024 Robert Bosch Manufacturing Solutions GmbH
Yauhenikapl marked this conversation as resolved.
Show resolved Hide resolved
#
# See the AUTHORS file(s) distributed with this work for additional
# information regarding authorship.
Expand All @@ -10,7 +10,7 @@
#
# SPDX-License-Identifier: MPL-2.0
#
@prefix : <urn:samm:org.eclipse.esmf.samm.test:1.q.0#> .
@prefix : <urn:samm:org.eclipse.esmf.samm+test:1.0.0#> .
@prefix samm: <urn:samm:org.eclipse.esmf.samm:meta-model:2.2.0#> .
@prefix samm-c: <urn:samm:org.eclipse.esmf.samm:characteristic:2.2.0#> .
@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
Expand Down
20 changes: 20 additions & 0 deletions ...urces/samm_2_2_0/namespace/org.eclipse.esmf.test/1.0.0/TestNamespaceInvalidUrnVersion.ttl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
#
# Copyright (c) 2024 Robert Bosch Manufacturing Solutions GmbH
#
# See the AUTHORS file(s) distributed with this work for additional
# information regarding authorship.
#
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at https://mozilla.org/MPL/2.0/.
#
# SPDX-License-Identifier: MPL-2.0
#
@prefix : <urn:samm:org.eclipse.esmf.samm.test:1.q.0#> .
@prefix samm: <urn:samm:org.eclipse.esmf.samm:meta-model:2.2.0#> .
@prefix samm-c: <urn:samm:org.eclipse.esmf.samm:characteristic:2.2.0#> .
@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .

: a samm:Namespace ;
samm:preferredName "Test Preferred Name"@en ;
samm:description "Test description"@en ;
20 changes: 20 additions & 0 deletions ...resources/samm_2_2_0/namespace/org.eclipse.esmf.test/1.0.0/TestNamespaceValidWithDash.ttl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
#
# Copyright (c) 2024 Robert Bosch Manufacturing Solutions GmbH
#
# See the AUTHORS file(s) distributed with this work for additional
# information regarding authorship.
#
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at https://mozilla.org/MPL/2.0/.
#
# SPDX-License-Identifier: MPL-2.0
#
@prefix : <urn:samm:org.eclipse.esmf.samm-test:1.0.0#> .
@prefix samm: <urn:samm:org.eclipse.esmf.samm:meta-model:2.2.0#> .
@prefix samm-c: <urn:samm:org.eclipse.esmf.samm:characteristic:2.2.0#> .
@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .

: a samm:Namespace ;
samm:preferredName "Test Preferred Name"@en ;
samm:description "Test description"@en ;
20 changes: 20 additions & 0 deletions ...ces/samm_2_2_0/namespace/org.eclipse.esmf.test/1.0.0/TestNamespaceValidWithUnderscore.ttl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
#
# Copyright (c) 2024 Robert Bosch Manufacturing Solutions GmbH
#
# See the AUTHORS file(s) distributed with this work for additional
# information regarding authorship.
#
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at https://mozilla.org/MPL/2.0/.
#
# SPDX-License-Identifier: MPL-2.0
#
@prefix : <urn:samm:org.eclipse.esmf.samm_test:1.0.0#> .
@prefix samm: <urn:samm:org.eclipse.esmf.samm:meta-model:2.2.0#> .
@prefix samm-c: <urn:samm:org.eclipse.esmf.samm:characteristic:2.2.0#> .
@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .

: a samm:Namespace ;
samm:preferredName "Test Preferred Name"@en ;
samm:description "Test description"@en ;
Loading