Skip to content

Commit c08467d

Browse files
orianarorianar
committed
roll back tests
1 parent b19e69c commit c08467d

File tree

56 files changed

+111
-149
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+111
-149
lines changed

‎test/functionalTest/cases/2560_custom_notification_json/custom_notification_http_json_errors.test‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,10 +90,10 @@ HTTP/1.1 400 Bad Request
9090
Date: REGEX(.*)
9191
Fiware-Correlator: REGEX([0-9a-f\-]{36})
9292
Content-Type: application/json
93-
Content-Length: 146
93+
Content-Length: 133
9494

9595
{
96-
"description": "only one of payload, json or ngsi fields accepted at the same time in httpCustom, mqttCustom or kafkaCustom",
96+
"description": "only one of payload, json or ngsi fields accepted at the same time in httpCustom or mqttCustom",
9797
"error": "BadRequest"
9898
}
9999

@@ -104,10 +104,10 @@ HTTP/1.1 400 Bad Request
104104
Date: REGEX(.*)
105105
Fiware-Correlator: REGEX([0-9a-f\-]{36})
106106
Content-Type: application/json
107-
Content-Length: 115
107+
Content-Length: 102
108108

109109
{
110-
"description": "json fields in httpCustom, mqttCustom or kafkaCustom must be object or array",
110+
"description": "json fields in httpCustom or mqttCustom must be object or array",
111111
"error": "BadRequest"
112112
}
113113

