From c0e9bb061e7daafeb0f52d160199ea840ab92170 Mon Sep 17 00:00:00 2001
From: Grzegorz Kostkowski <grzegorz.kostkowski@meaningfy.ws>
Date: Mon, 16 Sep 2024 17:47:33 +0200
Subject: [PATCH] Implement unit tests for selected functions and templates,
 minor improvements in code and fixes in test data

Scope of the changes:
* Added unit tests for 2 functions and 5 templates
* made specification of `f:normaliseURI` function more precise and added a safeguard for unsupported values
* Introducced a new test file with a global variable overwritten for the included test purposes
* Removed trailing spaces in test data (as this was causing some code to fail)
* Fixed a typo
---
 src/common/utils.xsl                          |  14 ++-
 .../class-attributes-with-same-name.xsl       |   2 +-
 test/ePO-default-config/namespaces.xml        |   1 +
 .../ePO-CM-v2.0.1-2022-04-29_test.eap.xmi     |  20 ++--
 test/unitTests/test-common/test-utils.xspec   |  43 ++++++++
 ...test-class-attributes-with-same-name.xspec | 100 ++++++++++++++++++
 .../test-connectors-owl-core.xspec            |  49 +++++++++
 .../test-elements-owl-core.xspec              |  12 ---
 ...ements-owl-core_with-concept-schemes.xspec |  27 +++++
 .../test-connectors-reasoning-layer.xspec     |  10 ++
 .../test-elements-shacl-shape.xspec           |  13 +++
 11 files changed, 266 insertions(+), 25 deletions(-)
 create mode 100644 test/unitTests/test-owl-core-lib/test-elements-owl-core_with-concept-schemes.xspec

diff --git a/src/common/utils.xsl b/src/common/utils.xsl
index 4d9a960c..b033f657 100644
--- a/src/common/utils.xsl
+++ b/src/common/utils.xsl
@@ -408,18 +408,28 @@
 
 
     <xd:doc>
-        <xd:desc>Normalise URI from prefix:localSegment to prefix-localSegment</xd:desc>
+        <xd:desc>Normalise compact URI from prefix:localSegment to prefix-localSegment.
+            Regular URI is not supported.
+        </xd:desc>
         <xd:param name="uri"/>
     </xd:doc>
     <xsl:function name="f:normaliseURI">
         <xsl:param name="uri"/>
+        <xsl:if test="fn:matches($uri, '^http([s]*)://(.+)$')">
+            <xsl:sequence
+                select="fn:error(
+                    xs:QName('unsupported-uri'),
+                    'The function supports only a compact URI',
+                    ($uri)
+                )" />
+        </xsl:if>
         <xsl:sequence select="replace($uri, ':', '-')"/>
     </xsl:function>
 
 
 
     <xd:doc>
-        <xd:desc>This function is used to combine 2 URIs to build the property shape URI
+        <xd:desc>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</xd:desc>
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 4ac532a6..bc938697 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 0cb964ac..23151f8a 100644
--- a/test/ePO-default-config/namespaces.xml
+++ b/test/ePO-default-config/namespaces.xml
@@ -15,6 +15,7 @@
 
     <prefix name="epo" value="http://data.europa.eu/a4g/ontology#"/>
     <prefix name="epo-cat" value="http://data.europa.eu/a4g/ontology#"/>
+    <prefix name="epo-ecat" value="http://data.europa.eu/a4g/ontology#"/>
     <prefix name="epo-con" value="http://data.europa.eu/a4g/ontology#"/>
     <prefix name="epo-ord" value="http://data.europa.eu/a4g/ontology#"/>
     <prefix name="epo-not" value="http://data.europa.eu/a4g/ontology#"/>
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 fd92fad6..d757af38 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 @@
 								<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000395__88C9_40fc_9939_729AC07562DF" value="0"/>
 								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000396__88C9_40fc_9939_729AC07562DF" value="*"/>
 							</ownedAttribute>
-							<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstFBDE5A_2E73_42ea_A279_94BEC6A07A4C" name="epo:hasRestrictedAccessAddress " association="EAID_5EFBDE5A_2E73_42ea_A279_94BEC6A07A4C">
+							<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstFBDE5A_2E73_42ea_A279_94BEC6A07A4C" name="epo:hasRestrictedAccessAddress" association="EAID_5EFBDE5A_2E73_42ea_A279_94BEC6A07A4C">
 								<type xmi:idref="EAID_571E0BA0_00DB_4060_9B85_832916390909"/>
 								<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000397__2E73_42ea_A279_94BEC6A07A4C" value="0"/>
 								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000398__2E73_42ea_A279_94BEC6A07A4C" value="*"/>
