summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorLukas Fleischer <calcurse@cryptocrack.de>2014-08-06 15:48:02 +0200
committerLukas Fleischer <calcurse@cryptocrack.de>2014-08-06 15:48:02 +0200
commitf9208c0b3dcb6cb53dbad734871aeead576ad06b (patch)
treee98f651101cf707268af083357b31b6e02925efb /test
parentc2dc3109ae23fbdb4ee3951317bd1fbf1ec846e2 (diff)
downloadcalcurse-f9208c0b3dcb6cb53dbad734871aeead576ad06b.tar.gz
calcurse-f9208c0b3dcb6cb53dbad734871aeead576ad06b.zip
Use backwards-compatible out format for queries
Print TODO items before appointments in query outputs and add an empty line between the list of TODO items and the list of appointments. This is how items were printed before the big parser refactoring. Also, add a test to ensure we do not unintentionally change that format in the future. Signed-off-by: Lukas Fleischer <calcurse@cryptocrack.de>
Diffstat (limited to 'test')
-rw-r--r--test/Makefile.am2
-rw-r--r--test/data/apts-filter-0018
-rwxr-xr-xtest/filter-001.sh28
3 files changed, 38 insertions, 0 deletions
diff --git a/test/Makefile.am b/test/Makefile.am
index 5e1bfca..d036a1d 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -41,6 +41,7 @@ TESTS = \
event-004.sh \
event-005.sh \
event-006.sh \
+ filter-001.sh \
ical-001.sh \
ical-002.sh \
ical-003.sh \
@@ -98,6 +99,7 @@ EXTRA_DIST = \
data/apts-event-004 \
data/apts-event-005 \
data/apts-event-006 \
+ data/apts-filter-001 \
data/apts-recur \
data/conf \
data/ical-001.ical \
diff --git a/test/data/apts-filter-001 b/test/data/apts-filter-001
new file mode 100644
index 0000000..59fe31c
--- /dev/null
+++ b/test/data/apts-filter-001
@@ -0,0 +1,8 @@
+02/22/2013 [1] Event 1
+02/23/2013 [1] Event 2
+02/24/2013 [1] Event 3
+02/25/2013 [1] Event 4
+02/22/2013 @ 10:00 -> 02/22/2013 @ 12:00 |Appointment 1
+02/23/2013 @ 10:00 -> 02/23/2013 @ 12:00 |Appointment 2
+02/24/2013 @ 10:00 -> 02/24/2013 @ 12:00 |Appointment 3
+02/25/2013 @ 10:00 -> 02/25/2013 @ 12:00 |Appointment 4
diff --git a/test/filter-001.sh b/test/filter-001.sh
new file mode 100755
index 0000000..2dcbb25
--- /dev/null
+++ b/test/filter-001.sh
@@ -0,0 +1,28 @@
+#!/bin/sh
+
+. "${TEST_INIT:-./test-init.sh}"
+
+if [ "$1" = 'actual' ]; then
+ "$CALCURSE" --read-only -D "$DATA_DIR"/ -c "$DATA_DIR/apts-filter-001" \
+ -t9 -s02/23/2013 -r2
+elif [ "$1" = 'expected' ]; then
+ cat <<EOD
+to do:
+9. Gloriously slams
+9. Beefburger's
+9. Seasons
+
+02/23/13:
+ * Event 2
+ - 10:00 -> 12:00
+ Appointment 2
+
+02/24/13:
+ * Event 3
+ - 10:00 -> 12:00
+ Appointment 3
+EOD
+else
+ ./run-test "$0"
+fi
+