pull/729/head
Fredrik Öhrström 2022-12-05 20:43:57 +01:00
rodzic 5dfe165f5d
commit 72ab0bfa25
3 zmienionych plików z 18 dodań i 10 usunięć

Wyświetl plik

@ -85,12 +85,12 @@ telegram=|7644C52501880188550872_01880188C5255508010000002F2F0B6E332211426E11018
# Test Lansen smoke detector telegram
telegram=|2E44333004020100031A7AC40020052F2F_02FD971D000004FD084C02000004FD3A467500002F2F2F2F2F2F2F2F2F2F|
{"media":"smoke detector","meter":"lansensm","name":"Smokeo","id":"00010204","status":"OK","access_counter":588,"woot_counter":30022,"timestamp":"1111-11-11T11:11:11Z"}
|Smokeo;00010204;OK;1111-11-11 11:11.11
{"async_msg_id_counter": 588,"id": "00010204","media": "smoke detector","meter": "lansensm","minutes_since_last_manual_test_counter": 30022,"name": "Smokeo","status": "OK","timestamp": "1111-11-11T11:11:11Z"}
|Smokeo;00010204;OK;30022;1111-11-11 11:11.11
telegram=|2E44333004020100031A7ADE0020052F2F_02FD971D040004FD086502000004FD3A010000002F2F2F2F2F2F2F2F2F2F|
{"media":"smoke detector","meter":"lansensm","name":"Smokeo","id":"00010204","status":"SMOKE","access_counter":613,"woot_counter":1,"timestamp":"1111-11-11T11:11:11Z"}
|Smokeo;00010204;SMOKE;1111-11-11 11:11.11
{"async_msg_id_counter": 613,"id": "00010204","media": "smoke detector","meter": "lansensm","minutes_since_last_manual_test_counter": 1,"name": "Smokeo","status": "SMOKE","timestamp": "1111-11-11T11:11:11Z"}
|Smokeo;00010204;SMOKE;1;1111-11-11 11:11.11
# Test Lansen Temperature Hygrometer telegram

Wyświetl plik

@ -11,7 +11,7 @@ TESTNAME="Test duplicates are ignored"
TESTRESULT="ERROR"
cat > $TEST/test_expected.txt <<EOF
{"media":"smoke detector","meter":"lansensm","name":"Rummet","id":"01000273","status":"OK","access_counter":588,"woot_counter":30022,"timestamp":"1111-11-11T11:11:11Z"}
{"media":"smoke detector","meter":"lansensm","name":"Rummet","id":"01000273","status":"OK","async_msg_id_counter":588,"minutes_since_last_manual_test_counter":30022,"timestamp":"1111-11-11T11:11:11Z"}
EOF
$PROG --format=json --ignoreduplicates simulations/simulation_duplicates.txt \
@ -36,11 +36,11 @@ TESTNAME="Test duplicates are left alone"
TESTRESULT="ERROR"
cat > $TEST/test_expected.txt <<EOF
{"media":"smoke detector","meter":"lansensm","name":"Rummet","id":"01000273","status":"OK","access_counter":588,"woot_counter":30022,"timestamp":"1111-11-11T11:11:11Z"}
{"media":"smoke detector","meter":"lansensm","name":"Rummet","id":"01000273","status":"OK","access_counter":588,"woot_counter":30022,"timestamp":"1111-11-11T11:11:11Z"}
{"media":"smoke detector","meter":"lansensm","name":"Rummet","id":"01000273","status":"OK","access_counter":588,"woot_counter":30022,"timestamp":"1111-11-11T11:11:11Z"}
{"media":"smoke detector","meter":"lansensm","name":"Rummet","id":"01000273","status":"OK","access_counter":588,"woot_counter":30022,"timestamp":"1111-11-11T11:11:11Z"}
{"media":"smoke detector","meter":"lansensm","name":"Rummet","id":"01000273","status":"OK","access_counter":588,"woot_counter":30022,"timestamp":"1111-11-11T11:11:11Z"}
{"media":"smoke detector","meter":"lansensm","name":"Rummet","id":"01000273","status":"OK","async_msg_id_counter":588,"minutes_since_last_manual_test_counter":30022,"timestamp":"1111-11-11T11:11:11Z"}
{"media":"smoke detector","meter":"lansensm","name":"Rummet","id":"01000273","status":"OK","async_msg_id_counter":588,"minutes_since_last_manual_test_counter":30022,"timestamp":"1111-11-11T11:11:11Z"}
{"media":"smoke detector","meter":"lansensm","name":"Rummet","id":"01000273","status":"OK","async_msg_id_counter":588,"minutes_since_last_manual_test_counter":30022,"timestamp":"1111-11-11T11:11:11Z"}
{"media":"smoke detector","meter":"lansensm","name":"Rummet","id":"01000273","status":"OK","async_msg_id_counter":588,"minutes_since_last_manual_test_counter":30022,"timestamp":"1111-11-11T11:11:11Z"}
{"media":"smoke detector","meter":"lansensm","name":"Rummet","id":"01000273","status":"OK","async_msg_id_counter":588,"minutes_since_last_manual_test_counter":30022,"timestamp":"1111-11-11T11:11:11Z"}
EOF
$PROG --format=json --ignoreduplicates=false simulations/simulation_duplicates.txt \

Wyświetl plik

@ -81,6 +81,10 @@ then
TESTRESULT="OK"
else
TESTRESULT="ERROR"
if [ "$USE_MELD" = "true" ]
then
meld $TEST/test_expected.txt $TEST/test_responses.txt
fi
exit 1
fi
else
@ -101,6 +105,10 @@ then
TESTRESULT="OK"
else
TESTRESULT="ERROR"
if [ "$USE_MELD" = "true" ]
then
meld $TEST/test_expected.txt $TEST/test_responses.txt
fi
exit 1
fi
else