Remove resources/ApiUtils.resource, simplify notification_server_host, and...

lopezaguilarrequested to merge
apiutils into develop
  • Remove ApiUtils.resource and create concrete ApiUtils.resource files for each API operation
  • Remove some unused keywords and variables
  • Correct some problems in TCs
  • Homogenize the name of the TCs and TS
  • Add a new variable for management of GET Temporal operation (Orion-LD case)
  • Remove redundant variables send_notification_server_host and send_notification_server_port
  • Remove 'Get Temporal Representation Of Entity' and use only 'Retrieve Temporal Representation Of Entity'
  • Correction of some typos
  • Synchronized Tests Requirements Summary Google Excel document
Edited by lopezaguilar

Merge request reports

.idea/runConfigurations/Run_All_Test_Suites_with_Listener.xml

0 → 100644
+19 −0
Changes for .idea/runConfigurations/Run_All_Test_Suites_with_Listener.xml: 19 added lines, 0 removed lines.
Original line number Diff line number Diff line 
<component name="ProjectRunConfigurationManager">

  <configuration default="false" name="Run All Test Suites with Listener" type="RobotFramework" factoryName="RobotFramework">

    <option name="target" value="$ProjectFileDir$" />

    <option name="args">

      <list>

        <option value="--listener" />

        <option value="libraries/ErrorListener.py" />

        <option value="--outputdir" />

        <option value="./results" />

      </list>

    </option>

    <option name="env">

      <map />

    </option>

    <option name="workingDir" value="$ProjectFileDir$" />

    <option name="makeSuite" value="true" />

    <method v="2" />

  </configuration>

</component>
 
 No newline at end of file

.idea/runConfigurations/Run_Current_Test_Suite.xml

0 → 100644
+17 −0
Changes for .idea/runConfigurations/Run_Current_Test_Suite.xml: 17 added lines, 0 removed lines.
Original line number Diff line number Diff line 
<component name="ProjectRunConfigurationManager">

  <configuration default="false" name="Run Current Test Suite" type="RobotFramework" factoryName="RobotFramework">

    <option name="target" value="$FilePath$" />

    <option name="args">

      <list>

        <option value="--outputdir" />

        <option value="./results" />

      </list>

    </option>

    <option name="env">

      <map />

    </option>

    <option name="workingDir" value="$ProjectFileDir$" />

    <option name="makeSuite" value="true" />

    <method v="2" />

  </configuration>

</component>
 
 No newline at end of file

.idea/runConfigurations/Run_Current_Test_Suite_with_Listener.xml

0 → 100644
+19 −0
Changes for .idea/runConfigurations/Run_Current_Test_Suite_with_Listener.xml: 19 added lines, 0 removed lines.
Original line number Diff line number Diff line 
<component name="ProjectRunConfigurationManager">

  <configuration default="false" name="Run Current Test Suite with Listener" type="RobotFramework" factoryName="RobotFramework">

    <option name="target" value="$FilePath$" />

    <option name="args">

      <list>

        <option value="--listener" />

        <option value="libraries/ErrorListener.py" />

        <option value="--outputdir" />

        <option value="./results" />

      </list>

    </option>

    <option name="env">

      <map />

    </option>

    <option name="workingDir" value="$ProjectFileDir$" />

    <option name="makeSuite" value="true" />

    <method v="2" />

  </configuration>

</component>
 
 No newline at end of file

TP/NGSI-LD/CommonBehaviours/044_02.robot→TP/NGSI-LD/CommonBehaviours/CommonResponses/VerifyGETWithoutAccept/045_01.robot

+11 −5
Changes for TP/NGSI-LD/CommonBehaviours/CommonResponses/VerifyGETWithoutAccept/045_01.robot: 11 added lines, 5 removed lines.
Original line number Diff line number Diff line 
*** Settings ***

Documentation       Verify that on a GET HTTP request if nothing is specified on the Accept header, "application/json" is assumed



Resource            ${EXECDIR}/resources/ApiUtils.resource

Resource            ${EXECDIR}/resources/ApiUtils/ContextInformationProvision.resource

