From e9deb6fff3d56b166ab702828bd1a716c2bf567f Mon Sep 17 00:00:00 2001
From: Lars Henriksen <LarsHenriksen@get2net.dk>
Date: Tue, 7 Apr 2020 21:29:26 +0200
Subject: Extend use of note file for iCal import

iCal import to an item note file is extended from DESCRIPTION to
LOCATION, COMMENT and STATUS for both events and todos.

Addresses GitHub issue #9.

Signed-off-by: Lars Henriksen <LarsHenriksen@get2net.dk>
Signed-off-by: Lukas Fleischer <lfleischer@calcurse.org>
---
 test/ical-009.sh | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

(limited to 'test/ical-009.sh')

diff --git a/test/ical-009.sh b/test/ical-009.sh
index 31dc283..d912f5c 100755
--- a/test/ical-009.sh
+++ b/test/ical-009.sh
@@ -7,27 +7,31 @@ if [ "$1" = 'actual' ]; then
   mkdir .calcurse || exit 1
   cp "$DATA_DIR/conf" .calcurse || exit 1
   out=$("$CALCURSE" -D "$PWD/.calcurse" -i "$DATA_DIR/ical-009.ical" 2>&1)
-  echo "$out" | sed -n '4,5p'
-  log=$(echo "$out" | awk '$1 == "See" {print $2}')
-  cat "$log" | sed '1,17d'
-  cat $PWD/.calcurse/notes/* | wc
+  # Print the import report (stdout).
+  echo "$out" | awk '$1 == "Import"; $2 == "apps"'
+  # Find the log file and print the log messages (stderr).
+  logfile=$(echo "$out" | awk '$1 == "See" { print $2 }')
+  sed '1,18d' "$logfile"
+  # One empty note file.
+  cat "$PWD/.calcurse/notes"/* | wc | awk '{ print $1 $2 $3 }'
   rm -rf .calcurse || exit 1
 elif [ "$1" = 'expected' ]; then
   cat <<EOD
-Import process report: 0068 lines read
-2 apps / 0 events / 1 todo / 10 skipped
-
+Import process report: 0081 lines read
+2 apps / 0 events / 1 todo / 12 skipped
 VEVENT [12]: could not retrieve event start time.
 VEVENT [17]: recurrence frequency not recognized.
-VEVENT [23]: malformed summary line
+VEVENT [23]: malformed summary line.
 VTODO [28]: item priority is invalid (must be between 0 and 9).
 VEVENT [32]: malformed exceptions line.
 VEVENT [39]: line break in summary.
 VEVENT [44]: malformed description line.
 VEVENT [50]: malformed description.
 VTODO [62]: malformed summary.
-VTODO [66]: The ical file seems to be malformed. The end of item was not found.
-      1       0       1
+VEVENT [66]: invalid status value.
+VEVENT [72]: only one location allowed.
+VTODO [79]: The ical file seems to be malformed. The end of item was not found.
+101
 EOD
 else
   ./run-test "$0"
-- 
cgit v1.2.3-54-g00ecf