@@ -2729,7 +2729,7 @@
 								<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000449__5092_48cf_878A_8035A42A43F9" value="1"/>
 								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000450__5092_48cf_878A_8035A42A43F9" value="*"/>
 							</ownedAttribute>
-							<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst9625AE_F9F3_47d9_B4C6_9ACDE8A17ABC" name="epo:hasQuestionsMadeAvailableVia " association="EAID_BE9625AE_F9F3_47d9_B4C6_9ACDE8A17ABC">
+							<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst9625AE_F9F3_47d9_B4C6_9ACDE8A17ABC" name="epo:hasQuestionsMadeAvailableVia" association="EAID_BE9625AE_F9F3_47d9_B4C6_9ACDE8A17ABC">
 								<type xmi:idref="EAID_571E0BA0_00DB_4060_9B85_832916390909"/>
 								<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000451__F9F3_47d9_B4C6_9ACDE8A17ABC" value="0"/>
 								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000452__F9F3_47d9_B4C6_9ACDE8A17ABC" value="*"/>
@@ -29675,7 +29675,7 @@
 			</element>
 			<element xmi:idref="EAID_EC3D2F66_1FC6_4b4c_AAD2_04A3726B2332" xmi:type="uml:Class" name="epo:InnovativeProcurement" scope="public">
 				<model package="EAPK_FE3FEF05_DD69_4fca_A8A4_6F0FCF36A9C1" tpos="0" ea_localid="901" ea_eleType="element"/>
-				<properties documentation="An instance of the class InnovativeProcurement is represented in eForms with the code &quot;inn-pur&quot; defined in the codelist strategic-procurement.&#xA;&#xA;Research (21/01/2020):&#xA;&#xA;Purchasing and early adoption of solutions which are not yet available on large scale commercial basis. &#xA;&#xA;Source: Adapted from the Digital Single Market's Policy on Public Procurement of Innovative Solutions. https://ec.europa.eu/digital-single-market/en/public-procurement-innovative-solutions&#xA;&#xA;Additional Information: &#xA;‘innovation’ means the implementation of a new or significantly improved product, service or process, including but not limited to production, building or construction processes, a new marketing method, or a new organisational method in business practices, workplace organisation or external relations inter alia with the purpose of helping to solve societal challenges or to support the Europe 2020 strategy for smart, sustainable and inclusive growth;&#xA;See: Directive 2014/24&#xA;Articles: 2, 26 (3), 31, 67 (2.a)&#xA;&#xA;Question: &#xA;Is  Pre-Commercial Procurement (PCP) another type of Strategic Procurement?" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
+				<properties documentation="An instance of the class InnovativeProcurement is represented in eForms with the code &quot;inn-pur&quot; defined in the codelist strategic-procurement.&#xA;&#xA;Research (21/01/2020):&#xA;&#xA;Purchasing and early adoption of solutions which are not yet available on large scale commercial basis. &#xA;&#xA;Source: Adapted from the Digital Single Market's Policy on Public Procurement of Innovative Solutions. https://ec.europa.eu/digital-single-market/en/public-procurement-innovative-solutions&#xA;&#xA;Additional Information: &#xA;�innovation� means the implementation of a new or significantly improved product, service or process, including but not limited to production, building or construction processes, a new marketing method, or a new organisational method in business practices, workplace organisation or external relations inter alia with the purpose of helping to solve societal challenges or to support the Europe 2020 strategy for smart, sustainable and inclusive growth;&#xA;See: Directive 2014/24&#xA;Articles: 2, 26 (3), 31, 67 (2.a)&#xA;&#xA;Question: &#xA;Is  Pre-Commercial Procurement (PCP) another type of Strategic Procurement?" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
 				<project author="estaromi" version="1.0" phase="1.0" created="2019-04-04 16:28:48" modified="2022-01-18 14:07:18" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
@@ -29689,7 +29689,7 @@
 			</element>
 			<element xmi:idref="EAID_2DF96E3A_E135_465d_908F_EAB3689291DE" xmi:type="uml:Class" name="epo:SocialProcurement" scope="public">
 				<model package="EAPK_FE3FEF05_DD69_4fca_A8A4_6F0FCF36A9C1" tpos="0" ea_localid="943" ea_eleType="element"/>