Resource            ${EXECDIR}/resources/ApiUtils/ContextInformationConsumption.resource

Resource            ${EXECDIR}/resources/ApiUtils/ContextInformationSubscription.resource

Resource            ${EXECDIR}/resources/ApiUtils/ContextSourceRegistration.resource

Resource            ${EXECDIR}/resources/ApiUtils/ContextSourceDiscovery.resource

Resource            ${EXECDIR}/resources/ApiUtils/TemporalContextInformationProvision.resource

Resource            ${EXECDIR}/resources/ApiUtils/TemporalContextInformationConsumption.resource

Resource            ${EXECDIR}/resources/AssertionUtils.resource

Resource            ${EXECDIR}/resources/JsonUtils.resource
@@ -21,7 +27,7 @@ ${content_type}= application/json 




*** Test Cases ***

044_02_01_endpoint /entities/{entityId}

045_01_01 Endpoint /entities/{entityId}

    [Documentation]    Verify that on a GET HTTP request if nothing is specified on the Accept header, "application/json" is assumed (/entities/{entityId})

    [Tags]    e-query    6_3_4

    ${id}=    Generate Random Entity Id    ${building_id_prefix}
@@ -36,7 +42,7 @@ ${content_type}= application/json 
    Check Response Headers Link Not Empty    ${response.headers}

    [Teardown]    Delete Entity by Id Returning Response    ${id}



044_02_02_endpoint /subscriptions/{subscriptionId}

045_01_02 Endpoint /subscriptions/{subscriptionId}

    [Documentation]    Verify that on a GET HTTP request if nothing is specified on the Accept header, "application/json" is assumed (/subscriptions/{subscriptionId})

    [Tags]    sub-retrieve    6_3_4

    ${id}=    Generate Random Entity Id    ${subscription_id_prefix}
@@ -48,7 +54,7 @@ ${content_type}= application/json 
    Check Response Headers Link Not Empty    ${response.headers}

    [Teardown]    Delete Subscription    ${id}



044_02_03_endpoint /csourceRegistrations/

045_01_03 Endpoint /csourceRegistrations/

    [Documentation]    Verify that on a GET HTTP request if nothing is specified on the Accept header, "application/json" is assumed (/csourceRegistrations/)

    [Tags]    csr-query    6_3_4

    ${registration_id}=    Generate Random Entity Id    ${registration_id_prefix}
@@ -66,7 +72,7 @@ ${content_type}= application/json 
    Check Response Headers Link Not Empty    ${response.headers}

    [Teardown]    Delete Context Source Registration    ${registration_id}



044_02_04_endpoint /temporal/entities

045_01_04 Endpoint /temporal/entities

    [Documentation]    Verify that on a GET HTTP request if nothing is specified on the Accept header, "application/json" is assumed (/temporal/entities)

    [Tags]    te-query    6_3_4

    ${temporal_entity_representation_id}=    Generate Random Entity Id    ${tea_id_prefix}

TP/NGSI-LD/CommonBehaviours/043.robot→TP/NGSI-LD/CommonBehaviours/CommonResponses/VerifyLdContextNotAvailable/043_01.robot

+15 −12
Changes for TP/NGSI-LD/CommonBehaviours/CommonResponses/VerifyLdContextNotAvailable/043_01.robot: 15 added lines, 12 removed lines.
Original line number Diff line number Diff line 
*** Settings ***

Documentation       Verify throwing 503 – LdContextNotAvailable error if remote JSON-LD @context cannot be retrieved

Documentation       Verify receiving 503 – LdContextNotAvailable error if remote JSON-LD @context cannot be retrieved



Resource            ${EXECDIR}/resources/ApiUtils.resource

Resource            ${EXECDIR}/resources/ApiUtils/ContextInformationProvision.resource

Resource            ${EXECDIR}/resources/ApiUtils/ContextInformationSubscription.resource

Resource            ${EXECDIR}/resources/ApiUtils/ContextSourceRegistration.resource

Resource            ${EXECDIR}/resources/ApiUtils/TemporalContextInformationProvision.resource

Resource            ${EXECDIR}/resources/AssertionUtils.resource

