Commit 3d92105e authored by Benoit Orihuela's avatar Benoit Orihuela
Browse files

fix(037_10): wrong q query / remove csf permutation

parent 237209b3
Loading
Loading
Loading
Loading
+3 −6
Original line number Original line Diff line number Diff line
@@ -15,19 +15,16 @@ Test Template Query Context Source Registration With Query Params
${context_source_registration_id_prefix}=                   urn:ngsi-ld:ContextSourceRegistration:
${context_source_registration_id_prefix}=                   urn:ngsi-ld:ContextSourceRegistration:
${first_context_source_registration_payload_file_path}=     csourceRegistrations/context-source-registration-sample.jsonld
${first_context_source_registration_payload_file_path}=     csourceRegistrations/context-source-registration-sample.jsonld
${second_context_source_registration_payload_file_path}=    csourceRegistrations/context-source-registration-detailed-information-sample.jsonld
${second_context_source_registration_payload_file_path}=    csourceRegistrations/context-source-registration-detailed-information-sample.jsonld
${third_context_source_registration_payload_file_path}=     csourceRegistrations/context-source-registration-location-sample.jsonld
${third_context_source_registration_payload_file_path}=     csourceRegistrations/context-source-registration-csourceProperty-sample.jsonld




*** Test Cases ***    QUERY_PARAM_NAME    QUERY_PARAM_VALUE    EXPECTATION_FILE_PATH    EXPECTED_CONTEXT_SOURCE_REGISTRATION_IDS
*** Test Cases ***    QUERY_PARAM_NAME    QUERY_PARAM_VALUE    EXPECTATION_FILE_PATH    EXPECTED_CONTEXT_SOURCE_REGISTRATION_IDS
037_10_01 With list of Entity Ids
037_10_01 With list of Entity Ids
    [Tags]    csr-query    5_10_2
    [Tags]    csr-query    5_10_2
    id    ${first_context_source_registration_id},${third_context_source_registration_id}    csourceRegistrations/expectations/context-source-registrations-037-10-01-expectation.json    ${first_context_source_registration_id}    ${third_context_source_registration_id}
    id    ${first_context_source_registration_id},${third_context_source_registration_id}    csourceRegistrations/expectations/context-source-registrations-037-10-01-expectation.json    ${first_context_source_registration_id},${third_context_source_registration_id}
037_10_02 With NGSI-LD Query
037_10_02 With NGSI-LD Query
    [Tags]    csr-query    5_10_2
    [Tags]    csr-query    5_10_2
    q    location.type=="GeoProperty"    csourceRegistrations/expectations/context-source-registrations-037-10-02-expectation.json    ${third_context_source_registration_id}
    q    csourceProperty1=="aValue"    csourceRegistrations/expectations/context-source-registrations-037-10-02-expectation.json    ${third_context_source_registration_id}
037_10_03 With Context Source Filter
    [Tags]    csr-query    5_10_2
    csf    endpoint=="http://my.csource.org:1026"    csourceRegistrations/expectations/context-source-registrations-037-10-03-expectation.json    ${first_context_source_registration_id}    ${second_context_source_registration_id}    ${third_context_source_registration_id}




*** Keywords ***
*** Keywords ***
+23 −0
Original line number Original line Diff line number Diff line
{
   "id":"urn:ngsi-ld:ContextSourceRegistration:randomUUID",
   "type":"ContextSourceRegistration",
   "information":[
      {
         "entities":[
            {
               "type":"Building"
            }
         ]
      }
   ],
   "location":{
     "type":"Point",
     "coordinates":[-8.521,41.2]
   },
   "endpoint":"http://my.csource.org:1026",
   "csourceProperty1": "aValue",
   "csourceProperty2": "anotherValue",
   "@context":[
      "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld"
   ]
}
 No newline at end of file
+40 −35
Original line number Original line Diff line number Diff line
@@ -26,12 +26,17 @@
      }
      }
    ],
    ],
    "location": {
    "location": {
         "type":"GeoProperty",
         "value":{
      "type": "Point",
      "type": "Point",
            "coordinates":[-8.521,41.2]
      "coordinates": [
         }
        -8.521,
        41.2
      ]
    },
    },
      "endpoint":"http://my.csource.org:1026"
    "endpoint": "http://my.csource.org:1026",
    "csourceProperty1": "aValue",
    "csourceProperty2": "anotherValue",
    "@context": [
      "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld"
    ]
  }
  }
]
]
 No newline at end of file
+26 −21
Original line number Original line Diff line number Diff line
@@ -12,12 +12,17 @@
      }
      }
    ],
    ],
    "location": {
    "location": {
         "type":"GeoProperty",
         "value":{
      "type": "Point",
      "type": "Point",
            "coordinates":[-8.521,41.2]
      "coordinates": [
         }
        -8.521,
        41.2
      ]
    },
    },
      "endpoint":"http://my.csource.org:1026"
    "endpoint": "http://my.csource.org:1026",
    "csourceProperty1": "aValue",
    "csourceProperty2": "anotherValue",
    "@context": [
      "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld"
    ]
  }
  }
]
]
 No newline at end of file
+61 −56
Original line number Original line Diff line number Diff line
@@ -47,12 +47,17 @@
      }
      }
    ],
    ],
    "location": {
    "location": {
         "type":"GeoProperty",
         "value":{
      "type": "Point",
      "type": "Point",
            "coordinates":[-8.521,41.2]
      "coordinates": [
         }
        -8.521,
        41.2
      ]
    },
    },
      "endpoint":"http://my.csource.org:1026"
    "endpoint": "http://my.csource.org:1026",
    "csourceProperty1": "aValue",
    "csourceProperty2": "anotherValue",
    "@context": [
      "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld"
    ]
  }
  }
]
]
 No newline at end of file
Loading