-				<properties documentation="An instance of the class SocialProcurement  is represented in eForms with the code &quot;soc-obj&quot; defined in the codelist strategic-procurement.&#xA;&#xA;&#xA;Research (21/01/2020): &#xA;Socially responsible public procurement (SRPP):&#xA;&#xA;‘SRPP’ means procurement operations that take into account one or more of the following social considerations: employment opportunities, decent work, compliance with social and labour rights, social inclusion (including persons with disabilities), equal opportunities, accessibility design for all, taking account of sustainability criteria, including ethical trade issues and wider voluntary compliance with corporate social responsibility (CSR), while observing the principles enshrined in the Treaty for the European Union (TFEU) and the Procurement Directives. &#xA;Source: Buying Social - A Guide to Taking Account of Social Considerations in Public Procurement (Publications Office of the European Union, 2011) https://op.europa.eu/en/publication-detail/-/publication/cb70c481-0e29-4040-9be2-c408cddf081f/language-en&#xA;See Article 18 and Annex X Directive 2014/24." isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
+				<properties documentation="An instance of the class SocialProcurement  is represented in eForms with the code &quot;soc-obj&quot; defined in the codelist strategic-procurement.&#xA;&#xA;&#xA;Research (21/01/2020): &#xA;Socially responsible public procurement (SRPP):&#xA;&#xA;�SRPP� means procurement operations that take into account one or more of the following social considerations: employment opportunities, decent work, compliance with social and labour rights, social inclusion (including persons with disabilities), equal opportunities, accessibility design for all, taking account of sustainability criteria, including ethical trade issues and wider voluntary compliance with corporate social responsibility (CSR), while observing the principles enshrined in the Treaty for the European Union (TFEU) and the Procurement Directives. &#xA;Source: Buying Social - A Guide to Taking Account of Social Considerations in Public Procurement (Publications Office of the European Union, 2011) https://op.europa.eu/en/publication-detail/-/publication/cb70c481-0e29-4040-9be2-c408cddf081f/language-en&#xA;See Article 18 and Annex X Directive 2014/24." isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
 				<project author="estaromi" version="1.0" phase="1.0" created="2019-04-04 16:28:40" modified="2022-01-18 14:07:18" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
@@ -44175,7 +44175,7 @@
 				</source>
 				<target xmi:idref="EAID_571E0BA0_00DB_4060_9B85_832916390909">
 					<model ea_localid="865" type="Class" name="epo:Channel"/>
-					<role name="epo:hasRestrictedAccessAddress " visibility="Public" targetScope="instance"/>
+					<role name="epo:hasRestrictedAccessAddress" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -44190,7 +44190,7 @@
 				<parameterSubstitutions/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..*" rt="+epo:hasRestrictedAccessAddress "/>
+				<labels rb="0..*" rt="+epo:hasRestrictedAccessAddress"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
@@ -44450,7 +44450,7 @@
 				</source>
 				<target xmi:idref="EAID_571E0BA0_00DB_4060_9B85_832916390909">
 					<model ea_localid="865" type="Class" name="epo:Channel"/>
-					<role name="epo:hasQuestionsMadeAvailableVia " visibility="Public" targetScope="instance"/>
+					<role name="epo:hasQuestionsMadeAvailableVia" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -44465,7 +44465,7 @@
 				<parameterSubstitutions/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..*" rt="+epo:hasQuestionsMadeAvailableVia "/>
+				<labels rb="0..*" rt="+epo:hasQuestionsMadeAvailableVia"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
@@ -47771,7 +47771,7 @@
 			</connector>
 			<connector xmi:idref="EAID_0A5318A8_808E_4ca5_8605_8CE3386C06BC">
 				<source xmi:idref="EAID_72275865_220D_4dc8_A878_5A05130DFF7C">
-					<model ea_localid="1269" type="Class" name="epo-not:CANDefence-D81 "/>
+					<model ea_localid="1269" type="Class" name="epo-not:CANDefence-D81"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -56005,7 +56005,7 @@
 			</diagram>
 			<diagram xmi:id="EAID_BD4897FA_4384_4763_89BE_E6432B04F72E">
 				<model package="EAPK_0990F7DB_C4C3_4b94_8278_C32B9B58246C" localID="121" owner="EAPK_0990F7DB_C4C3_4b94_8278_C32B9B58246C"/>
