diff --git a/src/common/utils.xsl b/src/common/utils.xsl
index 4d9a960..b033f65 100644
--- a/src/common/utils.xsl
+++ b/src/common/utils.xsl
@@ -408,18 +408,28 @@
- Normalise URI from prefix:localSegment to prefix-localSegment
+ Normalise compact URI from prefix:localSegment to prefix-localSegment.
+ Regular URI is not supported.
+
+
+
+
- This function is used to combine 2 URIs to build the property shape URI
+ This function is used to combine 2 compact URIs to build the property shape URI
shape-base-uri:{SourceClassURI}-{PropertyOrAttributeURI} Example: Class URI -
prefix:Procedure Attribute URI - prefix:hasScope Result will be
http://base.uri/data-shape/prefix-Procedure-prefix-hasScope
diff --git a/src/html-conventions-lib/class-attributes-with-same-name.xsl b/src/html-conventions-lib/class-attributes-with-same-name.xsl
index 4ac532a..bc93869 100644
--- a/src/html-conventions-lib/class-attributes-with-same-name.xsl
+++ b/src/html-conventions-lib/class-attributes-with-same-name.xsl
@@ -190,7 +190,7 @@
()
else
if (fn:boolean($datatypeValues)) then
- f:generateFormattedWarningMessage(fn:concat('The attribute ', $attributeName, ' is has different datatypes in reuse contexts.',
+ f:generateFormattedWarningMessage(fn:concat('The attribute ', $attributeName, ' has different datatypes in reuse contexts.',
'When a property is reused in multiple contexts, the data-type is expected to be the same.',
'In this case, multiple data-types are found: '), $datatypeWithAnnotations,
'//elements/element/attributes',
diff --git a/test/ePO-default-config/namespaces.xml b/test/ePO-default-config/namespaces.xml
index 0cb964a..23151f8 100644
--- a/test/ePO-default-config/namespaces.xml
+++ b/test/ePO-default-config/namespaces.xml
@@ -15,6 +15,7 @@
+
diff --git a/test/testData/ePO-CM-v2.0.1-2022-04-29_test.eap.xmi b/test/testData/ePO-CM-v2.0.1-2022-04-29_test.eap.xmi
index fd92fad..d757af3 100644
--- a/test/testData/ePO-CM-v2.0.1-2022-04-29_test.eap.xmi
+++ b/test/testData/ePO-CM-v2.0.1-2022-04-29_test.eap.xmi
@@ -2518,7 +2518,7 @@
-
+
@@ -2729,7 +2729,7 @@
-
+
@@ -29675,7 +29675,7 @@
-
+
@@ -29689,7 +29689,7 @@
-
+
@@ -44175,7 +44175,7 @@
-
+
@@ -44190,7 +44190,7 @@
-
+
@@ -44450,7 +44450,7 @@
-
+
@@ -44465,7 +44465,7 @@
-
+
@@ -47771,7 +47771,7 @@
-
+
@@ -56005,7 +56005,7 @@
-
+
diff --git a/test/unitTests/test-common/test-utils.xspec b/test/unitTests/test-common/test-utils.xspec
index 0a867e5..d5a30b7 100644
--- a/test/unitTests/test-common/test-utils.xspec
+++ b/test/unitTests/test-common/test-utils.xspec
@@ -311,4 +311,47 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/test/unitTests/test-html-conventions-lib/test-class-attributes-with-same-name.xspec b/test/unitTests/test-html-conventions-lib/test-class-attributes-with-same-name.xspec
index 4f8d960..1f90b8c 100644
--- a/test/unitTests/test-html-conventions-lib/test-class-attributes-with-same-name.xspec
+++ b/test/unitTests/test-html-conventions-lib/test-class-attributes-with-same-name.xspec
@@ -113,4 +113,104 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Class attributes with multiple usages
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/test/unitTests/test-owl-core-lib/test-connectors-owl-core.xspec b/test/unitTests/test-owl-core-lib/test-connectors-owl-core.xspec
index 68e7f53..2d4c07e 100644
--- a/test/unitTests/test-owl-core-lib/test-connectors-owl-core.xspec
+++ b/test/unitTests/test-owl-core-lib/test-connectors-owl-core.xspec
@@ -129,4 +129,53 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/test/unitTests/test-owl-core-lib/test-elements-owl-core.xspec b/test/unitTests/test-owl-core-lib/test-elements-owl-core.xspec
index 53b74f5..e6c2a4f 100644
--- a/test/unitTests/test-owl-core-lib/test-elements-owl-core.xspec
+++ b/test/unitTests/test-owl-core-lib/test-elements-owl-core.xspec
@@ -41,18 +41,6 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/test/unitTests/test-reasoning-layer-lib/test-connectors-reasoning-layer.xspec b/test/unitTests/test-reasoning-layer-lib/test-connectors-reasoning-layer.xspec
index a7e4678..6058a6e 100644
--- a/test/unitTests/test-reasoning-layer-lib/test-connectors-reasoning-layer.xspec
+++ b/test/unitTests/test-reasoning-layer-lib/test-connectors-reasoning-layer.xspec
@@ -39,6 +39,16 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+