Merge "Clean up CSIT Test"

diff --combined csit/tests/cps-data/cps-data.robot
index bcab3a6,0e3dfab..f506b28
--- 1/csit/tests/cps-data/cps-data.robot
--- 2/csit/tests/cps-data/cps-data.robot
+++ b/csit/tests/cps-data/cps-data.robot
@@@ -38,7 -38,7 +38,7 @@@ ${anchorName}           CSIT-Ancho
  Create Data Node
      ${uri}=             Set Variable        ${basePath}/v1/dataspaces/${dataspaceName}/anchors/${anchorName}/nodes
      ${headers}          Create Dictionary   Content-Type=application/json   Authorization=${auth}
-     ${jsonData}=        Get Binary File     ${DATADIR}${/}test-tree.json
+     ${jsonData}=        Get Binary File     ${DATADIR_CPS_CORE}${/}test-tree.json
      ${response}=        POST On Session     CPS_URL   ${uri}   headers=${headers}   data=${jsonData}
      Should Be Equal As Strings              ${response.status_code}   201
  
@@@ -46,7 -46,7 +46,7 @@@ Patch Data Nod
      ${uri}=             Set Variable        ${basePath}/v1/dataspaces/${dataspaceName}/anchors/${anchorName}/nodes
      ${params}=          Create Dictionary   xpath=/test-tree/branch[@name='Right']
      ${headers}          Create Dictionary   Content-Type=application/json   Authorization=${auth}
-     ${jsonData}=        Get Binary File     ${DATADIR}${/}testTreePatchExample.json
+     ${jsonData}=        Get Binary File     ${DATADIR_CPS_CORE}${/}testTreePatchExample.json
      ${response}=        PATCH On Session    CPS_URL   ${uri}  params=${params}   headers=${headers}   data=${jsonData}
      Should Be Equal As Strings              ${response.status_code}   200
  
@@@ -57,19 -57,13 +57,18 @@@ Get Updated Data Node by XPat
      ${response}=        Get On Session      CPS_URL   ${uri}   params=${params}   headers=${headers}   expected_status=200
      ${responseJson}=    Set Variable        ${response.json()['tree:nest']}
      Should Be Equal As Strings              ${responseJson['name']}   Bigger
 -    Should Be Equal As Strings              ${responseJson['birds']}   ['Falcon', 'Eagle', 'Pigeon']
 +    ${length_birds}=    Get Length          ${responseJson['birds']}
 +    Should Be Equal As Integers             ${length_birds}   3
 +    ${expected_list}=         Create List   Pigeon   Falcon   Eagle
 +    FOR      ${item_to_check}     IN      @{expected_list}
 +        Should Contain     ${responseJson['birds']}     ${item_to_check}
 +    END
  
  Get Data Node by XPath
      ${uri}=             Set Variable        ${basePath}/v1/dataspaces/${dataspaceName}/anchors/${anchorName}/node
      ${params}=          Create Dictionary   xpath=/test-tree/branch[@name='LEFT/left']/nest
      ${headers}=         Create Dictionary   Authorization=${auth}
      ${response}=        Get On Session      CPS_URL   ${uri}   params=${params}   headers=${headers}   expected_status=200
-     ${responseJson}=    Set Variable        ${response.json()['tree:nest']}
-     Should Be Equal As Strings              ${responseJson['name']}   SMALL/small
+     Should Be Equal As Strings              ${response.json()['tree:nest']['name']}   SMALL/small