-				<properties name="Buyer and Organisation" type="Logical" documentation="&lt;ol&gt;&#xA;	&lt;li&gt;In any Procurement Procedure, there is at least one Procuring Entity;&lt;/li&gt;&#xA;	&lt;li&gt;Procuring Entities are “Organizations”, appropriately identified and described (IDs, Names, Addresses, Contact Points, etc.);&lt;/li&gt;&#xA;	&lt;li&gt;Depending on its nature and main activity a Procuring Entity may be identified simply as a Contracting Authority (general procurement) or as a Contracting Entity pursuing the procurement of gas and heat, electricity, water, transport services, ports and airports, postal services and extraction of oil and gas and exploration for, or extraction of, coal or other solid fuels. A Contracting Entity may in turn be a Contracting Authority, a Public Undertaking or entities with special or exclusive rights (Procuring Entity Type code list);&lt;/li&gt;&#xA;	&lt;li&gt;For some Procurement Procedures, a Procuring Entity can join other Procuring Entities (Joint Procurement)&lt;/li&gt;&#xA;	&lt;li&gt;In these cases, the Procuring Entities participating in the Joint Procurement adopt one role (Procuring Entity Role Type code list), e.g. the lead of the group.&lt;/li&gt;&#xA;	&lt;li&gt;Procuring Entities are in general responsible for the both the management of the procurement procedure and the purchase.  However in some cases procuring entities may buy on behalf of other procuring entities or through other procuring entities (&quot;Procuring Entity Role Type&quot;).&lt;/li&gt;&#xA;&lt;/ol&gt;&#xA;&lt;font color=&quot;#0000ff&quot;&gt;&lt;u&gt;&#xA;&lt;/u&gt;&lt;/font&gt;&lt;a href=&quot;$imageman://id=1263871221;mdg=Global;name=Legend.png;type=Bitmap;&quot;&gt;&lt;font color=&quot;#0000ff&quot;&gt;&lt;u&gt;Legend.png &lt;/u&gt;&lt;/font&gt;&lt;/a&gt;"/>
+				<properties name="Buyer and Organisation" type="Logical" documentation="&lt;ol&gt;&#xA;	&lt;li&gt;In any Procurement Procedure, there is at least one Procuring Entity;&lt;/li&gt;&#xA;	&lt;li&gt;Procuring Entities are �Organizations�, appropriately identified and described (IDs, Names, Addresses, Contact Points, etc.);&lt;/li&gt;&#xA;	&lt;li&gt;Depending on its nature and main activity a Procuring Entity may be identified simply as a Contracting Authority (general procurement) or as a Contracting Entity pursuing the procurement of gas and heat, electricity, water, transport services, ports and airports, postal services and extraction of oil and gas and exploration for, or extraction of, coal or other solid fuels. A Contracting Entity may in turn be a Contracting Authority, a Public Undertaking or entities with special or exclusive rights (Procuring Entity Type code list);&lt;/li&gt;&#xA;	&lt;li&gt;For some Procurement Procedures, a Procuring Entity can join other Procuring Entities (Joint Procurement)&lt;/li&gt;&#xA;	&lt;li&gt;In these cases, the Procuring Entities participating in the Joint Procurement adopt one role (Procuring Entity Role Type code list), e.g. the lead of the group.&lt;/li&gt;&#xA;	&lt;li&gt;Procuring Entities are in general responsible for the both the management of the procurement procedure and the purchase.  However in some cases procuring entities may buy on behalf of other procuring entities or through other procuring entities (&quot;Procuring Entity Role Type&quot;).&lt;/li&gt;&#xA;&lt;/ol&gt;&#xA;&lt;font color=&quot;#0000ff&quot;&gt;&lt;u&gt;&#xA;&lt;/u&gt;&lt;/font&gt;&lt;a href=&quot;$imageman://id=1263871221;mdg=Global;name=Legend.png;type=Bitmap;&quot;&gt;&lt;font color=&quot;#0000ff&quot;&gt;&lt;u&gt;Legend.png &lt;/u&gt;&lt;/font&gt;&lt;/a&gt;"/>
 				<project author="estaromi" version="1.0" created="2020-03-12 08:28:51" modified="2022-01-18 13:49:49"/>
 				<style1 value="ShowPrivate=1;ShowProtected=1;ShowPublic=1;HideRelationships=0;Locked=0;Border=1;HighlightForeign=0;PackageContents=1;SequenceNotes=0;ScalePrintImage=0;PPgs.cx=1;PPgs.cy=2;DocSize.cx=1618;DocSize.cy=1134;ShowDetails=0;Orientation=L;Zoom=100;ShowTags=0;OpParams=1;VisibleAttributeDetail=0;ShowOpRetType=1;ShowIcons=1;CollabNums=0;HideProps=0;ShowReqs=0;ShowCons=0;PaperSize=8;HideParents=0;UseAlias=0;HideAtts=0;HideOps=0;HideStereo=0;HideElemStereo=0;ShowTests=0;ShowMaint=0;ConnectorNotation=UML 2.1;ExplicitNavigability=0;ShowShape=1;AllDockable=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;ShowNotes=0;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;"/>
 				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;SPL=S_5FC03F=FAF3A6,2C2A31,C70A93,25C06C,82219A,024D5A,6CCE94,C9DCD7,A4651E,CDE2A8,7C1E41,41704C,057B16,637458,A699C6,D87383,3648CA,18AD3E,6BD2A5:;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=9E029714;"/>
