Refactoring

Fixes #285
eclipse-esmf · Mar 21, 2024 · c79dfe5 · c79dfe5
1 parent 8254d5d
commit c79dfe5
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 5 deletions.
diff --git a/...c-aspect-meta-model/src/main/resources/samm/meta-model/2.2.0/aspect-meta-model-shapes.ttl b/...c-aspect-meta-model/src/main/resources/samm/meta-model/2.2.0/aspect-meta-model-shapes.ttl
@@ -64,7 +64,7 @@ samm:NamespaceShape
          select $this ?value ?code
          where {
             bind( str( $this ) as ?value )
-            filter( !regex( ?value, "^urn:samm:[a-zA-Z0-9._-]+:[0-9]+.[0-9]+.[0-9]+#$" ))
+            filter( !regex( ?value, "^urn:samm:[a-zA-Z][a-zA-Z0-9]{1,62}.[a-zA-Z0-9-]{1,63}(.[a-zA-Z0-9_-]{1,63})+:[0-9]+.[0-9]+.[0-9]+#$" ))
             bind( 'ERR_WRONG_URN' as ?code )
          }
       """ ;

diff --git a/esmf-semantic-aspect-meta-model/src/test/java/org/eclipse/esmf/samm/NamespaceTest.java b/esmf-semantic-aspect-meta-model/src/test/java/org/eclipse/esmf/samm/NamespaceTest.java
@@ -38,16 +38,29 @@ void testNamespaceInvalidUrnPattern( final KnownVersion metaModelVersion) {
    @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 String focusNode = "urn:samm:org.eclipse.esmf.samm+:1.0.0#";
 
       final SemanticError resultForInvalidUrnNamespace = new SemanticError(
-            "Namespace '<urn:samm:org.eclipse.esmf.samm+test:1.0.0#>' uses an invalid URN pattern",
+            "Namespace '<urn:samm:org.eclipse.esmf.samm+:1.0.0#>' uses an invalid URN pattern",
             focusNode, "", violationUrn, focusNode
       );
       expectSemanticValidationErrors( "namespace", "TestNamespaceInvalidUrn",
             metaModelVersion, resultForInvalidUrnNamespace );
    }
 
+   @ParameterizedTest
+   @MethodSource( value = "versionsStartingWith2_2_0")
+   void testNamespaceInvalidUrnStructure( final KnownVersion metaModelVersion) {
+      final String focusNode = "urn:samm:org:1.0.0#";
+
+      final SemanticError resultForInvalidUrnNamespace = new SemanticError(
+            "Namespace '<urn:samm:org:1.0.0#>' uses an invalid URN pattern",
+            focusNode, "", violationUrn, focusNode
+      );
+      expectSemanticValidationErrors( "namespace", "TestNamespaceInvalidUrnStructure",
+            metaModelVersion, resultForInvalidUrnNamespace );
+   }
+
    @ParameterizedTest
    @MethodSource( value = "versionsStartingWith2_2_0")
    void testNamespaceValidWithDash( final KnownVersion metaModelVersion) {

diff --git a/...st/resources/samm_2_2_0/namespace/org.eclipse.esmf.test/1.0.0/TestNamespaceInvalidUrn.ttl b/...st/resources/samm_2_2_0/namespace/org.eclipse.esmf.test/1.0.0/TestNamespaceInvalidUrn.ttl
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2024 Robert Bosch Manufacturing Solutions GmbH
+# Copyright (c) 2023 Robert Bosch Manufacturing Solutions GmbH
 #
 # See the AUTHORS file(s) distributed with this work for additional
 # information regarding authorship.
@@ -10,7 +10,7 @@
 #
 # SPDX-License-Identifier: MPL-2.0
 #
-@prefix : <urn:samm:org.eclipse.esmf.samm+test:1.0.0#> .
+@prefix : <urn:samm:org.eclipse.esmf.samm+: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#> .

diff --git a/...ces/samm_2_2_0/namespace/org.eclipse.esmf.test/1.0.0/TestNamespaceInvalidUrnStructure.ttl b/...ces/samm_2_2_0/namespace/org.eclipse.esmf.test/1.0.0/TestNamespaceInvalidUrnStructure.ttl
@@ -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: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 ;