From 6f4459bf7f7936ff8d61b5ffdc7a82bd8c5ac825 Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Wed, 8 Sep 2021 07:32:30 -0300 Subject: src/remembering.in: Add trailing "/remembering" to the value defined in $XDG_DATA_HOME --- tests/cli-opts.sh | 5 +++-- tests/ranking.sh | 16 ++++++++-------- 2 files changed, 11 insertions(+), 10 deletions(-) (limited to 'tests') diff --git a/tests/cli-opts.sh b/tests/cli-opts.sh index 48020e2..733636f 100755 --- a/tests/cli-opts.sh +++ b/tests/cli-opts.sh @@ -182,7 +182,7 @@ test_environment_variables_and_precedence() { assert_status 0 assert_empty_stderr assert_stdout 'a' - assert_stream "\$XDG PROFILE" "$XDG/$PROFILE" '1:a' + assert_stream "\$XDG PROFILE" "$XDG/remembering/$PROFILE" '1:a' N="$LINENO" OUT="$(mktemp)" @@ -215,7 +215,8 @@ test_environment_variables_and_precedence() { assert_status 0 assert_empty_stderr assert_stdout 'c' - assert_stream "\$XDG and \$HOME PROFILE" "$XDG/$PROFILE" '1:c' + assert_stream \ + "\$XDG and \$HOME PROFILE" "$XDG/remembering/$PROFILE" '1:c' if [ -e "$HHOME/.local/share/remembering/$PROFILE" ]; then printf "\nERR: The file in \$HHOME/.local should't exist\n" >&2 diff --git a/tests/ranking.sh b/tests/ranking.sh index e07c594..6649156 100755 --- a/tests/ranking.sh +++ b/tests/ranking.sh @@ -67,9 +67,9 @@ BASE_PROFILE_A_PICKED='1:a 0:d 0:e' assert_profile() { - if [ "$(cat "$XDG_DATA_HOME/$1")" != "$2" ]; then + if [ "$(cat "$XDG_DATA_HOME/remembering/$1")" != "$2" ]; then printf '\n%s: Bad profile merge (%s).\n\nExpected:\n%s\nGot\n%s\n' \ - "$(ERROR)" "$PROFILE" "$2" "$(cat "$XDG_DATA_HOME/$1")" >&2 + "$(ERROR)" "$PROFILE" "$2" "$(cat "$XDG_DATA_HOME/remembering/$1")" >&2 exit 1 fi } @@ -188,7 +188,7 @@ test_pick_inexisting_value() { 0:b 0:c 0:d -0:e' > "$XDG_DATA_HOME/$PROFILE" +0:e' > "$XDG_DATA_HOME/remembering/$PROFILE" INPUT='a b c @@ -219,7 +219,7 @@ test_stdin_profile_merging() { echo '0:a 0:b 0:c -0:z' > "$XDG_DATA_HOME/$PROFILE" +0:z' > "$XDG_DATA_HOME/remembering/$PROFILE" INPUT='a b c @@ -237,7 +237,7 @@ e' test_stdin_is_larger_than_profile() { testing 'STDIN is larger than profile' PROFILE="stdin-is-larger-than-profile-$(uuid)" - echo '0:a' > "$XDG_DATA_HOME/$PROFILE" + echo '0:a' > "$XDG_DATA_HOME/remembering/$PROFILE" INPUT='a b c @@ -251,7 +251,7 @@ e' test_stdin_is_smaller_than_profile() { testing 'STDIN is smaller than profile' PROFILE="stdin-is-smaller-than-profile-$(uuid)" - echo "$BASE_PROFILE" > "$XDG_DATA_HOME/$PROFILE" + echo "$BASE_PROFILE" > "$XDG_DATA_HOME/remembering/$PROFILE" INPUT='a' pick_x a "$INPUT" assert_profile "$PROFILE" "$BASE_PROFILE_A_PICKED" @@ -261,7 +261,7 @@ test_stdin_is_smaller_than_profile() { test_stdin_is_empty() { testing 'STDIN is empty' PROFILE="stdin-is-empty-$(uuid)" - echo "$BASE_PROFILE" > "$XDG_DATA_HOME/$PROFILE" + echo "$BASE_PROFILE" > "$XDG_DATA_HOME/remembering/$PROFILE" OUT="$(mktemp)" ERR="$(mktemp)" @@ -294,7 +294,7 @@ e' test_profile_is_empty() { testing 'profile is empty' PROFILE="profile-is-empty-$(uuid)" - printf '' > "$XDG_DATA_HOME/$PROFILE" + printf '' > "$XDG_DATA_HOME/remembering/$PROFILE" INPUT='a b c -- cgit v1.2.3