diff --git a/test/unitTests/test-common/test-utils.xspec b/test/unitTests/test-common/test-utils.xspec
index 0a867e57..d5a30b78 100644
--- a/test/unitTests/test-common/test-utils.xspec
+++ b/test/unitTests/test-common/test-utils.xspec
@@ -311,4 +311,47 @@
         </x:call>
         <x:expect label="result" select="fn:true()"/>
     </x:scenario>
+
+
+    <x:scenario label="Scenario for testing function buildPropertyShapeURI">
+        <x:scenario label="valid CURIE">
+            <x:call function="f:buildPropertyShapeURI">
+                <x:param name="firstUri" select="'prefix:Procedure'"/>
+                <x:param name="secondUri" select="'prefix:hasScope'"/>
+            </x:call>
+            <x:expect label="result"
+                select="'http://data.europa.eu/a4g/data-shape#prefix-Procedure-prefix-hasScope'"/>
+        </x:scenario>
+
+        <x:scenario catch="yes" label="unsupported URI">
+            <x:call function="f:buildPropertyShapeURI">
+                <x:param name="firstUri" select="'http://dummy.org/Procedure'"/>
+                <x:param name="secondUri" select="'http://dummy.org/hasScope'"/>
+            </x:call>
+            <x:expect label="err:code" test="$x:result?err?code"
+                select="xs:QName('unsupported-uri')" />
+            <x:expect label="err:description" test="$x:result?err?description"
+                select="'The function supports only a compact URI'" />
+        </x:scenario>
+    </x:scenario>
+
+
+    <x:scenario label="Scenario for testing function normaliseURI">
+        <x:scenario label="valid CURIE">
+            <x:call function="f:normaliseURI">
+                <x:param name="uri" select="'prefix:Procedure'"/>
+            </x:call>
+            <x:expect label="result" select="'prefix-Procedure'"/>
+        </x:scenario>
+
+        <x:scenario catch="yes" label="unsupported URI">
+            <x:call function="f:normaliseURI">
+                <x:param name="uri" select="'http://dummy.org/Procedure'"/>
+            </x:call>
+            <x:expect label="err:code" test="$x:result?err?code"
+                select="xs:QName('unsupported-uri')" />
+            <x:expect label="err:description" test="$x:result?err?description"
+                select="'The function supports only a compact URI'" />
+        </x:scenario>
+    </x:scenario>
 </x:description>
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 4f8d9609..1f90b8c7 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 @@
         <x:expect label="expect to find a warning" test="/dd/@class = 'filter warnings'"/>
         
     </x:scenario>
