From dabf976add50ddd8646784cbccc6f758ae511a02 Mon Sep 17 00:00:00 2001 From: Jean-Marc Meessen Date: Thu, 16 Jul 2020 17:24:40 +0200 Subject: [PATCH] Improve end-to-end testing --- test.sh | 8 ++- test/FLE-sample/ContestLog (Stew Perry).txt | 76 +++++++++++++++++++++ test/FLE-sample/DXpedition.adi | 19 ++++++ test/FLE-sample/DXpedition.txt | 26 +++++++ test/FLE-sample/sota.adi | 12 ++++ test/FLE-sample/sota_wwff.adi | 12 ++++ test/FLE-sample/sota_wwff.csv | 8 +++ test/FLE-sample/sota_wwff.txt | 23 +++++++ test/FLE-sample/wwff.adi | 12 ++++ 9 files changed, 193 insertions(+), 3 deletions(-) create mode 100644 test/FLE-sample/ContestLog (Stew Perry).txt create mode 100644 test/FLE-sample/DXpedition.adi create mode 100644 test/FLE-sample/DXpedition.txt create mode 100644 test/FLE-sample/sota.adi create mode 100644 test/FLE-sample/sota_wwff.adi create mode 100644 test/FLE-sample/sota_wwff.csv create mode 100644 test/FLE-sample/sota_wwff.txt create mode 100644 test/FLE-sample/wwff.adi diff --git a/test.sh b/test.sh index 484b804..7cba7da 100755 --- a/test.sh +++ b/test.sh @@ -2,12 +2,14 @@ set -e -go build -go test ./... +./build.sh + +mkdir -p test/output/temp echo "--------------------------" ./FLEcli -i test/data/fle-1.txt load echo "--------------------------" ./FLEcli -i test/data/ON4KJM@ONFF-025920200524.txt load echo "--------------------------" -./FLEcli -i test/data/sample_wwff_sota.txt load \ No newline at end of file +./FLEcli -i test/FLE-sample/sota_wwff.txt csv -o=test/output/temp/sota_wwff.csv --interpolate --overwrite +diff test/output/temp/sota_wwff.csv test/FLE-sample/sota_wwff.csv --strip-trailing-cr && echo "no difference" || echo "differences!" \ No newline at end of file diff --git a/test/FLE-sample/ContestLog (Stew Perry).txt b/test/FLE-sample/ContestLog (Stew Perry).txt new file mode 100644 index 0000000..9c8e212 --- /dev/null +++ b/test/FLE-sample/ContestLog (Stew Perry).txt @@ -0,0 +1,76 @@ +{ Sample file Stew Perry Contest + Check: Logging > "Contest Logging" +- Exchanges in this contest are grid locators + Be sure to enter your own locator in the first QSO line after the comma +- Times are not interpolated in this sample +} +{ Enter your call sign after the mycall keyword } +mycall wb9zzz + +date 2015-12-18 +160m cw + +1924 ok1dol ,jn58 .jn69 + 26 e77dx .jn84 + 30 hg5a .jn97 + 32 ol7m .jo80 + 3 s57un .jn86 + 5 ok2zi .jn89 + 9 dl1dxa .jo61 + 40 dk9vz .jn39 + 4 sm5mx .jo99 + 8 f5in .jn18 + 53 s51v .jn86 + 4 f8bpn .jn05 + 9 oh2bo .kp20 +2002 pa4vhf .jo32 + 4 g3bj .io82 + 6 iv3prk .jn66 + 7 rx3apm .lo04 + 10 uw2m .kn98 + 3 yl2sm .ko37 + 4 tm6m .in78 + 5 f6ddr .jn38 + 6 uu7j .kn85 + 9 dk6xz .jn48 + 20 pi4tue .jo21 + 2 g4buo .jo01 + 3 dl5mx .jo50 + 5 ok1hfp .jn69 + 7 ha6nl .jn98 + 31 on7pq .jo10 + 3 i4ewh .jn64 +2100 tf4m .hp85 + 6 sn7q .jo91 + 13 dk2oy .jo44 + 9 dj3ra .jo72 + 5 s53o .jn86 + 20 dd5m .jn58 + 8 on9cc .jo20 + 30 ha3li .jn96 + 2 g3wph .io91 + 4 dj2ya .jo40 + +{ next day } +day + + +0632 w1bb .fn42 + 5 k8po .fn54 + 6 pa5kt .jo11 + 8 dj9mh .jo50 + 40 om6al .jn99 + 2 dl8uke .jo72 + 3 ut3ua .ko50 + 50 sm6cpy .jo67 + 2 ly9y .ko16 + 5 ok1dst .jn79 + 9 sn2i .jo93 + 9 ve3mmq .fn14 +0707 g6mc .io94 + 10 ok1fps .jo70 + 3 se0x .jo99 + 5 on4ww .jo11 + 1 dl4me .jo50 + 8 dj3we .jn57 + 25 ok1tn .jo70 + 8 n2kw/1 .fn32 \ No newline at end of file diff --git a/test/FLE-sample/DXpedition.adi b/test/FLE-sample/DXpedition.adi new file mode 100644 index 0000000..86168f3 --- /dev/null +++ b/test/FLE-sample/DXpedition.adi @@ -0,0 +1,19 @@ +ADIF Export for Fast Log Entry by DF3CB +FLE +3.1.0 + +WB9ZZZ RA3AX 20160630 2335 80m CW 599 599 +WB9ZZZ DJ2MX 20160630 2337 80m CW 599 599 +WB9ZZZ DK4RM 20160630 2340 80m CW 599 599 +WB9ZZZ OH7MS 20160630 2342 80m CW 449 559 +WB9ZZZ RN6BN 20160630 2348 80m CW 539 569 +WB9ZZZ DL5MO 20160630 2351 80m CW 599 599 JO50 strong signal +WB9ZZZ DL7ON 20160630 2352 80m CW 599 599 +WB9ZZZ DJ2BW 20160630 2353 80m CW 599 599 +WB9ZZZ G3FPQ 20160702 0014 40m SSB 59 59 +WB9ZZZ RA6AU 20160702 0018 40m SSB 59 59 +WB9ZZZ OH2PJ 20160702 0022 40m SSB 59 59 +WB9ZZZ OH3ES 20160702 0026 40m SSB 59 59 +WB9ZZZ SM5WP 20160702 0030 40m SSB 59 59 +WB9ZZZ SP8BRQ 20160702 0034 40m SSB 59 59 +WB9ZZZ UA3TCJ 20160702 0038 40m SSB 59 59 diff --git a/test/FLE-sample/DXpedition.txt b/test/FLE-sample/DXpedition.txt new file mode 100644 index 0000000..bc7a020 --- /dev/null +++ b/test/FLE-sample/DXpedition.txt @@ -0,0 +1,26 @@ +{ Sample FLE QSO editor file for a DXpedition } +{ Enter your call sign after the mycall keyword } +mycall wb9zzz + +{ Start your log entry with a start date using the DATE keyword in the format yyyy-mm-dd } +date 2016-06-30 + +{ Then enter band and mode } +80m cw 2335 ra3ax +dj2mx +40 dk4rm +2 oh7ms 449 559 +8 rn6bn 3 6 +51 dl5mo < strong signal > #JO50 +dl7on +3 dj2bw + +{ Times can be interpolated between two given times, e.g. between 0014 and 0038 in the following example } +day ++ 40m ssb +0014 g3fpq + ra6au + oh2pj + oh3es + sm5wp + sp8brq + 38 ua3tcj diff --git a/test/FLE-sample/sota.adi b/test/FLE-sample/sota.adi new file mode 100644 index 0000000..34c0b55 --- /dev/null +++ b/test/FLE-sample/sota.adi @@ -0,0 +1,12 @@ +ADIF Export for Fast Log Entry by DF3CB +FLE +3.1.0 + +G3WGV G4ELZ 20160424 1202 40m CW 599 599 WWFF GFF-0014 G/LD-008 +G3WGV G3NOH 20160424 1204 40m CW 599 599 PSE QSL Direct WWFF GFF-0014 G/LD-008 +G3WGV GW4GTE 20160424 1227 2m FM 59 59 Dave WWFF GFF-0014 G/LD-008 +G3WGV GW0TLK/M 20160424 1228 2m FM 59 59 WWFF GFF-0014 WWFF GWFF-0021 G/LD-008 +G3WGV GM0AAA 20160603 1404 40m CW 539 579 WWFF GFF-0014 G/LD-008 +G3WGV ON4CK/P 20160603 1405 40m CW 529 599 WWFF GFF-0014 G/LD-008 ON/ON-018 +G3WGV DL0DAN/P 20160603 1407 40m CW 599 599 WWFF GFF-0014 WWFF DLFF-0002 G/LD-008 DL/AL-044 +G3WGV YU7LS 20160603 1410 20m CW 599 599 WWFF GFF-0014 G/LD-008 diff --git a/test/FLE-sample/sota_wwff.adi b/test/FLE-sample/sota_wwff.adi new file mode 100644 index 0000000..34c0b55 --- /dev/null +++ b/test/FLE-sample/sota_wwff.adi @@ -0,0 +1,12 @@ +ADIF Export for Fast Log Entry by DF3CB +FLE +3.1.0 + +G3WGV G4ELZ 20160424 1202 40m CW 599 599 WWFF GFF-0014 G/LD-008 +G3WGV G3NOH 20160424 1204 40m CW 599 599 PSE QSL Direct WWFF GFF-0014 G/LD-008 +G3WGV GW4GTE 20160424 1227 2m FM 59 59 Dave WWFF GFF-0014 G/LD-008 +G3WGV GW0TLK/M 20160424 1228 2m FM 59 59 WWFF GFF-0014 WWFF GWFF-0021 G/LD-008 +G3WGV GM0AAA 20160603 1404 40m CW 539 579 WWFF GFF-0014 G/LD-008 +G3WGV ON4CK/P 20160603 1405 40m CW 529 599 WWFF GFF-0014 G/LD-008 ON/ON-018 +G3WGV DL0DAN/P 20160603 1407 40m CW 599 599 WWFF GFF-0014 WWFF DLFF-0002 G/LD-008 DL/AL-044 +G3WGV YU7LS 20160603 1410 20m CW 599 599 WWFF GFF-0014 G/LD-008 diff --git a/test/FLE-sample/sota_wwff.csv b/test/FLE-sample/sota_wwff.csv new file mode 100644 index 0000000..332008a --- /dev/null +++ b/test/FLE-sample/sota_wwff.csv @@ -0,0 +1,8 @@ +V2,G3WGV,G/LD-008,24/04/16,1202,7MHz,CW,G4ELZ +V2,G3WGV,G/LD-008,24/04/16,1204,7MHz,CW,G3NOH,,PSE QSL Direct +V2,G3WGV,G/LD-008,24/04/16,1227,144MHz,FM,GW4GTE +V2,G3WGV,G/LD-008,24/04/16,1228,144MHz,FM,GW0TLK/M +V2,G3WGV,G/LD-008,03/06/16,1404,7MHz,CW,GM0AAA +V2,G3WGV,G/LD-008,03/06/16,1405,7MHz,CW,ON4CK/P,ON/ON-018 +V2,G3WGV,G/LD-008,03/06/16,1407,7MHz,CW,DL0DAN/P,DL/AL-044 +V2,G3WGV,G/LD-008,03/06/16,1410,14MHz,CW,YU7LS diff --git a/test/FLE-sample/sota_wwff.txt b/test/FLE-sample/sota_wwff.txt new file mode 100644 index 0000000..9923243 --- /dev/null +++ b/test/FLE-sample/sota_wwff.txt @@ -0,0 +1,23 @@ +{ Sample WWFF and SOTA log } +# Header +mycall g3wgv +operator +mywwff gff-0014 +mysota g/ld-008 + +# Log +date 2016-04-24 +40m cw +1202 g4elz +4 g3noh +2m fm +1227 gw4gte @Dave +8 gw0tlk/m gwff-0021 + +date 2016-06-03 +40m cw +1404 gm0aaa 3 7 +5 on4ck/p 2 on/on-018 +7 dl0dan/p dlff-0002 dl/al-044 +20m +10 yu7ls \ No newline at end of file diff --git a/test/FLE-sample/wwff.adi b/test/FLE-sample/wwff.adi new file mode 100644 index 0000000..34c0b55 --- /dev/null +++ b/test/FLE-sample/wwff.adi @@ -0,0 +1,12 @@ +ADIF Export for Fast Log Entry by DF3CB +FLE +3.1.0 + +G3WGV G4ELZ 20160424 1202 40m CW 599 599 WWFF GFF-0014 G/LD-008 +G3WGV G3NOH 20160424 1204 40m CW 599 599 PSE QSL Direct WWFF GFF-0014 G/LD-008 +G3WGV GW4GTE 20160424 1227 2m FM 59 59 Dave WWFF GFF-0014 G/LD-008 +G3WGV GW0TLK/M 20160424 1228 2m FM 59 59 WWFF GFF-0014 WWFF GWFF-0021 G/LD-008 +G3WGV GM0AAA 20160603 1404 40m CW 539 579 WWFF GFF-0014 G/LD-008 +G3WGV ON4CK/P 20160603 1405 40m CW 529 599 WWFF GFF-0014 G/LD-008 ON/ON-018 +G3WGV DL0DAN/P 20160603 1407 40m CW 599 599 WWFF GFF-0014 WWFF DLFF-0002 G/LD-008 DL/AL-044 +G3WGV YU7LS 20160603 1410 20m CW 599 599 WWFF GFF-0014 G/LD-008