mirror/libkiwix
1
0
Fork 0
mirror of https://github.com/kiwix/libkiwix.git synced 2025-12-23 22:47:57 -05:00
Code Issues Packages Projects Releases Wiki Activity

Another way of testing that an existing spellings DB is reused

Browse Source 
Under Windows and Packages CI workflows the previous approach to testing
that an existing spellings DB file is reused didn't work since it relied
on an auxiliary test ensuring that a spellings database cannot be
created in a read-only directory, whereas

1. under Windows a temporary directory couldn't be made read-only
   (leading to the failure of the auxiliary test)

2. in the Packages workflow the build was run with root privileges
   and the read-onliness of the target directory was ignored
   (leading to the same failure).

So the test was rewritten to actually check the content of the target
directory as well as the modifications times of the target directory and
the database file.
This commit is contained in:
Veloman Yunkan
2025-10-09 16:52:30 +04:00
parent 54bd29e3ed
commit e402dcabcb
1 changed files with 24 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
test/spelling_correction.cpp
View File

@@ -37,24 +37,9 @@ protected:
}
void TearDown() override {
std::filesystem::permissions(
tmpDirPath,
std::filesystem::perms::owner_write,
std::filesystem::perm_options::add
);
std::filesystem::remove_all(tmpDirPath);
}
void makeTmpDirReadOnly() {
using std::filesystem::perms;
std::filesystem::permissions(
tmpDirPath,
perms::owner_write | perms::group_write | perms::others_write,
std::filesystem::perm_options::remove
);
}
protected:
std::filesystem::path tmpDirPath;
std::unique_ptr<zim::Archive> archive;
@@ -192,29 +177,41 @@ void testSpellingCorrections(const kiwix::SpellingsDB& spellingsDB)
EXPECT_THROW(spellingsDB.getSpellingCorrections("Kung", 2), std::runtime_error);
}
TEST_F(SpellingCorrectionTest, SpellingsDBCannotBeCreatedInAReadOnlyDirectory)
{
makeTmpDirReadOnly();
using StrCollection = std::vector<std::string>;
EXPECT_THROW(
const kiwix::SpellingsDB spellingsDB(*archive, tmpDirPath),
Xapian::DatabaseCreateError
);
StrCollection directoryEntries(std::filesystem::path dirPath)
{
StrCollection result;
for ( const auto& dirEntry : std::filesystem::directory_iterator(dirPath) ) {
result.push_back(dirEntry.path().string());
}
return result;
}
TEST_F(SpellingCorrectionTest, allInOne)
{
const auto spellingsDbPath = tmpDirPath;
const auto tmpDirModTime0 = std::filesystem::last_write_time(tmpDirPath);
ASSERT_TRUE(directoryEntries(tmpDirPath).empty());
{
const kiwix::SpellingsDB spellingsDB(*archive, spellingsDbPath);
const kiwix::SpellingsDB spellingsDB(*archive, tmpDirPath);
testSpellingCorrections(spellingsDB);
}
makeTmpDirReadOnly();
const auto tmpDirModTime1 = std::filesystem::last_write_time(tmpDirPath);
const auto spellingsDbPath = tmpDirPath / "554c9707-897e-097a-53ba-1b1306d8bb88.spellingsdb.v0.1";
const StrCollection EXPECTED_DIR_CONTENT{ spellingsDbPath.string() };
ASSERT_EQ(directoryEntries(tmpDirPath), EXPECTED_DIR_CONTENT);
ASSERT_LT(tmpDirModTime0, tmpDirModTime1);
const auto fileModTime = std::filesystem::last_write_time(spellingsDbPath);
{
const kiwix::SpellingsDB spellingsDB(*archive, spellingsDbPath);
const kiwix::SpellingsDB spellingsDB(*archive, tmpDirPath);
testSpellingCorrections(spellingsDB);
}
ASSERT_EQ(directoryEntries(tmpDirPath), EXPECTED_DIR_CONTENT );
ASSERT_EQ(tmpDirModTime1, std::filesystem::last_write_time(tmpDirPath));
ASSERT_EQ(fileModTime, std::filesystem::last_write_time(spellingsDbPath));
}