+
+    <x:scenario label="classAttributesWithSameName">
+        <x:scenario label="correct input">
+            <x:context>
+                <xmi:XMI>
+                    <xmi:Extension>
+                        <element xmi:idref="id1" xmi:type="uml:Class" name="epo:Person">
+                            <attributes>
+                                <attribute xmi:idref="id2" name="epo:name">
+                                    <documentation value="The complete name of a person."/>
+                                    <properties type="rdfs:Literal"/>
+                                    <bounds lower="1" upper="1"/>
+                                </attribute>
+                                <attribute xmi:idref="id3" name="epo:address">
+                                    <documentation value="A place of residence."/>
+                                    <properties type="rdfs:Literal"/>
+                                    <bounds lower="1" upper="*"/>
+                                </attribute>
+                            </attributes>
+                        </element>
+                        <element xmi:idref="id1" xmi:type="uml:Class" name="epo:Contractor">
+                            <attributes>
+                                <attribute xmi:idref="id4" name="epo:name">
+                                    <documentation value="The complete name of a person."/>
+                                    <properties type="rdfs:Literal"/>
+                                    <bounds lower="1" upper="1"/>
+                                </attribute>
+                                <attribute xmi:idref="id5" name="epo:address">
+                                    <documentation value="A place of residence."/>
+                                    <properties type="rdfs:Literal"/>
+                                    <bounds lower="1" upper="*"/>
+                                </attribute>
+                            </attributes>
+                        </element>
+                    </xmi:Extension>
+                </xmi:XMI>
+            </x:context>
+            <x:call template="classAttributesWithSameName">
+            </x:call>
+            <x:expect label="empty section">
+                <h1 id="classAttributesUsage">Class attributes with multiple usages</h1>
+            </x:expect>
+        </x:scenario>
+
+        <x:scenario label="all possible violations captured">
+            <x:context>
+                <xmi:XMI>
+                    <xmi:Extension>
+                        <element xmi:idref="id1" xmi:type="uml:Class" name="epo:Person">
+                            <attributes>
+                                <attribute xmi:idref="id2" name="epo:name">
+                                    <documentation value="The complete name of a person."/>
+                                    <properties type="rdfs:Literal"/>
+                                    <bounds lower="1" upper="1"/>
+                                </attribute>
+                                <attribute xmi:idref="id3" name="epo:address">
+                                    <documentation value="A place of residence."/>
+                                    <properties type="rdfs:Literal"/>
+                                    <bounds lower="1" upper="*"/>
+                                </attribute>
+                            </attributes>
+                        </element>
+                        <element xmi:idref="id1" xmi:type="uml:Class" name="epo:Contractor">
+                            <attributes>
+                                <attribute xmi:idref="id4" name="epo:name">
+                                    <documentation value="Names (first and alternative) of a person."/>
+                                    <properties type="rdfs:Literal"/>
+                                    <bounds lower="1" upper="*"/>
+                                </attribute>
+                                <attribute xmi:idref="id5" name="epo:surname">
+                                    <documentation value="The complete name of a person."/>
+                                    <properties type="rdfs:Literal"/>
+                                    <bounds lower="1" upper="1"/>
+                                </attribute>
+                                <attribute xmi:idref="id6" name="epo:address">
+                                    <documentation value="A place of residence."/>
+                                    <properties type="dct:Address"/>
+                                    <bounds lower="1" upper="*"/>
+                                </attribute>
+                            </attributes>
+                        </element>
+                    </xmi:Extension>
+                </xmi:XMI>
+            </x:context>
+            <x:call template="classAttributesWithSameName">
+            </x:call>
+            <x:expect label="different datatypes"
+                test="contains(/dl[@id='attribute-epo:address-usage']/dd[@class='filter warnings']/text(), 'The attribute epo:address has different datatypes in reuse contexts')"/>
+            <x:expect label="different multiplicities" 
+                test="some $genMsg in /dl[@id='attribute-epo:name-usage']/dd[@class='filter warnings']/text()
+                    satisfies contains($genMsg, 'The attribute epo:name has different multiplicities in reuse contexts')"
+            />
+            <x:expect label="different definitions" 
+                test="some $genMsg in /dl[@id='attribute-epo:name-usage']/dd[@class='filter warnings']/text()
+                    satisfies contains($genMsg, 'The attribute epo:name is defined differently in reuse contexts')"
+            />
+        </x:scenario>
+    </x:scenario>
+
+
 </x:description>
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 68e7f53f..2d4c07ec 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 @@
         <x:expect label="skos:inScheme" test="boolean(/skos:Concept/skos:inScheme)"/>
     </x:scenario>
 