Resource            ${EXECDIR}/resources/JsonUtils.resource
@@ -19,8 +22,8 @@ ${registration_filename}= csourceRegistrations/context-source-registration 




*** Test Cases ***

043_01 Create entity

    [Documentation]    Verify throwing 503 – LdContextNotAvailable error if remote JSON-LD @context cannot be retrieved (Create entity)

043_01_01 Create entity

    [Documentation]    Verify receiving 503 – LdContextNotAvailable error if remote JSON-LD @context cannot be retrieved (Create entity)

    [Tags]    e-create    5_2_2

    ${entity_id}=    Generate Random Entity Id    ${building_id_prefix}

    ${response}=    Create Entity Selecting Content Type
@@ -34,8 +37,8 @@ ${registration_filename}= csourceRegistrations/context-source-registration 
    Check Response Body Containing ProblemDetails Element Containing Title Element    ${response.json()}

    [Teardown]    Delete Entity by Id    ${entity_id}



043_02 Create subscription

    [Documentation]    Verify throwing 503 – LdContextNotAvailable error if remote JSON-LD @context cannot be retrieved (Create subscription)

043_01_02 Create subscription

    [Documentation]    Verify receiving 503 – LdContextNotAvailable error if remote JSON-LD @context cannot be retrieved (Create subscription)

    [Tags]    sub-create    5_2_2

    ${subscription_id}=    Generate Random Entity Id    ${subscription_id_prefix}

    ${response}=    Create Subscription    ${subscription_id}    ${subscription_filename}    ${CONTENT_TYPE_LD_JSON}
@@ -46,8 +49,8 @@ ${registration_filename}= csourceRegistrations/context-source-registration 
    Check Response Body Containing ProblemDetails Element Containing Title Element    ${response.json()}

    [Teardown]    Delete Subscription    ${subscription_id}



043_03 Create Temporal Representation of Entities

    [Documentation]    Verify throwing 503 – LdContextNotAvailable error if remote JSON-LD @context cannot be retrieved (Create Temporal Representation of Entities)

043_01_03 Create Temporal Representation of Entities

    [Documentation]    Verify receiving 503 – LdContextNotAvailable error if remote JSON-LD @context cannot be retrieved (Create Temporal Representation of Entities)

    [Tags]    te-create    5_2_2

    ${temporal_entity_representation_id}=    Generate Random Entity Id    ${tea_id_prefix}

    ${response}=    Create Or Update Temporal Representation Of Entity Selecting Content Type
@@ -61,8 +64,8 @@ ${registration_filename}= csourceRegistrations/context-source-registration 
    Check Response Body Containing ProblemDetails Element Containing Title Element    ${response.json()}

    [Teardown]    Delete Temporal Representation Of Entity    ${temporal_entity_representation_id}



043_04 Batch entity create

    [Documentation]    Verify throwing 503 – LdContextNotAvailable error if remote JSON-LD @context cannot be retrieved (Batch entity create)

043_01_04 Batch entity create

    [Documentation]    Verify receiving 503 – LdContextNotAvailable error if remote JSON-LD @context cannot be retrieved (Batch entity create)

    [Tags]    be-create    5_2_2

    ${first_entity_id}=    Generate Random Entity Id    ${building_id_prefix}

    ${second_entity_id}=    Generate Random Entity Id    ${building_id_prefix}
@@ -78,8 +81,8 @@ ${registration_filename}= csourceRegistrations/context-source-registration 
    Check Response Body Containing ProblemDetails Element Containing Title Element    ${response.json()}

    [Teardown]    Batch Delete Entities    @{entities_ids_to_be_created}



043_05 Create context source registration

    [Documentation]    Verify throwing 503 – LdContextNotAvailable error if remote JSON-LD @context cannot be retrieved (Create context source registration)

043_01_05 Create context source registration

    [Documentation]    Verify receiving 503 – LdContextNotAvailable error if remote JSON-LD @context cannot be retrieved (Create context source registration)

    [Tags]    csr-create    5_2_2

    ${registration_id}=    Generate Random Entity Id    ${registration_id_prefix}

    ${payload}=    Load JSON From File    ${EXECDIR}/data/${registration_filename}