Merge branch 'develop' into multi-config-support

# Conflicts:
#	unittest/force-styles/test_error_stats.cpp
This commit is contained in:
Axel Kohlmeyer
2021-11-04 15:50:49 -04:00
3 changed files with 13 additions and 6 deletions

View File

@ -35,8 +35,8 @@ class TextFileReaderTest : public ::testing::Test {
protected:
void TearDown() override
{
unlink("text_reader_one.file");
unlink("text_reader_two.file");
platform::unlink("text_reader_one.file");
platform::unlink("text_reader_two.file");
}
void test_files()
@ -65,16 +65,22 @@ TEST_F(TextFileReaderTest, nofile)
FileReaderException);
}
// this test cannot work on windows due to its non unix-like permission system
#if !defined(_WIN32)
TEST_F(TextFileReaderTest, permissions)
{
platform::unlink("text_reader_noperms.file");
FILE *fp = fopen("text_reader_noperms.file", "w");
ASSERT_NE(fp,nullptr);
fputs("word\n", fp);
fclose(fp);
chmod("text_reader_noperms.file", 0);
ASSERT_THROW({ TextFileReader reader("text_reader_noperms.file", "test"); },
FileReaderException);
unlink("text_reader_noperms.file");
platform::unlink("text_reader_noperms.file");
}
#endif
TEST_F(TextFileReaderTest, nofp)
{