+
+    <x:scenario label="Scenario for testing connectorsOwlCore template">
+        <x:context>
+            <xmi:XMI>
+                <xmi:Extension>
+                    <connectors>
+                        <connector xmi:idref="id1">
+                            <source xmi:idref="id2">
+                                <model type="Class" name="epo:AwardDecision"/>
+                                <role visibility="Public" targetScope="instance"/>
+                                <type aggregation="none" containment="Unspecified"/>                                
+                            </source>
+                            <target xmi:idref="id3">
+                                <model type="Class" name="epo:LotAwardOutcome"/>
+                                <role name="epo:comprisesLotAwardOutcome" visibility="Public" targetScope="instance"/>
+                                <type multiplicity="1..*" aggregation="none" containment="Unspecified"/>
+                            </target>
+                            <model ea_localid="2833"/>
+                            <properties ea_type="Association" direction="Source -&gt; Destination"/>
+                            <documentation value="Incorporates LotAwardOutcome."/>
+                            <labels rb="1..*" rt="+epo:comprisesLotAwardOutcome"/>
+                        </connector>
+                        <connector xmi:idref="id4">
+                            <source xmi:idref="id5">
+                                <model type="Object" name="epo:result"/>
+                                <role visibility="Public" targetScope="instance"/>
+                                <type aggregation="none" containment="Unspecified"/>
+                            </source>
+                            <target xmi:idref="id6">
+                                <model type="Enumeration" name="at-voc:form-type"/>
+                                <role visibility="Public" targetScope="instance"/>
+                                <type aggregation="none" containment="Unspecified"/>
+                            </target>
+                            <properties ea_type="Realisation" direction="Source -&gt; Destination"/>
+                        </connector>
+                    </connectors>
+                </xmi:Extension>
+            </xmi:XMI>
+        </x:context>
+        <x:variable name="testedPropUri" as="xs:string" select="'http://data.europa.eu/a4g/ontology#comprisesLotAwardOutcome'"/>
+        <x:call template="connectorsOwlCore"/>
+    
+        <x:expect label="has only one owl:ObjectProperty defined" test="count(/owl:ObjectProperty) = 1"/>
+        <x:expect label="is owl:ObjectProperty defined" test="/owl:ObjectProperty/@rdf:about=$testedPropUri"/>
+        <x:expect label="correct skos:prefLabel" test="/rdf:Description[@rdf:about = $testedPropUri]/skos:prefLabel[@xml:lang='en']/text() = 'Comprises lot award outcome'"/>
+        <x:expect label="has skos:definition" test="boolean(/rdf:Description[@rdf:about=$testedPropUri]/skos:definition[@xml:lang='en'])"/>
+        <x:expect label="is linked to the ontology" test="/rdf:Description[@rdf:about = $testedPropUri]/rdfs:isDefinedBy/@rdf:resource = 'http://data.europa.eu/a4g/ontology#core'"/>
+    </x:scenario>
+
 </x:description>
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 53b74f5a..e6c2a4fb 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 @@
     </x:scenario>
     
 
-<!--    <x:scenario
-        label="Scenario for testing template with match 'element[@xmi:type = 'uml:Enumeration']">        
-        <x:context href="../../testData/ePO-CM_v2.0.1_test.eap.xmi"
-            select="/xmi:XMI/xmi:Extension[1]/elements[1]/element[144]"/>
-        <x:expect label="there is a skos:ConceptScheme" test="boolean(/skos:ConceptScheme)"/>
-        <x:expect label="there is a skos:prefLabel" test="boolean(/skos:ConceptScheme/skos:prefLabel)"/>
-        <x:expect label="there is a correct URI"
-            test="/skos:ConceptScheme/@rdf:about = 'http://data.europa.eu/a4g/ontology#CriterionGroupPropertyType' "
-        />
-    </x:scenario>-->
-
-
     <x:scenario
         label="Scenario for testing template with match 'element[@xmi:type = 'uml:DataType']">
         <x:context href="../../testData/ePO-CM_v2.0.1_test.eap.xmi"
diff --git a/test/unitTests/test-owl-core-lib/test-elements-owl-core_with-concept-schemes.xspec b/test/unitTests/test-owl-core-lib/test-elements-owl-core_with-concept-schemes.xspec
new file mode 100644
index 00000000..95b9abe7
--- /dev/null
+++ b/test/unitTests/test-owl-core-lib/test-elements-owl-core_with-concept-schemes.xspec
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<x:description
+    xmlns:x="http://www.jenitennison.com/xslt/xspec"
+    xmlns:uml="http://www.omg.org/spec/UML/20131001"
+    xmlns:xmi="http://www.omg.org/spec/XMI/20131001"
+    xmlns:umldi="http://www.omg.org/spec/UML/20131001/UMLDI"
+    xmlns:dc="http://www.omg.org/spec/UML/20131001/UMLDC" 
+    xmlns:owl="http://www.w3.org/2002/07/owl#"
+    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+    xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#" 
+    xmlns:dct="http://purl.org/dc/terms/"
+    xmlns:skos="http://www.w3.org/2004/02/skos/core#"
+    stylesheet="../../../src/owl-core-lib/elements-owl-core.xsl">
+
+    <x:param name="enableGenerationOfConceptSchemes" select="true()"/>
+
+    <x:scenario
+        label="Scenario for testing template with match 'element[@xmi:type = 'uml:Enumeration']">        
+        <x:context href="../../testData/ePO-CM-v2.0.1-2022-04-29_test.eap.xmi"
+            select="/xmi:XMI/xmi:Extension[1]/elements[1]/element[298]"/>
+        <x:variable name="testedEnum" as="xs:string" select="'http://www.w3.org/2006/time#TemporalUnit'"/>
+        
+        <x:expect label="there is a skos:ConceptScheme" test="/skos:ConceptScheme/@rdf:about = $testedEnum"/>
+        <x:expect label="there is a skos:prefLabel" test="/rdf:Description[@rdf:about = $testedEnum]/skos:prefLabel[@xml:lang='en']/text() = 'Temporal unit'"/>
+    </x:scenario>
+
+</x:description>
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 a7e46784..6058a6e0 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 @@
         <x:expect label="result" test="boolean(/rdf:Description/rdf:type[@rdf:resource='http://www.w3.org/2002/07/owl#AllDisjointClasses'])"/>             
     </x:scenario>
     
