From fd35c63eb5a22e125e7ac843678f4826c53750a9 Mon Sep 17 00:00:00 2001
From: ttionya <git@ttionya.com>
Date: Thu, 18 Jul 2024 23:33:20 +0800
Subject: [PATCH] test: improve test unit

---
 tests/test.sh                       | 2 +-
 tests/units/backup-zip-file/test.sh | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/tests/test.sh b/tests/test.sh
index 661e8a7..3e84200 100644
--- a/tests/test.sh
+++ b/tests/test.sh
@@ -4,7 +4,7 @@
 DOCKER_IMAGE="ttionya/vaultwarden-backup:test"
 ERROR_NUM=0
 
-DATA_DIR="$(pwd)/fixtures/source/bitwarden/data"
+DATA_DIR="$(pwd)/tests/fixtures/source/bitwarden/data"
 OUTPUT_DIR="output"
 EXTRACT_DIR="extract"
 REMOTE_DIR="/${OUTPUT_DIR}"
diff --git a/tests/units/backup-zip-file/test.sh b/tests/units/backup-zip-file/test.sh
index 3d4012b..78307af 100644
--- a/tests/units/backup-zip-file/test.sh
+++ b/tests/units/backup-zip-file/test.sh
@@ -2,6 +2,7 @@
 
 TEST_NAME="backup-zip-file"
 TEST_OUTPUT_DIR="$(pwd)/${OUTPUT_DIR}/${TEST_NAME}"
+TEST_EXTRACT_DIR="$(pwd)/${EXTRACT_DIR}/${TEST_NAME}"
 
 PASSWORD="71ad8764-2f69-4c0c-8452-61e08b9f489d"
 BACKUP_FILE="${TEST_OUTPUT_DIR}/backup.test.zip"
@@ -11,7 +12,7 @@ FAILED_NUM=0
 color yellow "Starting test case \"${TEST_NAME}\""
 
 function prepare() {
-    mkdir -p "${TEST_OUTPUT_DIR}"
+    mkdir -p "${TEST_OUTPUT_DIR}" "${TEST_EXTRACT_DIR}"
 }
 
 function start() {
@@ -32,7 +33,7 @@ function test() {
     7z l -p"${PASSWORD}" "${BACKUP_FILE}"
 
     docker run --rm \
-      --mount "type=bind,source=${EXTRACT_DIR},target=/bitwarden/data/" \
+      --mount "type=bind,source=${TEST_EXTRACT_DIR},target=/bitwarden/data/" \
       --mount "type=bind,source=$(dirname "${BACKUP_FILE}"),target=/bitwarden/restore/" \
       "${DOCKER_IMAGE}" \
       restore \
@@ -40,7 +41,7 @@ function test() {
       -p "${PASSWORD}" \
       --zip-file "$(basename "${BACKUP_FILE}")"
 
-    check_files_same_in_folders "${DATA_DIR}" "${EXTRACT_DIR}"
+    check_files_same_in_folders "${DATA_DIR}" "${TEST_EXTRACT_DIR}"
     if [[ $? != 0 ]]; then
         ((FAILED_NUM++))
     fi