From 9dc6d38b428f18479b78b0a2e0905af5f2860e47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ferm=C3=ADn=20Gal=C3=A1n=20M=C3=A1rquez?= Date: Tue, 11 Jun 2024 15:47:39 +0200 Subject: [PATCH] FIX enable statistics_with_counters.test --- ...DISABLED => statistics_with_counters.test} | 80 ++----------------- 1 file changed, 7 insertions(+), 73 deletions(-) rename test/functionalTest/cases/0000_statistics_operation/{statistics_with_counters.test.DISABLED => statistics_with_counters.test} (83%) diff --git a/test/functionalTest/cases/0000_statistics_operation/statistics_with_counters.test.DISABLED b/test/functionalTest/cases/0000_statistics_operation/statistics_with_counters.test similarity index 83% rename from test/functionalTest/cases/0000_statistics_operation/statistics_with_counters.test.DISABLED rename to test/functionalTest/cases/0000_statistics_operation/statistics_with_counters.test index 26f899f85f..e184f39215 100644 --- a/test/functionalTest/cases/0000_statistics_operation/statistics_with_counters.test.DISABLED +++ b/test/functionalTest/cases/0000_statistics_operation/statistics_with_counters.test @@ -44,17 +44,15 @@ brokerStart CB 0 IPv4 -statCounters # # All counters has 1 hit. # -# As a kind of checksum note there are 60 orionCurl ocurrences in this file -# (it can be checked with grep) and that: +# As a kind of checksum note there are 53 orionCurl ocurrences in this file +# (it can be checked with grep orionCurl | grep '\-\-url' | wc -l) and that: # -# - jsonRequests: 16 -# - noPayloadRequests: 42 +# - jsonRequests: 11 +# - noPayloadRequests: 40 # - textRequest: 1 # - (comented orionCurl) 1 # -# which sum 131 - -# Not legacy +# which sum 53 orionCurl --url /admin/log > /dev/null @@ -207,46 +205,6 @@ orionCurl --url /v2/types/T -X OPTIONS > /dev/null orionCurl --url /version > /dev/null -# Legacy - -payload='{}' -orionCurl --url /v1/contextEntities/E -X DELETE > /dev/null -orionCurl --url /v1/contextEntities/E -X PUT --payload "$payload" > /dev/null - -orionCurl --url /v1/contextEntities/E/attributes/A > /dev/null - -payload='{ - "entities": [ - { - "type": "T", - "isPattern": "false", - "id": "E" - } - ] -}' -orionCurl --url /ngsi10/queryContext -X POST --payload "$payload" > /dev/null -orionCurl --url /v1/queryContext -X POST --payload "$payload" > /dev/null - -payload='{ - "contextElements": [ - { - "type": "T", - "isPattern": "false", - "id": "E", - "attributes": [ - { - "name": "A", - "type": "Text", - "value": "foo" - } - ] - } - ], - "updateAction": "APPEND" -}' -orionCurl --url /ngsi10/updateContext -X POST --payload "$payload" > /dev/null -orionCurl --url /v1/updateContext -X POST --payload "$payload" > /dev/null - # Get statistics orionCurl --url /statistics @@ -260,11 +218,8 @@ Content-Length: REGEX(\d+) { "counters": { - "deprecatedFeatures": { - "ngsiv1Requests": 7 - }, - "jsonRequests": 16, - "noPayloadRequests": 42, + "jsonRequests": 11, + "noPayloadRequests": 40, "requests": { "/admin/log": { "GET": 1, @@ -359,27 +314,6 @@ Content-Length: REGEX(\d+) "GET": 1 } }, - "requestsLegacy": { - "/ngsi10/queryContext": { - "POST": 1 - }, - "/ngsi10/updateContext": { - "POST": 1 - }, - "/v1/contextEntities/{id}": { - "DELETE": 1, - "PUT": 1 - }, - "/v1/contextEntities/{id}/attributes/{name}": { - "GET": 1 - }, - "/v1/queryContext": { - "POST": 1 - }, - "/v1/updateContext": { - "POST": 1 - } - }, "textRequests": 1 }, "measuring_interval_in_secs": REGEX(\d+),