+    
+    <x:scenario label="Test distinctConnectorsNamesInReasoningLayer">
+        <x:context href="../../testData/ePO-CM-v2.0.1-2022-04-29_test.eap.xmi" />
+        <x:call template="distinctConnectorsNamesInReasoningLayer"/> 
+        <x:expect label="class to enumeration connector" test="/rdf:Description[@rdf:about='http://data.europa.eu/a4g/ontology#hasNotificationContentType']/rdfs:domain/@rdf:resource = 'http://data.europa.eu/a4g/ontology#Notice'"/>
+        <x:expect label="epo class to epo-cat class: domain" test="/rdf:Description[@rdf:about='http://data.europa.eu/a4g/ontology#hasPriceValidity']/rdfs:domain/@rdf:resource = 'http://data.europa.eu/a4g/ontology#eCatalogueLine'"/>
+        <x:expect label="epo class to epo-cat class: range" test="/rdf:Description[@rdf:about='http://data.europa.eu/a4g/ontology#hasPriceValidity']/rdfs:range/@rdf:resource = 'http://data.europa.eu/a4g/ontology#Period'"/>
+    </x:scenario>
+    
+
     <x:scenario
         label="Scenario for testing template with match 'connector[./properties/@ea_type = 'Association']">
         <x:context href="../../testData/ePO-CM_v.3.0.1.eap.xmi"
diff --git a/test/unitTests/test-shacl-shape-lib/test-elements-shacl-shape.xspec b/test/unitTests/test-shacl-shape-lib/test-elements-shacl-shape.xspec
index 05837399..0124504b 100644
--- a/test/unitTests/test-shacl-shape-lib/test-elements-shacl-shape.xspec
+++ b/test/unitTests/test-shacl-shape-lib/test-elements-shacl-shape.xspec
@@ -115,6 +115,19 @@
         
                
     </x:scenario>
+
+    <x:scenario label="Scenario for testing template with match element[@xmi:type = 'uml:Class']/attributes/attribute" >
+        <x:context href="../../testData/ePO_core_with_tags.xml" select="/xmi:XMI/xmi:Extension[1]/elements[1]/element[146]/attributes[1]/attribute[1]"/>
+        <x:variable name="testedPropShapeUri"
+            as="xs:string"
+            select="'http://data.europa.eu/a4g/data-shape#epo-FrameworkAgreementTerm-epo-hasMaximumParticipantsNumber'"/>
+        <x:expect label="correct node-property shapes link" test="boolean(/rdf:Description[@rdf:about='http://data.europa.eu/a4g/data-shape#epo-FrameworkAgreementTerm']/sh:property[@rdf:resource=$testedPropShapeUri])"/>
+        <x:expect label="property shape: correct name" test="/rdf:Description[@rdf:about=$testedPropShapeUri]/sh:name/text() = 'Has maximum participants number'"/>
+        <x:expect label="property shape: correct datatype" test="boolean(/rdf:Description[@rdf:about=$testedPropShapeUri]/sh:datatype[@rdf:resource='http://www.w3.org/2001/XMLSchema#integer'])"/>
+        <x:expect label="property shape: correct maxCount" test="/rdf:Description[@rdf:about=$testedPropShapeUri]/sh:maxCount = 1"/>
+        <x:expect label="property shape: correct description" test="boolean(/rdf:Description[@rdf:about=$testedPropShapeUri]/sh:description)"/>
+        <x:expect label="is property shape defined" test="boolean(/sh:PropertyShape[@rdf:about=$testedPropShapeUri]/sh:path[@rdf:resource='http://data.europa.eu/a4g/ontology#hasMaximumParticipantsNumber'])"/>
+    </x:scenario>
     
     
     <x:scenario label="Scenario for testing template with match 'ownedComment[@xmi:type='uml:Comment']">