From cf8b03586d2d04dd41a185dfee4c740ac4a02942 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fredrik=20=C3=96hrstr=C3=B6m?= Date: Fri, 30 Dec 2022 01:30:36 +0100 Subject: [PATCH] Remove broken supercom587 tests. --- simulations/serial_aes.msg | 2 -- simulations/simulation_t1.txt | 8 ++--- tests/config10/wmbusmeters.d/Wasser | 4 --- tests/config9/wmbusmeters.d/Wasser | 4 --- tests/test_additional_json.sh | 2 +- tests/test_aes.sh | 13 ++++++-- tests/test_analyze.sh | 51 ----------------------------- tests/test_shell.sh | 2 +- tests/test_shell2.sh | 2 +- tests/test_wrongkeys.sh | 3 -- 10 files changed, 18 insertions(+), 73 deletions(-) delete mode 100644 tests/config10/wmbusmeters.d/Wasser delete mode 100644 tests/config9/wmbusmeters.d/Wasser diff --git a/simulations/serial_aes.msg b/simulations/serial_aes.msg index e1ea298..bc4078e 100644 --- a/simulations/serial_aes.msg +++ b/simulations/serial_aes.msg @@ -2,5 +2,3 @@ T1;1;1;2019-04-03 19:00:42.000;97;148;88888888;0x6e4401068888888805077a85006085b {"media":"water","meter":"apator162","name":"ApWater","id":"88888888","total_m3":4.848,"timestamp":"1111-11-11T11:11:11Z","device":"rtlwmbus[]","rssi_dbm":97} C1;1;1;2020-01-23 10:25:13.000;97;148;76348799;0x2A442D2C998734761B168D2091D37CAC21E1D68CDAFFCD3DC452BD802913FF7B1706CA9E355D6C2701CC24 {"media":"cold water","meter":"multical21","name":"Vatten","id":"76348799","status":"DRY","total_m3":6.408,"target_m3":6.408,"flow_temperature_c":127,"external_temperature_c":19,"current_status":"DRY","time_dry":"22-31 days","time_reversed":"","time_leaking":"","time_bursting":"","timestamp":"1111-11-11T11:11:11Z","device":"rtlwmbus[]","rssi_dbm":97} -T1;1;1;2019-04-03 19:00:42.000;97;148;77777777;0xAE44EE4D777777773C077A4400A025E78F4A01F9DCA029EDA03BA452686E8FA917507B29E5358B52D77C111EA4C41140290523F3F6B9F9261705E041C0CA41305004605F42D6C9464E5A04EEE227510BD0DC0983C665C3A5E4739C2082975476AC637BCDD39766AEF030502B6A7697BE9E1C49AF535C15470FCF8ADA36CAB9D0B2A1A8690F8DDCF70859F18B3414D8315B311A0AFA57325531587CB7E9CC110E807F24C190D7E635BEDAF4CAE8A161 -{"media":"water","meter":"supercom587","name":"Wasser","id":"77777777","total_m3":0,"timestamp":"1111-11-11T11:11:11Z","device":"rtlwmbus[]","rssi_dbm":97} \ No newline at end of file diff --git a/simulations/simulation_t1.txt b/simulations/simulation_t1.txt index 12d7b0a..e2f3280 100644 --- a/simulations/simulation_t1.txt +++ b/simulations/simulation_t1.txt @@ -1,12 +1,12 @@ # Test Supercom587 T1 telegrams telegram=|A244EE4D785634123C067A8F000000_0C1348550000426CE1F14C130000000082046C21298C0413330000008D04931E3A3CFE3300000033000000330000003300000033000000330000003300000033000000330000003300000033000000330000004300000034180000046D0D0B5C2B03FD6C5E150082206C5C290BFD0F0200018C4079678885238310FD3100000082106C01018110FD610002FD66020002FD170000| -{"media":"warm water","meter":"supercom587","name":"MyWarmWater","id":"12345678","total_m3":5.548,"timestamp":"1111-11-11T11:11:11Z"} -|MyWarmWater;12345678;5.548000;1111-11-11 11:11.11 +{"media":"warm water","meter":"supercom587","name":"MyWarmWater","id":"12345678","total_m3":5.548,"software_version":"010002","status":"OK","timestamp":"1111-11-11T11:11:11Z"} +|MyWarmWater;12345678;5.548;1111-11-11 11:11.11 telegram=|A244EE4D111111113C077AAC000000_0C1389490000426CE1F14C130000000082046C21298C0413010000008D04931E3A3CFE0100000001000000010000000100000001000000010000000100000001000000010000000100000001000000010000001600000031130000046D0A0C5C2B03FD6C60150082206C5C290BFD0F0200018C4079629885238310FD3100000082106C01018110FD610002FD66020002FD170000| -{"media":"water","meter":"supercom587","name":"MyColdWater","id":"11111111","total_m3":4.989,"timestamp":"1111-11-11T11:11:11Z"} -|MyColdWater;11111111;4.989000;1111-11-11 11:11.11 +{"media":"water","meter":"supercom587","name":"MyColdWater","id":"11111111","total_m3":4.989,"software_version":"010002","status":"OK","timestamp":"1111-11-11T11:11:11Z"} +|MyColdWater;11111111;4.989;1111-11-11 11:11.11 # Test Sontex868 T1 telegram diff --git a/tests/config10/wmbusmeters.d/Wasser b/tests/config10/wmbusmeters.d/Wasser deleted file mode 100644 index f18f108..0000000 --- a/tests/config10/wmbusmeters.d/Wasser +++ /dev/null @@ -1,4 +0,0 @@ -name=Wasser -driver=supercom587 -id=77777777 -key=5065747220486F6C79737A6577736B69 \ No newline at end of file diff --git a/tests/config9/wmbusmeters.d/Wasser b/tests/config9/wmbusmeters.d/Wasser deleted file mode 100644 index f18f108..0000000 --- a/tests/config9/wmbusmeters.d/Wasser +++ /dev/null @@ -1,4 +0,0 @@ -name=Wasser -driver=supercom587 -id=77777777 -key=5065747220486F6C79737A6577736B69 \ No newline at end of file diff --git a/tests/test_additional_json.sh b/tests/test_additional_json.sh index 1d912a1..7f468a1 100755 --- a/tests/test_additional_json.sh +++ b/tests/test_additional_json.sh @@ -87,7 +87,7 @@ $PROG --debug --useconfig=tests/config6 --overridedevice=simulations/simulation_ if [ "$?" = "0" ] then INFO=$(cat /tmp/wmbusmeters_meter_additional_json_test | sed 's/"timestamp":"....-..-..T..:..:..Z"/"timestamp":"1111-11-11T11:11:11Z"/') - EXPECTED=$(echo 'METER =={"media":"warm water","meter":"supercom587","name":"Water","id":"12345678","total_m3":5.548,"timestamp":"1111-11-11T11:11:11Z","floor":"5","elevator":"ABC","address":"RoodRd 42","city":"Stockholm"}== ==RoodRd 42== ==Stockholm== ==5== ==ABC==') + EXPECTED=$(echo 'METER =={"media":"warm water","meter":"supercom587","name":"Water","id":"12345678","software_version":"010002","total_m3":5.548,"status":"OK","timestamp":"1111-11-11T11:11:11Z","floor":"5","elevator":"ABC","address":"RoodRd 42","city":"Stockholm"}== ==RoodRd 42== ==Stockholm== ==5== ==ABC==') if [ "$INFO" = "$EXPECTED" ] then echo "OK: $TESTNAME" diff --git a/tests/test_aes.sh b/tests/test_aes.sh index cb9808c..06f2950 100755 --- a/tests/test_aes.sh +++ b/tests/test_aes.sh @@ -14,8 +14,7 @@ cat simulations/serial_aes.msg | grep '^{' | tr -d '#' | jq --sort-keys . > $TES cat simulations/serial_aes.msg | grep '^[CT]' | tr -d '#' > $TEST/test_input.txt cat $TEST/test_input.txt | $PROG --format=json "stdin:rtlwmbus" \ ApWater apator162 88888888 00000000000000000000000000000000 \ - Vatten multical21 76348799 28F64A24988064A079AA2C807D6102AE \ - Wasser supercom587 77777777 5065747220486F6C79737A6577736B69 2> $TEST/test_stderr.txt | jq --sort-keys . > $TEST/test_output.txt + Vatten multical21 76348799 28F64A24988064A079AA2C807D6102AE 2> $TEST/test_stderr.txt | jq --sort-keys . > $TEST/test_output.txt cat $TEST/test_output.txt | sed 's/"timestamp": "....-..-..T..:..:..Z"/"timestamp": "1111-11-11T11:11:11Z"/' > $TEST/test_response.txt diff $TEST/test_expected.txt $TEST/test_response.txt @@ -23,6 +22,11 @@ if [ "$?" = "0" ] then echo "OK: $TESTNAME" TESTRESULT="OK" +else + if [ "$USE_MELD" = "true" ] + then + meld $TEST/test_expected.txt $TEST/test_response.txt + fi fi if [ "$TESTRESULT" = "ERROR" ]; then echo ERROR: $TESTNAME; exit 1; fi @@ -50,6 +54,11 @@ if [ "$?" = "0" ] then echo "OK: $TESTNAME" TESTRESULT="OK" +else + if [ "$USE_MELD" = "true" ] + then + meld $TEST/test_expected.txt $TEST/test_output.txt + fi fi if [ "$TESTRESULT" = "ERROR" ]; then echo ERROR: $TESTNAME; exit 1; fi diff --git a/tests/test_analyze.sh b/tests/test_analyze.sh index 732389b..4d0f1a4 100755 --- a/tests/test_analyze.sh +++ b/tests/test_analyze.sh @@ -229,54 +229,3 @@ EOF $PROG --analyze=28F64A24988064A079AA2C807D6102AE 23442D2C998734761B168D20983081B2227A6FA1F10E1B79B5EB4B17E81F930E937EE06C > $TEST/test_output.txt 2>&1 performCheck - -######################################################################################################################## -######################################################################################################################## -######################################################################################################################## - -TESTNAME="Test analyze CBC IV (no-key)" -TESTRESULT="ERROR" - -cat > $TEST/test_expected.txt < $TEST/test_output.txt 2>&1 - -performCheck - -######################################################################################################################## -######################################################################################################################## -######################################################################################################################## - -#TESTNAME="Test analyze CBC IV (with-key)" -#TESTRESULT="ERROR" - -#cat > $TEST/test_expected.txt < $TEST/test_output.txt 2>&1 - -#performCheck diff --git a/tests/test_shell.sh b/tests/test_shell.sh index f080262..799135f 100755 --- a/tests/test_shell.sh +++ b/tests/test_shell.sh @@ -13,7 +13,7 @@ $PROG --shell='echo "$METER_JSON"' simulations/simulation_shell.txt MWW supercom if [ "$?" = "0" ] then cat $TEST/test_output.txt | sed 's/"timestamp": "....-..-..T..:..:..Z"/"timestamp": "1111-11-11T11:11:11Z"/' > $TEST/test_responses.txt - echo '{"media":"warm water","meter":"supercom587","name":"MWW","id":"12345678","total_m3":5.548,"timestamp":"1111-11-11T11:11:11Z"}' \ + echo '{"media":"warm water","meter":"supercom587","name":"MWW","id":"12345678","software_version":"010002","total_m3":5.548,"status":"OK","timestamp":"1111-11-11T11:11:11Z"}' \ | jq --sort-keys . > $TEST/test_expected.txt diff $TEST/test_expected.txt $TEST/test_responses.txt if [ "$?" = "0" ] diff --git a/tests/test_shell2.sh b/tests/test_shell2.sh index a3101da..9287844 100755 --- a/tests/test_shell2.sh +++ b/tests/test_shell2.sh @@ -12,7 +12,7 @@ $PROG --useconfig=tests/config5 2> $TEST/test_stderr.txt > $TEST/test_output.txt if [ "$?" = "0" ] then INFO=$(cat /tmp/wmbusmeters_meter_shell_test | sed 's/"timestamp":"....-..-..T..:..:..Z"/"timestamp":"1111-11-11T11:11:11Z"/') - EXPECTED='TESTING SHELL {"id":"12345678","media":"warm water","meter":"supercom587","name":"Vatten","timestamp":"1111-11-11T11:11:11Z","total_m3":5.548}' + EXPECTED='TESTING SHELL {"id":"12345678","media":"warm water","meter":"supercom587","name":"Vatten","software_version":"010002","status":"OK","timestamp":"1111-11-11T11:11:11Z","total_m3":5.548}' if [ "$INFO" = "$EXPECTED" ] then echo OK: $TESTNAME diff --git a/tests/test_wrongkeys.sh b/tests/test_wrongkeys.sh index e0027b1..b7ece11 100755 --- a/tests/test_wrongkeys.sh +++ b/tests/test_wrongkeys.sh @@ -15,7 +15,6 @@ cat simulations/serial_aes.msg | grep '^[CT]' | tr -d '#' > $TEST/test_input.txt cat $TEST/test_input.txt | $PROG --format=json "stdin:rtlwmbus" \ ApWater apator162 88888888 00000000000000000000000000000001 \ Vatten multical21 76348799 28F64A24988064A079AA2C807D6102AF \ - Wasser supercom587 77777777 5065747220486F6C79737A6577736B6A \ > $TEST/test_output.txt 2> $TEST/test_stderr.txt if [ -s $TEST/test_output.txt ] @@ -32,8 +31,6 @@ Started config rtlwmbus on stdin listening on any (meter) newly created meter (ApWater 88888888 apator162) did not handle telegram! (wmbus) WARNING! decrypted payload crc failed check, did you use the correct decryption key? 979f payload crc (calculated 3431) Permanently ignoring telegrams from id: 76348799 mfct: (KAM) Kamstrup Energi (0x2c2d) type: Cold water meter (0x16) ver: 0x1b (meter) newly created meter (Vatten 76348799 multical21) did not handle telegram! -(wmbus) WARNING!! decrypted content failed check, did you use the correct decryption key? Permanently ignoring telegrams from id: 77777777 mfct: (SON) Sontex, Switzerland (0x4dee) type: Water meter (0x07) ver: 0x3c -(meter) newly created meter (Wasser 77777777 supercom587) did not handle telegram! EOF diff $TEST/test_expected.txt $TEST/test_stderr.txt