diff --git a/src/Magnum/ShaderTools/Test/AbstractConverterTest.cpp b/src/Magnum/ShaderTools/Test/AbstractConverterTest.cpp index fe188df00..c20c80ff4 100644 --- a/src/Magnum/ShaderTools/Test/AbstractConverterTest.cpp +++ b/src/Magnum/ShaderTools/Test/AbstractConverterTest.cpp @@ -1019,8 +1019,8 @@ void AbstractConverterTest::convertDataToFileThroughData() { const std::string filename = Utility::Directory::join(SHADERTOOLS_TEST_OUTPUT_DIR, "file.dat"); /* Remove previous file, if any */ - Utility::Directory::rm(filename); - CORRADE_VERIFY(!Utility::Directory::exists(filename)); + if(Utility::Directory::exists(filename)) + CORRADE_VERIFY(Utility::Directory::rm(filename)); const char data[] = {'S', 'P', 'I', 'R', 'V'}; CORRADE_VERIFY(converter.convertDataToFile({}, data, filename)); @@ -1044,8 +1044,8 @@ void AbstractConverterTest::convertDataToFileThroughDataFailed() { const std::string filename = Utility::Directory::join(SHADERTOOLS_TEST_OUTPUT_DIR, "file.dat"); /* Remove previous file, if any */ - Utility::Directory::rm(filename); - CORRADE_VERIFY(!Utility::Directory::exists(filename)); + if(Utility::Directory::exists(filename)) + CORRADE_VERIFY(Utility::Directory::rm(filename)); /* Function should fail, no file should get written and no error output should be printed (the base implementation assumes the plugin does it) */ @@ -1132,8 +1132,8 @@ void AbstractConverterTest::convertFileToFile() { const std::string filename = Utility::Directory::join(SHADERTOOLS_TEST_OUTPUT_DIR, "file.dat"); /* Remove previous file, if any */ - Utility::Directory::rm(filename); - CORRADE_VERIFY(!Utility::Directory::exists(filename)); + if(Utility::Directory::exists(filename)) + CORRADE_VERIFY(Utility::Directory::rm(filename)); CORRADE_VERIFY(converter.convertFileToFile({}, Utility::Directory::join(SHADERTOOLS_TEST_DIR, "file.dat"), filename)); CORRADE_COMPARE_AS(filename, "VS", @@ -1156,8 +1156,8 @@ void AbstractConverterTest::convertFileToFileThroughData() { const std::string filename = Utility::Directory::join(SHADERTOOLS_TEST_OUTPUT_DIR, "file.dat"); /* Remove previous file, if any */ - Utility::Directory::rm(filename); - CORRADE_VERIFY(!Utility::Directory::exists(filename)); + if(Utility::Directory::exists(filename)) + CORRADE_VERIFY(Utility::Directory::rm(filename)); CORRADE_VERIFY(converter.convertFileToFile({}, Utility::Directory::join(SHADERTOOLS_TEST_DIR, "file.dat"), filename)); CORRADE_COMPARE_AS(filename, "VS", @@ -1200,8 +1200,8 @@ void AbstractConverterTest::convertFileToFileThroughDataFailed() { const std::string filename = Utility::Directory::join(SHADERTOOLS_TEST_OUTPUT_DIR, "file.dat"); /* Remove previous file, if any */ - Utility::Directory::rm(filename); - CORRADE_VERIFY(!Utility::Directory::exists(filename)); + if(Utility::Directory::exists(filename)) + CORRADE_VERIFY(Utility::Directory::rm(filename)); /* Function should fail, no file should get written and no error output should be printed (the base implementation assumes the plugin does it) */ @@ -1539,8 +1539,8 @@ void AbstractConverterTest::linkDataToFileThroughData() { const std::string filename = Utility::Directory::join(SHADERTOOLS_TEST_OUTPUT_DIR, "file.dat"); /* Remove previous file, if any */ - Utility::Directory::rm(filename); - CORRADE_VERIFY(!Utility::Directory::exists(filename)); + if(Utility::Directory::exists(filename)) + CORRADE_VERIFY(Utility::Directory::rm(filename)); CORRADE_VERIFY(converter.linkDataToFile({ {Stage::Vertex, Containers::arrayView({'V', 'E'})}, @@ -1566,8 +1566,8 @@ void AbstractConverterTest::linkDataToFileThroughDataFailed() { const std::string filename = Utility::Directory::join(SHADERTOOLS_TEST_OUTPUT_DIR, "file.dat"); /* Remove previous file, if any */ - Utility::Directory::rm(filename); - CORRADE_VERIFY(!Utility::Directory::exists(filename)); + if(Utility::Directory::exists(filename)) + CORRADE_VERIFY(Utility::Directory::rm(filename)); /* Function should fail, no file should get written and no error output should be printed (the base implementation assumes the plugin does it) */ @@ -1703,8 +1703,8 @@ void AbstractConverterTest::linkFilesToFile() { const std::string filename = Utility::Directory::join(SHADERTOOLS_TEST_OUTPUT_DIR, "file.dat"); /* Remove previous file, if any */ - Utility::Directory::rm(filename); - CORRADE_VERIFY(!Utility::Directory::exists(filename)); + if(Utility::Directory::exists(filename)) + CORRADE_VERIFY(Utility::Directory::rm(filename)); CORRADE_VERIFY(converter.linkFilesToFile({ {Stage::Vertex, Utility::Directory::join(SHADERTOOLS_TEST_DIR, "another.dat")}, @@ -1734,8 +1734,8 @@ void AbstractConverterTest::linkFilesToFileThroughData() { const std::string filename = Utility::Directory::join(SHADERTOOLS_TEST_OUTPUT_DIR, "file.dat"); /* Remove previous file, if any */ - Utility::Directory::rm(filename); - CORRADE_VERIFY(!Utility::Directory::exists(filename)); + if(Utility::Directory::exists(filename)) + CORRADE_VERIFY(Utility::Directory::rm(filename)); CORRADE_VERIFY(converter.linkFilesToFile({ {Stage::Vertex, Utility::Directory::join(SHADERTOOLS_TEST_DIR, "another.dat")}, @@ -1784,8 +1784,8 @@ void AbstractConverterTest::linkFilesToFileThroughDataFailed() { const std::string filename = Utility::Directory::join(SHADERTOOLS_TEST_OUTPUT_DIR, "file.dat"); /* Remove previous file, if any */ - Utility::Directory::rm(filename); - CORRADE_VERIFY(!Utility::Directory::exists(filename)); + if(Utility::Directory::exists(filename)) + CORRADE_VERIFY(Utility::Directory::rm(filename)); /* Function should fail, no file should get written and no error output should be printed (the base implementation assumes the plugin does it) */ @@ -2474,8 +2474,8 @@ void AbstractConverterTest::setInputFileCallbackConvertFileToFileThroughBaseImpl /* Remove previous file, if any */ const std::string filename = Utility::Directory::join(SHADERTOOLS_TEST_OUTPUT_DIR, "file.out"); - Utility::Directory::rm(filename); - CORRADE_VERIFY(!Utility::Directory::exists(filename)); + if(Utility::Directory::exists(filename)) + CORRADE_VERIFY(Utility::Directory::rm(filename)); CORRADE_VERIFY(converter.convertFileToFile(Stage::Geometry, "file.dat", filename)); CORRADE_VERIFY(converter.convertFileToFileCalled); @@ -2555,8 +2555,8 @@ void AbstractConverterTest::setInputFileCallbackConvertFileToFileAsData() { /* Remove previous file, if any */ const std::string filename = Utility::Directory::join(SHADERTOOLS_TEST_OUTPUT_DIR, "file.out"); - Utility::Directory::rm(filename); - CORRADE_VERIFY(!Utility::Directory::exists(filename)); + if(Utility::Directory::exists(filename)) + CORRADE_VERIFY(Utility::Directory::rm(filename)); CORRADE_VERIFY(converter.convertFileToFile(Stage::RayAnyHit, "file.dat", filename)); CORRADE_VERIFY(state.loaded); @@ -2909,8 +2909,8 @@ void AbstractConverterTest::setInputFileCallbackLinkFilesToFileThroughBaseImplem /* Remove previous file, if any */ const std::string filename = Utility::Directory::join(SHADERTOOLS_TEST_OUTPUT_DIR, "file.out"); - Utility::Directory::rm(filename); - CORRADE_VERIFY(!Utility::Directory::exists(filename)); + if(Utility::Directory::exists(filename)) + CORRADE_VERIFY(Utility::Directory::rm(filename)); CORRADE_VERIFY(converter.linkFilesToFile({ {Stage::Vertex, "another.dat"}, @@ -3032,8 +3032,8 @@ void AbstractConverterTest::setInputFileCallbackLinkFilesToFileAsData() { /* Remove previous file, if any */ const std::string filename = Utility::Directory::join(SHADERTOOLS_TEST_OUTPUT_DIR, "file.out"); - Utility::Directory::rm(filename); - CORRADE_VERIFY(!Utility::Directory::exists(filename)); + if(Utility::Directory::exists(filename)) + CORRADE_VERIFY(Utility::Directory::rm(filename)); CORRADE_VERIFY(converter.linkFilesToFile({ {Stage::Vertex, "another.dat"}, diff --git a/src/Magnum/Text/Test/AbstractFontConverterTest.cpp b/src/Magnum/Text/Test/AbstractFontConverterTest.cpp index 82020fff6..c999f9692 100644 --- a/src/Magnum/Text/Test/AbstractFontConverterTest.cpp +++ b/src/Magnum/Text/Test/AbstractFontConverterTest.cpp @@ -374,10 +374,10 @@ void AbstractFontConverterTest::exportFontToFile() { const std::string filename2 = Utility::Directory::join(TEXT_TEST_OUTPUT_DIR, "font.out.dat"); /* Remove previous files, if any */ - Utility::Directory::rm(filename); - Utility::Directory::rm(filename2); - CORRADE_VERIFY(!Utility::Directory::exists(filename)); - CORRADE_VERIFY(!Utility::Directory::exists(filename2)); + if(Utility::Directory::exists(filename)) + CORRADE_VERIFY(Utility::Directory::rm(filename)); + if(Utility::Directory::exists(filename2)) + CORRADE_VERIFY(Utility::Directory::rm(filename2)); CORRADE_VERIFY(converter.exportFontToFile(dummyFont, dummyGlyphCache, filename, "eh")); CORRADE_COMPARE_AS(filename, "\xf0", @@ -438,10 +438,10 @@ void AbstractFontConverterTest::exportFontToFileThroughData() { const std::string filename2 = Utility::Directory::join(TEXT_TEST_OUTPUT_DIR, "font.out.dat"); /* Remove previous files, if any */ - Utility::Directory::rm(filename); - Utility::Directory::rm(filename2); - CORRADE_VERIFY(!Utility::Directory::exists(filename)); - CORRADE_VERIFY(!Utility::Directory::exists(filename2)); + if(Utility::Directory::exists(filename)) + CORRADE_VERIFY(Utility::Directory::rm(filename)); + if(Utility::Directory::exists(filename2)) + CORRADE_VERIFY(Utility::Directory::rm(filename2)); /* doExportToFile() should call doExportToData() */ CORRADE_VERIFY(converter.exportFontToFile(dummyFont, dummyGlyphCache, filename, "awoo")); @@ -463,8 +463,8 @@ void AbstractFontConverterTest::exportFontToFileThroughDataFailed() { const std::string filename = Utility::Directory::join(TEXT_TEST_OUTPUT_DIR, "font.out"); /* Remove previous file, if any */ - Utility::Directory::rm(filename); - CORRADE_VERIFY(!Utility::Directory::exists(filename)); + if(Utility::Directory::exists(filename)) + CORRADE_VERIFY(Utility::Directory::rm(filename)); /* Function should fail, no file should get written and no error output should be printed (the base implementation assumes the plugin does it) */ @@ -676,10 +676,10 @@ void AbstractFontConverterTest::exportGlyphCacheToFile() { const std::string filename2 = Utility::Directory::join(TEXT_TEST_OUTPUT_DIR, "cache.out.dat"); /* Remove previous files, if any */ - Utility::Directory::rm(filename); - Utility::Directory::rm(filename2); - CORRADE_VERIFY(!Utility::Directory::exists(filename)); - CORRADE_VERIFY(!Utility::Directory::exists(filename2)); + if(Utility::Directory::exists(filename)) + CORRADE_VERIFY(Utility::Directory::rm(filename)); + if(Utility::Directory::exists(filename2)) + CORRADE_VERIFY(Utility::Directory::rm(filename2)); CORRADE_VERIFY(converter.exportGlyphCacheToFile(dummyGlyphCache, filename)); CORRADE_COMPARE_AS(filename, "\xf0", @@ -740,10 +740,10 @@ void AbstractFontConverterTest::exportGlyphCacheToFileThroughData() { const std::string filename2 = Utility::Directory::join(TEXT_TEST_OUTPUT_DIR, "cache.out.dat"); /* Remove previous files, if any */ - Utility::Directory::rm(filename); - Utility::Directory::rm(filename2); - CORRADE_VERIFY(!Utility::Directory::exists(filename)); - CORRADE_VERIFY(!Utility::Directory::exists(filename2)); + if(Utility::Directory::exists(filename)) + CORRADE_VERIFY(Utility::Directory::rm(filename)); + if(Utility::Directory::exists(filename2)) + CORRADE_VERIFY(Utility::Directory::rm(filename2)); /* doExportGlyphCacheToFile() should call doExportGlyphCacheToData() */ CORRADE_VERIFY(converter.exportGlyphCacheToFile(dummyGlyphCache, filename)); @@ -763,8 +763,8 @@ void AbstractFontConverterTest::exportGlyphCacheToFileThroughDataFailed() { const std::string filename = Utility::Directory::join(TEXT_TEST_OUTPUT_DIR, "cache.out"); /* Remove previous file, if any */ - Utility::Directory::rm(filename); - CORRADE_VERIFY(!Utility::Directory::exists(filename)); + if(Utility::Directory::exists(filename)) + CORRADE_VERIFY(Utility::Directory::rm(filename)); /* Function should fail, no file should get written and no error output should be printed (the base implementation assumes the plugin does it) */ diff --git a/src/Magnum/Trade/Test/AbstractImageConverterTest.cpp b/src/Magnum/Trade/Test/AbstractImageConverterTest.cpp index 80b935953..cdcb7589b 100644 --- a/src/Magnum/Trade/Test/AbstractImageConverterTest.cpp +++ b/src/Magnum/Trade/Test/AbstractImageConverterTest.cpp @@ -2091,8 +2091,8 @@ void AbstractImageConverterTest::convert1DToFile() { const std::string filename = Utility::Directory::join(TRADE_TEST_OUTPUT_DIR, "image.out"); /* Remove previous file, if any */ - Utility::Directory::rm(filename); - CORRADE_VERIFY(!Utility::Directory::exists(filename)); + if(Utility::Directory::exists(filename)) + CORRADE_VERIFY(Utility::Directory::rm(filename)); CORRADE_VERIFY(converter.convertToFile(ImageView1D{PixelFormat::RGBA8Unorm, 0x0f, Containers::Array{0x0f*4}}, filename)); CORRADE_COMPARE_AS(filename, @@ -2111,8 +2111,8 @@ void AbstractImageConverterTest::convert2DToFile() { const std::string filename = Utility::Directory::join(TRADE_TEST_OUTPUT_DIR, "image.out"); /* Remove previous file, if any */ - Utility::Directory::rm(filename); - CORRADE_VERIFY(!Utility::Directory::exists(filename)); + if(Utility::Directory::exists(filename)) + CORRADE_VERIFY(Utility::Directory::rm(filename)); CORRADE_VERIFY(converter.convertToFile(ImageView2D{PixelFormat::RGBA8Unorm, {0x0f, 0x0d}, Containers::Array{0x0f*0x0d*4}}, filename)); CORRADE_COMPARE_AS(filename, @@ -2131,8 +2131,8 @@ void AbstractImageConverterTest::convert3DToFile() { const std::string filename = Utility::Directory::join(TRADE_TEST_OUTPUT_DIR, "image.out"); /* Remove previous file, if any */ - Utility::Directory::rm(filename); - CORRADE_VERIFY(!Utility::Directory::exists(filename)); + if(Utility::Directory::exists(filename)) + CORRADE_VERIFY(Utility::Directory::rm(filename)); CORRADE_VERIFY(converter.convertToFile(ImageView3D{PixelFormat::RGBA8Unorm, {0x0f, 0x0d, 0x02}, Containers::Array{0x0f*0x0d*0x02*4}}, filename)); CORRADE_COMPARE_AS(filename, @@ -2151,8 +2151,8 @@ void AbstractImageConverterTest::convert1DToFileThroughData() { const std::string filename = Utility::Directory::join(TRADE_TEST_OUTPUT_DIR, "image.out"); /* Remove previous file, if any */ - Utility::Directory::rm(filename); - CORRADE_VERIFY(!Utility::Directory::exists(filename)); + if(Utility::Directory::exists(filename)) + CORRADE_VERIFY(Utility::Directory::rm(filename)); /* doConvertToFile() should call doConvertToData() */ CORRADE_VERIFY(converter.convertToFile(ImageView1D(PixelFormat::RGBA8Unorm, 0x0f, Containers::Array{0x0f*4}), filename)); @@ -2172,8 +2172,8 @@ void AbstractImageConverterTest::convert2DToFileThroughData() { const std::string filename = Utility::Directory::join(TRADE_TEST_OUTPUT_DIR, "image.out"); /* Remove previous file, if any */ - Utility::Directory::rm(filename); - CORRADE_VERIFY(!Utility::Directory::exists(filename)); + if(Utility::Directory::exists(filename)) + CORRADE_VERIFY(Utility::Directory::rm(filename)); /* doConvertToFile() should call doConvertToData() */ CORRADE_VERIFY(converter.convertToFile(ImageView2D(PixelFormat::RGBA8Unorm, {0x0f, 0x0d}, Containers::Array{0x0f*0x0d*4}), filename)); @@ -2193,8 +2193,8 @@ void AbstractImageConverterTest::convert3DToFileThroughData() { const std::string filename = Utility::Directory::join(TRADE_TEST_OUTPUT_DIR, "image.out"); /* Remove previous file, if any */ - Utility::Directory::rm(filename); - CORRADE_VERIFY(!Utility::Directory::exists(filename)); + if(Utility::Directory::exists(filename)) + CORRADE_VERIFY(Utility::Directory::rm(filename)); /* doConvertToFile() should call doConvertToData() */ CORRADE_VERIFY(converter.convertToFile(ImageView3D(PixelFormat::RGBA8Unorm, {0x0f, 0x0d, 0x02}, Containers::Array{0x0f*0x0d*0x02*4}), filename)); @@ -2215,8 +2215,8 @@ void AbstractImageConverterTest::convert1DToFileThroughDataFailed() { const char data[4]{}; /* Remove previous file, if any */ - Utility::Directory::rm(filename); - CORRADE_VERIFY(!Utility::Directory::exists(filename)); + if(Utility::Directory::exists(filename)) + CORRADE_VERIFY(Utility::Directory::rm(filename)); /* Function should fail, no file should get written and no error output should be printed (the base implementation assumes the plugin does it) */ @@ -2240,8 +2240,8 @@ void AbstractImageConverterTest::convert2DToFileThroughDataFailed() { const char data[4]{}; /* Remove previous file, if any */ - Utility::Directory::rm(filename); - CORRADE_VERIFY(!Utility::Directory::exists(filename)); + if(Utility::Directory::exists(filename)) + CORRADE_VERIFY(Utility::Directory::rm(filename)); /* Function should fail, no file should get written and no error output should be printed (the base implementation assumes the plugin does it) */ @@ -2265,8 +2265,8 @@ void AbstractImageConverterTest::convert3DToFileThroughDataFailed() { const char data[4]{}; /* Remove previous file, if any */ - Utility::Directory::rm(filename); - CORRADE_VERIFY(!Utility::Directory::exists(filename)); + if(Utility::Directory::exists(filename)) + CORRADE_VERIFY(Utility::Directory::rm(filename)); /* Function should fail, no file should get written and no error output should be printed (the base implementation assumes the plugin does it) */ @@ -2436,8 +2436,8 @@ void AbstractImageConverterTest::convertCompressed1DToFile() { const std::string filename = Utility::Directory::join(TRADE_TEST_OUTPUT_DIR, "image.out"); /* Remove previous file, if any */ - Utility::Directory::rm(filename); - CORRADE_VERIFY(!Utility::Directory::exists(filename)); + if(Utility::Directory::exists(filename)) + CORRADE_VERIFY(Utility::Directory::rm(filename)); CORRADE_VERIFY(converter.convertToFile(CompressedImageView1D{CompressedPixelFormat::Bc1RGBAUnorm, 0x0f, Containers::Array{64}}, filename)); CORRADE_COMPARE_AS(filename, @@ -2456,8 +2456,8 @@ void AbstractImageConverterTest::convertCompressed2DToFile() { const std::string filename = Utility::Directory::join(TRADE_TEST_OUTPUT_DIR, "image.out"); /* Remove previous file, if any */ - Utility::Directory::rm(filename); - CORRADE_VERIFY(!Utility::Directory::exists(filename)); + if(Utility::Directory::exists(filename)) + CORRADE_VERIFY(Utility::Directory::rm(filename)); CORRADE_VERIFY(converter.convertToFile(CompressedImageView2D{CompressedPixelFormat::Bc1RGBAUnorm, {0x0f, 0x0d}, Containers::Array{64}}, filename)); CORRADE_COMPARE_AS(filename, @@ -2476,8 +2476,8 @@ void AbstractImageConverterTest::convertCompressed3DToFile() { const std::string filename = Utility::Directory::join(TRADE_TEST_OUTPUT_DIR, "image.out"); /* Remove previous file, if any */ - Utility::Directory::rm(filename); - CORRADE_VERIFY(!Utility::Directory::exists(filename)); + if(Utility::Directory::exists(filename)) + CORRADE_VERIFY(Utility::Directory::rm(filename)); CORRADE_VERIFY(converter.convertToFile(CompressedImageView3D{CompressedPixelFormat::Bc1RGBAUnorm, {0x0f, 0x0d, 0x02}, Containers::Array{64}}, filename)); CORRADE_COMPARE_AS(filename, @@ -2496,8 +2496,8 @@ void AbstractImageConverterTest::convertCompressed1DToFileThroughData() { const std::string filename = Utility::Directory::join(TRADE_TEST_OUTPUT_DIR, "image.out"); /* Remove previous file, if any */ - Utility::Directory::rm(filename); - CORRADE_VERIFY(!Utility::Directory::exists(filename)); + if(Utility::Directory::exists(filename)) + CORRADE_VERIFY(Utility::Directory::rm(filename)); /* doConvertToFile() should call doConvertToData() */ CORRADE_VERIFY(converter.convertToFile(CompressedImageView1D{CompressedPixelFormat::Bc1RGBAUnorm, 0x0f, Containers::Array{64}}, filename)); @@ -2517,8 +2517,8 @@ void AbstractImageConverterTest::convertCompressed2DToFileThroughData() { const std::string filename = Utility::Directory::join(TRADE_TEST_OUTPUT_DIR, "image.out"); /* Remove previous file, if any */ - Utility::Directory::rm(filename); - CORRADE_VERIFY(!Utility::Directory::exists(filename)); + if(Utility::Directory::exists(filename)) + CORRADE_VERIFY(Utility::Directory::rm(filename)); /* doConvertToFile() should call doConvertToData() */ CORRADE_VERIFY(converter.convertToFile(CompressedImageView2D{CompressedPixelFormat::Bc1RGBAUnorm, {0x0f, 0x0d}, Containers::Array{64}}, filename)); @@ -2538,8 +2538,8 @@ void AbstractImageConverterTest::convertCompressed3DToFileThroughData() { const std::string filename = Utility::Directory::join(TRADE_TEST_OUTPUT_DIR, "image.out"); /* Remove previous file, if any */ - Utility::Directory::rm(filename); - CORRADE_VERIFY(!Utility::Directory::exists(filename)); + if(Utility::Directory::exists(filename)) + CORRADE_VERIFY(Utility::Directory::rm(filename)); /* doConvertToFile() should call doConvertToData() */ CORRADE_VERIFY(converter.convertToFile(CompressedImageView3D{CompressedPixelFormat::Bc1RGBAUnorm, {0x0f, 0x0d, 0x02}, Containers::Array{64}}, filename)); @@ -2560,8 +2560,8 @@ void AbstractImageConverterTest::convertCompressed1DToFileThroughDataFailed() { const char data[8]{}; /* Remove previous file, if any */ - Utility::Directory::rm(filename); - CORRADE_VERIFY(!Utility::Directory::exists(filename)); + if(Utility::Directory::exists(filename)) + CORRADE_VERIFY(Utility::Directory::rm(filename)); /* Function should fail, no file should get written and no error output should be printed (the base implementation assumes the plugin does it) */ @@ -2585,8 +2585,8 @@ void AbstractImageConverterTest::convertCompressed2DToFileThroughDataFailed() { const char data[8]{}; /* Remove previous file, if any */ - Utility::Directory::rm(filename); - CORRADE_VERIFY(!Utility::Directory::exists(filename)); + if(Utility::Directory::exists(filename)) + CORRADE_VERIFY(Utility::Directory::rm(filename)); /* Function should fail, no file should get written and no error output should be printed (the base implementation assumes the plugin does it) */ @@ -2610,8 +2610,8 @@ void AbstractImageConverterTest::convertCompressed3DToFileThroughDataFailed() { const char data[8]{}; /* Remove previous file, if any */ - Utility::Directory::rm(filename); - CORRADE_VERIFY(!Utility::Directory::exists(filename)); + if(Utility::Directory::exists(filename)) + CORRADE_VERIFY(Utility::Directory::rm(filename)); /* Function should fail, no file should get written and no error output should be printed (the base implementation assumes the plugin does it) */ @@ -2824,8 +2824,8 @@ void AbstractImageConverterTest::convertLevels1DToFile() { const char data[4]{}; /* Remove previous file, if any */ - Utility::Directory::rm(filename); - CORRADE_VERIFY(!Utility::Directory::exists(filename)); + if(Utility::Directory::exists(filename)) + CORRADE_VERIFY(Utility::Directory::rm(filename)); CORRADE_VERIFY(converter.convertToFile({ /* Arbitrary dimensions should be fine */ @@ -2849,8 +2849,8 @@ void AbstractImageConverterTest::convertLevels2DToFile() { const char data[4]{}; /* Remove previous file, if any */ - Utility::Directory::rm(filename); - CORRADE_VERIFY(!Utility::Directory::exists(filename)); + if(Utility::Directory::exists(filename)) + CORRADE_VERIFY(Utility::Directory::rm(filename)); CORRADE_VERIFY(converter.convertToFile({ /* Arbitrary dimensions should be fine */ @@ -2874,8 +2874,8 @@ void AbstractImageConverterTest::convertLevels3DToFile() { const char data[4]{}; /* Remove previous file, if any */ - Utility::Directory::rm(filename); - CORRADE_VERIFY(!Utility::Directory::exists(filename)); + if(Utility::Directory::exists(filename)) + CORRADE_VERIFY(Utility::Directory::rm(filename)); CORRADE_VERIFY(converter.convertToFile({ /* Arbitrary dimensions should be fine */ @@ -2899,8 +2899,8 @@ void AbstractImageConverterTest::convertLevels1DToFileThroughData() { const char data[4]{}; /* Remove previous file, if any */ - Utility::Directory::rm(filename); - CORRADE_VERIFY(!Utility::Directory::exists(filename)); + if(Utility::Directory::exists(filename)) + CORRADE_VERIFY(Utility::Directory::rm(filename)); /* doConvertToFile() should call doConvertToData() */ CORRADE_VERIFY(converter.convertToFile({ @@ -2925,8 +2925,8 @@ void AbstractImageConverterTest::convertLevels2DToFileThroughData() { const char data[4]{}; /* Remove previous file, if any */ - Utility::Directory::rm(filename); - CORRADE_VERIFY(!Utility::Directory::exists(filename)); + if(Utility::Directory::exists(filename)) + CORRADE_VERIFY(Utility::Directory::rm(filename)); /* doConvertToFile() should call doConvertToData() */ CORRADE_VERIFY(converter.convertToFile({ @@ -2950,8 +2950,8 @@ void AbstractImageConverterTest::convertLevels3DToFileThroughData() { const char data[4]{}; /* Remove previous file, if any */ - Utility::Directory::rm(filename); - CORRADE_VERIFY(!Utility::Directory::exists(filename)); + if(Utility::Directory::exists(filename)) + CORRADE_VERIFY(Utility::Directory::rm(filename)); /* doConvertToFile() should call doConvertToData() */ CORRADE_VERIFY(converter.convertToFile({ @@ -2975,8 +2975,8 @@ void AbstractImageConverterTest::convertLevels1DToFileThroughDataFailed() { const char data[4]{}; /* Remove previous file, if any */ - Utility::Directory::rm(filename); - CORRADE_VERIFY(!Utility::Directory::exists(filename)); + if(Utility::Directory::exists(filename)) + CORRADE_VERIFY(Utility::Directory::rm(filename)); /* Function should fail, no file should get written and no error output should be printed (the base implementation assumes the plugin does it) */ @@ -3000,8 +3000,8 @@ void AbstractImageConverterTest::convertLevels2DToFileThroughDataFailed() { const char data[4]{}; /* Remove previous file, if any */ - Utility::Directory::rm(filename); - CORRADE_VERIFY(!Utility::Directory::exists(filename)); + if(Utility::Directory::exists(filename)) + CORRADE_VERIFY(Utility::Directory::rm(filename)); /* Function should fail, no file should get written and no error output should be printed (the base implementation assumes the plugin does it) */ @@ -3025,8 +3025,8 @@ void AbstractImageConverterTest::convertLevels3DToFileThroughDataFailed() { const char data[4]{}; /* Remove previous file, if any */ - Utility::Directory::rm(filename); - CORRADE_VERIFY(!Utility::Directory::exists(filename)); + if(Utility::Directory::exists(filename)) + CORRADE_VERIFY(Utility::Directory::rm(filename)); /* Function should fail, no file should get written and no error output should be printed (the base implementation assumes the plugin does it) */ @@ -3196,8 +3196,8 @@ void AbstractImageConverterTest::convertCompressedLevels1DToFile() { const char data[8]{}; /* Remove previous file, if any */ - Utility::Directory::rm(filename); - CORRADE_VERIFY(!Utility::Directory::exists(filename)); + if(Utility::Directory::exists(filename)) + CORRADE_VERIFY(Utility::Directory::rm(filename)); CORRADE_VERIFY(converter.convertToFile({ CompressedImageView1D{CompressedPixelFormat::Bc1RGBAUnorm, 0x0f, Containers::Array{64}}, @@ -3220,8 +3220,8 @@ void AbstractImageConverterTest::convertCompressedLevels2DToFile() { const char data[8]{}; /* Remove previous file, if any */ - Utility::Directory::rm(filename); - CORRADE_VERIFY(!Utility::Directory::exists(filename)); + if(Utility::Directory::exists(filename)) + CORRADE_VERIFY(Utility::Directory::rm(filename)); CORRADE_VERIFY(converter.convertToFile({ CompressedImageView2D{CompressedPixelFormat::Bc1RGBAUnorm, {0x0f, 0x0d}, Containers::Array{64}}, @@ -3244,8 +3244,8 @@ void AbstractImageConverterTest::convertCompressedLevels3DToFile() { const char data[8]{}; /* Remove previous file, if any */ - Utility::Directory::rm(filename); - CORRADE_VERIFY(!Utility::Directory::exists(filename)); + if(Utility::Directory::exists(filename)) + CORRADE_VERIFY(Utility::Directory::rm(filename)); CORRADE_VERIFY(converter.convertToFile({ CompressedImageView3D{CompressedPixelFormat::Bc1RGBAUnorm, {0x0f, 0x0d, 0x0e}, Containers::Array{64}}, @@ -3268,8 +3268,8 @@ void AbstractImageConverterTest::convertCompressedLevels1DToFileThroughData() { const char data[8]{}; /* Remove previous file, if any */ - Utility::Directory::rm(filename); - CORRADE_VERIFY(!Utility::Directory::exists(filename)); + if(Utility::Directory::exists(filename)) + CORRADE_VERIFY(Utility::Directory::rm(filename)); /* doConvertToFile() should call doConvertToData() */ CORRADE_VERIFY(converter.convertToFile({ @@ -3293,8 +3293,8 @@ void AbstractImageConverterTest::convertCompressedLevels2DToFileThroughData() { const char data[8]{}; /* Remove previous file, if any */ - Utility::Directory::rm(filename); - CORRADE_VERIFY(!Utility::Directory::exists(filename)); + if(Utility::Directory::exists(filename)) + CORRADE_VERIFY(Utility::Directory::rm(filename)); /* doConvertToFile() should call doConvertToData() */ CORRADE_VERIFY(converter.convertToFile({ @@ -3318,8 +3318,8 @@ void AbstractImageConverterTest::convertCompressedLevels3DToFileThroughData() { const char data[8]{}; /* Remove previous file, if any */ - Utility::Directory::rm(filename); - CORRADE_VERIFY(!Utility::Directory::exists(filename)); + if(Utility::Directory::exists(filename)) + CORRADE_VERIFY(Utility::Directory::rm(filename)); /* doConvertToFile() should call doConvertToData() */ CORRADE_VERIFY(converter.convertToFile({ @@ -3343,8 +3343,8 @@ void AbstractImageConverterTest::convertCompressedLevels1DToFileThroughDataFaile const char data[8]{}; /* Remove previous file, if any */ - Utility::Directory::rm(filename); - CORRADE_VERIFY(!Utility::Directory::exists(filename)); + if(Utility::Directory::exists(filename)) + CORRADE_VERIFY(Utility::Directory::rm(filename)); /* Function should fail, no file should get written and no error output should be printed (the base implementation assumes the plugin does it) */ @@ -3368,8 +3368,8 @@ void AbstractImageConverterTest::convertCompressedLevels2DToFileThroughDataFaile const char data[8]{}; /* Remove previous file, if any */ - Utility::Directory::rm(filename); - CORRADE_VERIFY(!Utility::Directory::exists(filename)); + if(Utility::Directory::exists(filename)) + CORRADE_VERIFY(Utility::Directory::rm(filename)); /* Function should fail, no file should get written and no error output should be printed (the base implementation assumes the plugin does it) */ @@ -3393,8 +3393,8 @@ void AbstractImageConverterTest::convertCompressedLevels3DToFileThroughDataFaile const char data[8]{}; /* Remove previous file, if any */ - Utility::Directory::rm(filename); - CORRADE_VERIFY(!Utility::Directory::exists(filename)); + if(Utility::Directory::exists(filename)) + CORRADE_VERIFY(Utility::Directory::rm(filename)); /* Function should fail, no file should get written and no error output should be printed (the base implementation assumes the plugin does it) */ @@ -3564,8 +3564,8 @@ void AbstractImageConverterTest::convert1DToFileThroughLevels() { const std::string filename = Utility::Directory::join(TRADE_TEST_OUTPUT_DIR, "image.out"); /* Remove previous file, if any */ - Utility::Directory::rm(filename); - CORRADE_VERIFY(!Utility::Directory::exists(filename)); + if(Utility::Directory::exists(filename)) + CORRADE_VERIFY(Utility::Directory::rm(filename)); CORRADE_VERIFY(converter.convertToFile(ImageView1D{PixelFormat::RGBA8Unorm, 0x0f, Containers::Array{0x0f*4}}, filename)); CORRADE_COMPARE_AS(filename, @@ -3584,8 +3584,8 @@ void AbstractImageConverterTest::convert2DToFileThroughLevels() { const std::string filename = Utility::Directory::join(TRADE_TEST_OUTPUT_DIR, "image.out"); /* Remove previous file, if any */ - Utility::Directory::rm(filename); - CORRADE_VERIFY(!Utility::Directory::exists(filename)); + if(Utility::Directory::exists(filename)) + CORRADE_VERIFY(Utility::Directory::rm(filename)); CORRADE_VERIFY(converter.convertToFile(ImageView2D{PixelFormat::RGBA8Unorm, {0x0f, 0x0d}, Containers::Array{0x0f*0x0d*4}}, filename)); CORRADE_COMPARE_AS(filename, @@ -3604,8 +3604,8 @@ void AbstractImageConverterTest::convert3DToFileThroughLevels() { const std::string filename = Utility::Directory::join(TRADE_TEST_OUTPUT_DIR, "image.out"); /* Remove previous file, if any */ - Utility::Directory::rm(filename); - CORRADE_VERIFY(!Utility::Directory::exists(filename)); + if(Utility::Directory::exists(filename)) + CORRADE_VERIFY(Utility::Directory::rm(filename)); CORRADE_VERIFY(converter.convertToFile(ImageView3D{PixelFormat::RGBA8Unorm, {0x0f, 0x0d, 0x0e}, Containers::Array{0x0f*0x0d*0x0e*4}}, filename)); CORRADE_COMPARE_AS(filename, @@ -3624,8 +3624,8 @@ void AbstractImageConverterTest::convertCompressed1DToFileThroughLevels() { const std::string filename = Utility::Directory::join(TRADE_TEST_OUTPUT_DIR, "image.out"); /* Remove previous file, if any */ - Utility::Directory::rm(filename); - CORRADE_VERIFY(!Utility::Directory::exists(filename)); + if(Utility::Directory::exists(filename)) + CORRADE_VERIFY(Utility::Directory::rm(filename)); CORRADE_VERIFY(converter.convertToFile(CompressedImageView1D{CompressedPixelFormat::Bc1RGBAUnorm, 0x0f, Containers::Array{64}}, filename)); CORRADE_COMPARE_AS(filename, @@ -3644,8 +3644,8 @@ void AbstractImageConverterTest::convertCompressed2DToFileThroughLevels() { const std::string filename = Utility::Directory::join(TRADE_TEST_OUTPUT_DIR, "image.out"); /* Remove previous file, if any */ - Utility::Directory::rm(filename); - CORRADE_VERIFY(!Utility::Directory::exists(filename)); + if(Utility::Directory::exists(filename)) + CORRADE_VERIFY(Utility::Directory::rm(filename)); CORRADE_VERIFY(converter.convertToFile(CompressedImageView2D{CompressedPixelFormat::Bc1RGBAUnorm, {0x0f, 0x0d}, Containers::Array{64}}, filename)); CORRADE_COMPARE_AS(filename, @@ -3664,8 +3664,8 @@ void AbstractImageConverterTest::convertCompressed3DToFileThroughLevels() { const std::string filename = Utility::Directory::join(TRADE_TEST_OUTPUT_DIR, "image.out"); /* Remove previous file, if any */ - Utility::Directory::rm(filename); - CORRADE_VERIFY(!Utility::Directory::exists(filename)); + if(Utility::Directory::exists(filename)) + CORRADE_VERIFY(Utility::Directory::rm(filename)); CORRADE_VERIFY(converter.convertToFile(CompressedImageView3D{CompressedPixelFormat::Bc1RGBAUnorm, {0x0f, 0x0d, 0x0e}, Containers::Array{64}}, filename)); CORRADE_COMPARE_AS(filename, diff --git a/src/Magnum/Trade/Test/AbstractSceneConverterTest.cpp b/src/Magnum/Trade/Test/AbstractSceneConverterTest.cpp index fca1250b1..62a838227 100644 --- a/src/Magnum/Trade/Test/AbstractSceneConverterTest.cpp +++ b/src/Magnum/Trade/Test/AbstractSceneConverterTest.cpp @@ -452,8 +452,8 @@ void AbstractSceneConverterTest::convertMeshToFile() { const std::string filename = Utility::Directory::join(TRADE_TEST_OUTPUT_DIR, "mesh.out"); /* Remove previous file, if any */ - Utility::Directory::rm(filename); - CORRADE_VERIFY(!Utility::Directory::exists(filename)); + if(Utility::Directory::exists(filename)) + CORRADE_VERIFY(Utility::Directory::rm(filename)); CORRADE_VERIFY(converter.convertToFile(MeshData{MeshPrimitive::Triangles, 0xef}, filename)); CORRADE_COMPARE_AS(filename, @@ -472,8 +472,8 @@ void AbstractSceneConverterTest::convertMeshToFileThroughData() { const std::string filename = Utility::Directory::join(TRADE_TEST_OUTPUT_DIR, "mesh.out"); /* Remove previous file, if any */ - Utility::Directory::rm(filename); - CORRADE_VERIFY(!Utility::Directory::exists(filename)); + if(Utility::Directory::exists(filename)) + CORRADE_VERIFY(Utility::Directory::rm(filename)); /* doConvertToFile() should call doConvertToData() */ CORRADE_VERIFY(converter.convertToFile(MeshData{MeshPrimitive::Triangles, 0xef}, filename)); @@ -493,8 +493,8 @@ void AbstractSceneConverterTest::convertMeshToFileThroughDataFailed() { const std::string filename = Utility::Directory::join(TRADE_TEST_OUTPUT_DIR, "mesh.out"); /* Remove previous file, if any */ - Utility::Directory::rm(filename); - CORRADE_VERIFY(!Utility::Directory::exists(filename)); + if(Utility::Directory::exists(filename)) + CORRADE_VERIFY(Utility::Directory::rm(filename)); /* Function should fail, no file should get written and no error output should be printed (the base implementation assumes the plugin does it) */ diff --git a/src/MagnumPlugins/AnyShaderConverter/Test/AnyConverterTest.cpp b/src/MagnumPlugins/AnyShaderConverter/Test/AnyConverterTest.cpp index bf1225712..b1881cda6 100644 --- a/src/MagnumPlugins/AnyShaderConverter/Test/AnyConverterTest.cpp +++ b/src/MagnumPlugins/AnyShaderConverter/Test/AnyConverterTest.cpp @@ -707,8 +707,8 @@ void AnyConverterTest::convertFileToFile() { const std::string inputFilename = Utility::Directory::join(ANYSHADERCONVERTER_TEST_DIR, "file.glsl"); const std::string outputFilename = Utility::Directory::join(ANYSHADERCONVERTER_TEST_OUTPUT_DIR, "file.spv"); - Utility::Directory::rm(outputFilename); - CORRADE_VERIFY(!Utility::Directory::exists(outputFilename)); + if(Utility::Directory::exists(outputFilename)) + CORRADE_VERIFY(Utility::Directory::rm(outputFilename)); /* Make it print a warning so we know it's doing something */ std::ostringstream out; @@ -936,8 +936,8 @@ void AnyConverterTest::convertFileToFilePropagatePreprocess() { const std::string inputFilename = Utility::Directory::join(ANYSHADERCONVERTER_TEST_DIR, "file.glsl"); const std::string outputFilename = Utility::Directory::join(ANYSHADERCONVERTER_TEST_OUTPUT_DIR, "file.spv"); - Utility::Directory::rm(outputFilename); - CORRADE_VERIFY(!Utility::Directory::exists(outputFilename)); + if(Utility::Directory::exists(outputFilename)) + CORRADE_VERIFY(Utility::Directory::rm(outputFilename)); /* Make it print a warning so we know it's doing something */ std::ostringstream out; diff --git a/src/MagnumPlugins/MagnumFontConverter/Test/MagnumFontConverterTest.cpp b/src/MagnumPlugins/MagnumFontConverter/Test/MagnumFontConverterTest.cpp index d7b63051f..1641f672b 100644 --- a/src/MagnumPlugins/MagnumFontConverter/Test/MagnumFontConverterTest.cpp +++ b/src/MagnumPlugins/MagnumFontConverter/Test/MagnumFontConverterTest.cpp @@ -76,9 +76,13 @@ MagnumFontConverterTest::MagnumFontConverterTest() { } void MagnumFontConverterTest::exportFont() { + std::string confFilename = Utility::Directory::join(MAGNUMFONTCONVERTER_TEST_WRITE_DIR, "font.conf"); + std::string tgaFilename = Utility::Directory::join(MAGNUMFONTCONVERTER_TEST_WRITE_DIR, "font.tga"); /* Remove previously created files */ - Utility::Directory::rm(Utility::Directory::join(MAGNUMFONTCONVERTER_TEST_WRITE_DIR, "font.conf")); - Utility::Directory::rm(Utility::Directory::join(MAGNUMFONTCONVERTER_TEST_WRITE_DIR, "font.tga")); + if(Utility::Directory::exists(confFilename)) + CORRADE_VERIFY(Utility::Directory::rm(confFilename)); + if(Utility::Directory::exists(tgaFilename)) + CORRADE_VERIFY(Utility::Directory::rm(tgaFilename)); /* Fake font with fake cache */ class FakeFont: public Text::AbstractFont { @@ -136,7 +140,7 @@ void MagnumFontConverterTest::exportFont() { CORRADE_VERIFY(converter->exportFontToFile(font, cache, Utility::Directory::join(MAGNUMFONTCONVERTER_TEST_WRITE_DIR, "font"), "Wave")); /* Verify font parameters */ - CORRADE_COMPARE_AS(Utility::Directory::join(MAGNUMFONTCONVERTER_TEST_WRITE_DIR, "font.conf"), + CORRADE_COMPARE_AS(confFilename, Utility::Directory::join(MAGNUMFONT_TEST_DIR, "font.conf"), TestSuite::Compare::File); @@ -146,7 +150,7 @@ void MagnumFontConverterTest::exportFont() { /* Verify font image, no need to test image contents, as the image is garbage anyway */ Containers::Pointer importer = _importerManager.instantiate("TgaImporter"); - CORRADE_VERIFY(importer->openFile(Utility::Directory::join(MAGNUMFONTCONVERTER_TEST_WRITE_DIR, "font.tga"))); + CORRADE_VERIFY(importer->openFile(tgaFilename)); Containers::Optional image = importer->image2D(0); CORRADE_VERIFY(image); CORRADE_COMPARE(image->size(), Vector2i(256));