diff --git a/testcases/integration-tests/check_old-index.xml.sh b/testcases/integration-tests/check_old-index.xml.sh
index d400e326..4568b0f8 100644
--- a/testcases/integration-tests/check_old-index.xml.sh
+++ b/testcases/integration-tests/check_old-index.xml.sh
@@ -1,46 +1,51 @@
_checks[check_old-index.xml]="Compatibility: Old/ancient file formats"
_context[check_old-index.xml]="
What this test will do:
- This test checks whether old file versions are still correctly read.
- After you close this dialog, KPhotoAlbum will be started 2 times in a row.
What you have to do:
- Each time KPhotoAlbum starts, save the database and exit KPhotoAlbum.
"
check_old-index.xml()
{
local check_name="check_old-index.xml"
local check_dir="$TEMPDIR/$check_name"
local data_dir="$mydir/db/old-index.xml"
setup_check "$check_dir" || return $result_err_setup
# not needed in this scenario:
rm -r "$check_dir/db"
kdialog --msgbox "$check_name
${_context[$check_name]}"
for subcheck in v2.2 v3.0
do
local subcheck_dir="$check_dir/$subcheck"
mkdir "$subcheck_dir" || return $result_err_setup
local add_rc="[General]\nuntaggedCategory=\nuntaggedTag=\n"
echo -e "$add_rc$BASE_RC" > "$subcheck_dir/kphotoalbumrc" || return $result_err_setup
# set logging rules:
cp -a "$check_dir/QtProject" "$subcheck_dir"
# prepare database:
cp "$data_dir/$subcheck.orig.xml" "$subcheck_dir/index.xml" || return $result_err_setup
export XDG_CONFIG_HOME="$subcheck_dir"
kphotoalbum --db "$subcheck_dir/index.xml" > "$subcheck_dir/log" 2>&1 || return $result_err_crash
if ! diff -u "$data_dir/$subcheck.result.xml" "$subcheck_dir/index.xml"
then
log notice "$check_name/$subcheck: Mismatch in index.xml!"
return $result_failed
fi
+ if ! grep -q '^kphotoalbum.DB: "Standard category names are no longer used since index.xml version 7. Standard categories will be left untranslated from now on."$' "$subcheck_dir/log"
+ then
+ log notice "$check_name/$subcheck: Missing expected log message!"
+ return $result_failed
+ fi
done
return $result_ok
}
diff --git a/testcases/integration-tests/check_recover-from-duplicates.sh b/testcases/integration-tests/check_recover-from-duplicates.sh
index d81cd0ce..f7e0c6f0 100644
--- a/testcases/integration-tests/check_recover-from-duplicates.sh
+++ b/testcases/integration-tests/check_recover-from-duplicates.sh
@@ -1,48 +1,53 @@
_checks[check_recover-from-duplicates]="Recovery from duplicate image entries"
_context[check_recover-from-duplicates]="What this test will do:
- This test checks whether a version 7 database file with duplicate images is correctly de-duplicated when reading in.
- After you close this dialog, KPhotoAlbum will be started 4 times in a row.
What you have to do:
- Each time KPhotoAlbum starts, save the database and exit KPhotoAlbum.
"
check_recover-from-duplicates()
{
local check_name="check_recover-from-duplicates"
local check_dir="$TEMPDIR/$check_name"
local data_dir="$mydir/db/recover-from-duplicates"
setup_check "$check_dir" || return $result_err_setup
# not needed in this scenario:
rm -r "$check_dir/db"
kdialog --msgbox "$check_name
${_context[$check_name]}"
for subcheck in compressed uncompressed uncompressed-to-compressed compressed-to-uncompressed
do
local subcheck_dir="$check_dir/$subcheck"
mkdir "$subcheck_dir" || return $result_err_setup
local add_rc="[General]\nuntaggedCategory=\nuntaggedTag=\n"
if [[ "$subcheck" == "uncompressed" || "$subcheck" == "compressed-to-uncompressed" ]]
then
add_rc="$add_rc\nuseCompressedIndexXML=false\n"
fi
echo -e "$add_rc$BASE_RC" > "$subcheck_dir/kphotoalbumrc" || return $result_err_setup
# prepare database:
cp "$data_dir/$subcheck.orig.xml" "$subcheck_dir/index.xml" || return $result_err_setup
export XDG_CONFIG_HOME="$subcheck_dir"
kphotoalbum --db "$subcheck_dir/index.xml" > "$subcheck_dir/log" 2>&1 || return $result_err_crash
if ! diff -u "$data_dir/$subcheck.result.xml" "$subcheck_dir/index.xml"
then
log notice "$check_name/$subcheck: Mismatch in index.xml!"
return $result_failed
fi
+ if ! grep -q '^kphotoalbum.XMLDB: Merging duplicate entry for file "4.jpg"$' "$subcheck_dir/log"
+ then
+ log notice "$check_name/$subcheck: Missing expected log message!"
+ return $result_failed
+ fi
done
return $result_ok
}