From 97f9768906affe2f3bdace76bd836611dcc957f0 Mon Sep 17 00:00:00 2001
From: lps <amarkc0023>
Date: Mon, 8 Jun 2020 16:17:34 +0200
Subject: [PATCH] fix #EP-112

---
 .../test-elements-reasoning-layer.xspec              | 12 ++++++------
 .../test-elements-shacl-shape.xspec                  |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/test/unitTests/test-reasoning-layer-lib/test-elements-reasoning-layer.xspec b/test/unitTests/test-reasoning-layer-lib/test-elements-reasoning-layer.xspec
index e6560f13..ef608c46 100644
--- a/test/unitTests/test-reasoning-layer-lib/test-elements-reasoning-layer.xspec
+++ b/test/unitTests/test-reasoning-layer-lib/test-elements-reasoning-layer.xspec
@@ -69,12 +69,12 @@
         </x:call>   
         <x:expect label="there is a owl:Class" test="boolean(owl:Class) "/>
         <x:expect label="there is a rdfs:subClassOf" test="boolean(owl:Class/rdfs:subClassOf)"/>
-        <x:expect label="there is 2 owl:Restriction" test="count(owl:Class/rdfs:subClassOf/owl:Restriction) = 2"/>
-        <x:expect label="there is a owl:onProperty" test="boolean(owl:Class/rdfs:subClassOf/owl:Restriction/owl:onProperty)"/>
-        <x:expect label="there is a owl:minCardinality" test="boolean(owl:Class/rdfs:subClassOf/owl:Restriction/owl:minCardinality)"/>
-        <x:expect label="there is a owl:minCardinality" test="boolean(owl:Class/rdfs:subClassOf/owl:Restriction/owl:maxCardinality)"/>
-        <x:expect label="there is a correct value for owl:maxCardinality" test="owl:Class/rdfs:subClassOf/owl:Restriction/owl:maxCardinality/text() = '3'"/>
-        <x:expect label="there is a correct value for owl:minCardinality" test="owl:Class/rdfs:subClassOf/owl:Restriction/owl:minCardinality/text() = '1'"/>
+        <x:expect label="there is 2 owl:Restriction" test="count(owl:Class/rdfs:subClassOf/owl:Class/owl:intersectionOf/owl:Restriction) = 2"/>
+        <x:expect label="there is a owl:onProperty" test="boolean(//owl:Restriction/owl:onProperty)"/>
+        <x:expect label="there is a owl:minCardinality" test="boolean(//owl:Restriction/owl:minCardinality)"/>
+        <x:expect label="there is a owl:minCardinality" test="boolean(//owl:Restriction/owl:maxCardinality)"/>
+        <x:expect label="there is a correct value for owl:maxCardinality" test="//owl:Restriction/owl:maxCardinality/text() = '3'"/>
+        <x:expect label="there is a correct value for owl:minCardinality" test="//owl:Restriction/owl:minCardinality/text() = '1'"/>
     </x:scenario>
 
 
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 56b767f4..47bd83ac 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
@@ -75,7 +75,7 @@
         <x:expect label="there is sh:select" test="boolean(sh:NodeShape/sh:sparql/sh:select)"/>
     </x:scenario>
     
-    <x:scenario label="Scenario for attribute range shape for valid datatype">
+    <x:scenario label="Scenario for attribute range shape for a class type">
         <x:call template="attributeRangeShape">
             <x:param name="attribute" href="../../testData/ePO-CM-v2.0.1-2020-03-27_test.eap.xmi" select="/xmi:XMI/xmi:Extension[1]/elements[1]/element[290]/attributes[1]/attribute[6]"/>
         </x:call>   
@@ -83,7 +83,7 @@
         <x:expect label="there is a sh:PropertyShape" test="boolean(sh:property/sh:PropertyShape)"/>
         <x:expect label="there is a sh:name" test="boolean(sh:property/sh:PropertyShape/sh:name)"/>
         <x:expect label="there is a sh:path" test="boolean(sh:property/sh:PropertyShape/sh:path)"/>
-        <x:expect label="there is a sh:datatype" test="boolean(sh:property/sh:PropertyShape/sh:datatype)"/>
+        <x:expect label="there is a sh:class" test="boolean(sh:property/sh:PropertyShape/sh:class)"/>
     </x:scenario>
     
     <x:scenario label="Scenario for attribute range shape for invalid datatype">