more email tests

3 files changed, 60 insertions, 2 deletions

diff --git a/tests/xdg-email/t.email_mix_args_uri b/tests/xdg-email/t.email_mix_args_uri
new file mode 100755
index 0000000..e99bb2d
--- /dev/null
+++ b/tests/xdg-email/t.email_mix_args_uri
@@ -0,0 +1,30 @@
+#!/bin/bash
+
+## Include utility functions.
+. "$XDG_TEST_DIR/include/testassertions.sh"
+. "$XDG_TEST_DIR/include/testcontrol.sh"
+
+## Test function
+test_email_mix_args_uri() {
+test_start "$FUNCTNAME: verify an email is generated correctly when called with both a uri and not."
+
+ADDR="$XDG_TEST_ID@portland.freedesktop.org"
+
+test_init
+
+## Require a running X server
+assert_display
+
+test_procedure
+
+assert_exit 0 xdg-email --cc "ccarg-$ADDR" --subject "Subject arg"  "mailto:$ADDR?cc=ccuri-$ADDR&body=Body URI" "t2-$ADDR"
+
+assert_nostdout
+assert_nostderr
+
+assert_interactive "Did a new email open with To/CC/Subject/Body fields complete?" y
+
+test_result
+}
+
+run_test test_email_mix_args_uri
diff --git a/tests/xdg-email/t.email_uri b/tests/xdg-email/t.email_uri
index bd359bb..667b713 100755
--- a/tests/xdg-email/t.email_uri
+++ b/tests/xdg-email/t.email_uri
@@ -17,9 +17,7 @@ assert_display
 
 test_procedure
 
-set -x
 assert_exit 0 xdg-email "mailto:$ADDR?subject=Test%20Subject&cc=cc-$ADDR&body=Test%20Body"
-set +x
 
 assert_nostdout
 assert_nostderr
diff --git a/tests/xdg-email/t.email_uri_multi_address b/tests/xdg-email/t.email_uri_multi_address
new file mode 100755
index 0000000..b1ba9a7
--- /dev/null
+++ b/tests/xdg-email/t.email_uri_multi_address
@@ -0,0 +1,30 @@
+#!/bin/bash
+
+## Include utility functions.
+. "$XDG_TEST_DIR/include/testassertions.sh"
+. "$XDG_TEST_DIR/include/testcontrol.sh"
+
+## Test function
+test_email_uri_multi_address() {
+test_start "$FUNCTNAME: verify uri email compose"
+
+ADDR="$XDG_TEST_ID@portland.freedesktop.org"
+
+test_init
+
+## Require a running X server
+assert_display
+
+test_procedure
+
+assert_exit 0 xdg-email "mailto:$ADDR?to=t2-$ADDR&subject=Test%20Subject&cc=cc-$ADDR&cc2-$ADDR&body=Test%20Body"
+
+assert_nostdout
+assert_nostderr
+
+assert_interactive "Did a new email open with two addresses in the To/CC fields and the Subject/Body fields complete?" y
+
+test_result
+}
+
+run_test test_email_uri_multi_address