diff options
Diffstat (limited to 'unittest')
-rw-r--r-- | unittest/TestUtil.cpp | 7 | ||||
-rw-r--r-- | unittest/test_Config.cpp | 7 | ||||
-rw-r--r-- | unittest/test_Stat.cpp | 3 | ||||
-rw-r--r-- | unittest/test_Util.cpp | 3 |
4 files changed, 12 insertions, 8 deletions
diff --git a/unittest/TestUtil.cpp b/unittest/TestUtil.cpp index 615f8bcb..d97ddba9 100644 --- a/unittest/TestUtil.cpp +++ b/unittest/TestUtil.cpp @@ -19,9 +19,9 @@ #include "TestUtil.hpp" #include "../src/Util.hpp" -#include "../src/exceptions.hpp" #include "../src/fmtmacros.hpp" +#include <core/exceptions.hpp> #include <core/wincompat.hpp> #ifdef HAVE_UNISTD_H @@ -35,7 +35,7 @@ size_t TestContext::m_subdir_counter = 0; TestContext::TestContext() : m_test_dir(Util::get_actual_cwd()) { if (Util::base_name(Util::dir_name(m_test_dir)) != "testdir") { - throw Error("TestContext instantiated outside test directory"); + throw core::Error("TestContext instantiated outside test directory"); } ++m_subdir_counter; std::string subtest_dir = FMT("{}/test_{}", m_test_dir, m_subdir_counter); @@ -56,7 +56,8 @@ void check_chdir(const std::string& dir) { if (chdir(dir.c_str()) != 0) { - throw Error("failed to change directory to {}: {}", dir, strerror(errno)); + throw core::Error( + "failed to change directory to {}: {}", dir, strerror(errno)); } } diff --git a/unittest/test_Config.cpp b/unittest/test_Config.cpp index 7bce9029..010f2256 100644 --- a/unittest/test_Config.cpp +++ b/unittest/test_Config.cpp @@ -19,10 +19,11 @@ #include "../src/Config.hpp" #include "../src/Sloppiness.hpp" #include "../src/Util.hpp" -#include "../src/exceptions.hpp" #include "../src/fmtmacros.hpp" #include "TestUtil.hpp" +#include <core/exceptions.hpp> + #include "third_party/doctest.h" #include "third_party/fmt/core.h" @@ -310,7 +311,7 @@ TEST_CASE("Config::set_value_in_file") try { Config::set_value_in_file("ccache.conf", "foo", "bar"); CHECK(false); - } catch (const Error& e) { + } catch (const core::Error& e) { CHECK(std::string(e.what()) == "unknown configuration option \"foo\""); } @@ -351,7 +352,7 @@ TEST_CASE("Config::get_string_value") try { config.get_string_value("foo"); CHECK(false); - } catch (const Error& e) { + } catch (const core::Error& e) { CHECK(std::string(e.what()) == "unknown configuration option \"foo\""); } } diff --git a/unittest/test_Stat.cpp b/unittest/test_Stat.cpp index c6767329..9253f685 100644 --- a/unittest/test_Stat.cpp +++ b/unittest/test_Stat.cpp @@ -21,6 +21,7 @@ #include "../src/Util.hpp" #include "TestUtil.hpp" +#include <core/exceptions.hpp> #include <core/wincompat.hpp> #include "third_party/doctest.h" @@ -620,7 +621,7 @@ TEST_CASE("Win32 No Sharing") Finalizer cleanup([&] { CloseHandle(handle); }); // Sanity check we can't open the file for read/write access. - REQUIRE_THROWS_AS(Util::read_file("file"), const Error&); + REQUIRE_THROWS_AS(Util::read_file("file"), const core::Error&); SUBCASE("stat file no sharing") { diff --git a/unittest/test_Util.cpp b/unittest/test_Util.cpp index ae57fd80..bb0dc6a1 100644 --- a/unittest/test_Util.cpp +++ b/unittest/test_Util.cpp @@ -22,6 +22,7 @@ #include "../src/fmtmacros.hpp" #include "TestUtil.hpp" +#include <core/exceptions.hpp> #include <core/wincompat.hpp> #include "third_party/doctest.h" @@ -450,7 +451,7 @@ TEST_CASE("Util::hard_link") SUBCASE("Link nonexistent file") { - CHECK_THROWS_AS(Util::hard_link("old", "new"), Error); + CHECK_THROWS_AS(Util::hard_link("old", "new"), core::Error); } } |