‎test/functionalTest/cases/2560_custom_notification_json/custom_notification_mqtt_json_constants.test‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ payload='{
5252
"notification": {
5353
"mqttCustom": {
5454
"topic": "topic1",
55-
"url": "mqtt://mosquitto:1883",
55+
"url": "mqtt://localhost:1883",
5656
"json": {
5757
"text": "foo",
5858
"number": 10,
@@ -96,7 +96,7 @@ payload='{
9696
"notification": {
9797
"mqttCustom": {
9898
"topic": "topic1",
99-
"url": "mqtt://mosquitto:1883",
99+
"url": "mqtt://localhost:1883",
100100
"json": [
101101
"foo",
102102
10,
@@ -229,7 +229,7 @@ Content-Length: 946
229229
"qos": 0,
230230
"retain": false,
231231
"topic": "topic1",
232-
"url": "mqtt://mosquitto:1883"
232+
"url": "mqtt://localhost:1883"
233233
},
234234
"onlyChangedAttrs": false
235235
},
@@ -287,7 +287,7 @@ Content-Length: 946
287287
"qos": 0,
288288
"retain": false,
289289
"topic": "topic1",
290-
"url": "mqtt://mosquitto:1883"
290+
"url": "mqtt://localhost:1883"
291291
},
292292
"onlyChangedAttrs": false
293293
},

‎test/functionalTest/cases/2560_custom_notification_json/custom_notification_mqtt_json_errors.test‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -91,10 +91,10 @@ HTTP/1.1 400 Bad Request
9191
Date: REGEX(.*)
9292
Fiware-Correlator: REGEX([0-9a-f\-]{36})
9393
Content-Type: application/json
94-
Content-Length: 146
94+
Content-Length: 133
9595

9696
{
97-
"description": "only one of payload, json or ngsi fields accepted at the same time in httpCustom, mqttCustom or kafkaCustom",
97+
"description": "only one of payload, json or ngsi fields accepted at the same time in httpCustom or mqttCustom",
9898
"error": "BadRequest"
9999
}
100100

@@ -105,10 +105,10 @@ HTTP/1.1 400 Bad Request
105105
Date: REGEX(.*)
106106
Fiware-Correlator: REGEX([0-9a-f\-]{36})
107107
Content-Type: application/json
108-
Content-Length: 115
108+
Content-Length: 102
109109

110110
{
111-
"description": "json fields in httpCustom, mqttCustom or kafkaCustom must be object or array",
111+
"description": "json fields in httpCustom or mqttCustom must be object or array",
112112
"error": "BadRequest"
113113
}
114114

‎test/functionalTest/cases/2560_custom_notification_json/custom_notification_mqtt_json_replacements.test‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ payload='{
5252
"notification": {
5353
"mqttCustom": {
5454
"topic": "topic1",
55-
"url": "mqtt://mosquitto:1883",
55+
"url": "mqtt://localhost:1883",
5656
"json": {
5757
"text": "${text}",
5858
"number": "${number}",
@@ -83,7 +83,7 @@ payload='{
8383
"notification": {
8484
"mqttCustom": {
8585
"topic": "topic1",
86-
"url": "mqtt://mosquitto:1883",
86+
"url": "mqtt://localhost:1883",
8787
"json": [
8888
"${text}",
8989
"${number}",
@@ -214,7 +214,7 @@ Content-Length: 868
214214
"qos": 0,
215215
"retain": false,
216216
"topic": "topic1",
217-
"url": "mqtt://mosquitto:1883"
217+
"url": "mqtt://localhost:1883"
218218
},
219219
"onlyChangedAttrs": false
220220
},
@@ -250,7 +250,7 @@ Content-Length: 868
250250
"qos": 0,
251251
"retain": false,
252252
"topic": "topic1",
253-
"url": "mqtt://mosquitto:1883"
253+
"url": "mqtt://localhost:1883"
254254
},
255255
"onlyChangedAttrs": false
256256
},

‎test/functionalTest/cases/2560_custom_notification_json/custom_notification_mqtt_json_replacements_inside.test‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ payload='{
5252
"notification": {
5353
"mqttCustom": {
5454
"topic": "topic1",
55-
"url": "mqtt://mosquitto:1883",
55+
"url": "mqtt://localhost:1883",
5656
"json": {
5757
"A": "ns:${text}",
5858
"B": "ns:${number}",
@@ -83,7 +83,7 @@ payload='{
8383
"notification": {
8484
"mqttCustom": {
8585
"topic": "topic1",
86-
"url": "mqtt://mosquitto:1883",
86+
"url": "mqtt://localhost:1883",
8787
"json": [
8888
"ns:${text}",
8989
"ns:${number}",
@@ -213,7 +213,7 @@ Content-Length: 881
213213
"qos": 0,
214214
"retain": false,
215215
"topic": "topic1",
216-
"url": "mqtt://mosquitto:1883"
216+
"url": "mqtt://localhost:1883"
217217
},
218218
"onlyChangedAttrs": false
219219
},
@@ -249,7 +249,7 @@ Content-Length: 881
249249
"qos": 0,
250250
"retain": false,
251251
"topic": "topic1",
252-
"url": "mqtt://mosquitto:1883"
252+
"url": "mqtt://localhost:1883"
253253
},
254254
"onlyChangedAttrs": false
255255
},

‎test/functionalTest/cases/2560_custom_notification_json/custom_notification_mqtt_json_replacements_inside_multi.test‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ payload='{
5252
"notification": {
5353
"mqttCustom": {
5454
"topic": "topic1",
55-
"url": "mqtt://mosquitto:1883",
55+
"url": "mqtt://localhost:1883",
5656
"json": {
5757
"A": "ns:${text}:${object}",
5858
"B": "ns:${number}:${array}",
@@ -83,7 +83,7 @@ payload='{
8383
"notification": {
8484
"mqttCustom": {
8585
"topic": "topic1",
86-
"url": "mqtt://mosquitto:1883",
86+
"url": "mqtt://localhost:1883",
8787
"json": [
8888
"ns:${text}:${object}",
8989
"ns:${number}:${array}",
@@ -214,7 +214,7 @@ Content-Length: 987
214214
"qos": 0,
215215
"retain": false,
216216
"topic": "topic1",
217-
"url": "mqtt://mosquitto:1883"
217+
"url": "mqtt://localhost:1883"
218218
},
219219
"onlyChangedAttrs": false
220220
},
@@ -250,7 +250,7 @@ Content-Length: 987
250250
"qos": 0,
251251
"retain": false,
252252
"topic": "topic1",
253-
"url": "mqtt://mosquitto:1883"
253+
"url": "mqtt://localhost:1883"
254254
},
255255
"onlyChangedAttrs": false
256256
},

‎test/functionalTest/cases/2560_custom_notification_json/custom_notification_mqtt_json_replacements_intermediate.test‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ payload='{
5151
},
5252
"notification": {
5353
"mqttCustom": {
54-
"url": "mqtt://mosquitto:1883",
54+
"url": "mqtt://localhost:1883",
5555
"topic": "topic1",
5656
"json": {
5757
"x": {
@@ -81,7 +81,7 @@ payload='{
8181
},
8282
"notification": {
8383
"mqttCustom": {
84-
"url": "mqtt://mosquitto:1883",
84+
"url": "mqtt://localhost:1883",
8585
"topic": "topic1",
8686
"json": [
8787
"22",
@@ -186,7 +186,7 @@ Content-Length: 781
186186
"qos": 0,
187187
"retain": false,
188188
"topic": "topic1",
189-
"url": "mqtt://mosquitto:1883"
189+
"url": "mqtt://localhost:1883"
190190
},
191191
"onlyChangedAttrs": false
192192
},
@@ -228,7 +228,7 @@ Content-Length: 781
228228
"qos": 0,
229229
"retain": false,
230230
"topic": "topic1",
231-
"url": "mqtt://mosquitto:1883"
231+
"url": "mqtt://localhost:1883"
232232
},
233233
"onlyChangedAttrs": false
234234
},

‎test/functionalTest/cases/2560_custom_notification_json/custom_notification_mqtt_json_replacements_missing_attrs.test‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ payload='{
4949
},
5050
"notification": {
5151
"mqttCustom": {
52-
"url": "mqtt://mosquitto:1883",
52+
"url": "mqtt://localhost:1883",
5353
"topic": "topic1",
5454
"json": {
5555
"A": "${A}",

‎test/functionalTest/cases/3001_mqtt_alarms/mqtt_alarms_log_summary.test‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ payload='{
6666
},
6767
"notification": {
6868
"mqtt": {
69-
"url": "mqtt://mosquitto:1883",
69+
"url": "mqtt://localhost:1883",
7070
"user": "user_noexist",
7171
"passwd": "xxxx",
7272
"topic": "sub1"
@@ -117,7 +117,7 @@ echo "========================================"
117117
payload='{
118118
"notification": {
119119
"mqtt": {
120-
"url": "mqtt://mosquitto:1883",
120+
"url": "mqtt://localhost:1883",
121121
"user": "user1",
122122
"passwd": "xxxx",
123123
"topic": "sub1"

‎test/functionalTest/cases/3001_mqtt_alarms/mqtt_alarms_none.test‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ payload='{
5252
},
5353
"notification": {
5454
"mqtt": {
55-
"url": "mqtt://mosquitto:1883",
55+
"url": "mqtt://localhost:1883",
5656
"topic": "sub1"
5757
}
5858
}
@@ -128,13 +128,13 @@ Location: /v2/entities/E?type=T
128128
03. Check logs and see three MQTT notifications and no alarms
129129
=============================================================
130130
#SORT_START
131-
Request received: POST /v2/subscriptions, request payload (142 bytes): { "subject": { "entities": [ { "id": "E", "type": "T" } ] }, "notification": { "mqtt": { "url": "mqtt://mosquitto:1883", "topic": "sub1" } } }, response code: 201
131+
Request received: POST /v2/subscriptions, request payload (142 bytes): { "subject": { "entities": [ { "id": "E", "type": "T" } ] }, "notification": { "mqtt": { "url": "mqtt://localhost:1883", "topic": "sub1" } } }, response code: 201
132132
Request received: POST /v2/entities?options=forcedUpdate,upsert, request payload (64 bytes): { "id": "E", "type": "T", "A": { "value": 1, "type": "Float" } }, response code: 204
133-
MQTT Notif delivered (subId: SUB_ID): broker: mosquitto:1883, topic: sub1, payload (121 bytes): {"subscriptionId":"SUB_ID","data":[{"id":"E","type":"T","A":{"type":"Float","value":1,"metadata":{}}}]}
133+
MQTT Notif delivered (subId: SUB_ID): broker: localhost:1883, topic: sub1, payload (121 bytes): {"subscriptionId":"SUB_ID","data":[{"id":"E","type":"T","A":{"type":"Float","value":1,"metadata":{}}}]}
134134
Request received: POST /v2/entities?options=forcedUpdate,upsert, request payload (64 bytes): { "id": "E", "type": "T", "A": { "value": 1, "type": "Float" } }, response code: 204
135-
MQTT Notif delivered (subId: SUB_ID): broker: mosquitto:1883, topic: sub1, payload (121 bytes): {"subscriptionId":"SUB_ID","data":[{"id":"E","type":"T","A":{"type":"Float","value":1,"metadata":{}}}]}
135+
MQTT Notif delivered (subId: SUB_ID): broker: localhost:1883, topic: sub1, payload (121 bytes): {"subscriptionId":"SUB_ID","data":[{"id":"E","type":"T","A":{"type":"Float","value":1,"metadata":{}}}]}
136136
Request received: POST /v2/entities?options=forcedUpdate,upsert, request payload (64 bytes): { "id": "E", "type": "T", "A": { "value": 1, "type": "Float" } }, response code: 204
137-
MQTT Notif delivered (subId: SUB_ID): broker: mosquitto:1883, topic: sub1, payload (121 bytes): {"subscriptionId":"SUB_ID","data":[{"id":"E","type":"T","A":{"type":"Float","value":1,"metadata":{}}}]}
137+
MQTT Notif delivered (subId: SUB_ID): broker: localhost:1883, topic: sub1, payload (121 bytes): {"subscriptionId":"SUB_ID","data":[{"id":"E","type":"T","A":{"type":"Float","value":1,"metadata":{}}}]}
138138
#SORT_END
139139

140140

0 commit comments

Comments
 (0)