diff options
Diffstat (limited to 'test/std')
6 files changed, 32 insertions, 21 deletions
diff --git a/test/std/experimental/filesystem/class.directory_iterator/directory_iterator.members/ctor.pass.cpp b/test/std/experimental/filesystem/class.directory_iterator/directory_iterator.members/ctor.pass.cpp index 830e81231..4fd60887b 100644 --- a/test/std/experimental/filesystem/class.directory_iterator/directory_iterator.members/ctor.pass.cpp +++ b/test/std/experimental/filesystem/class.directory_iterator/directory_iterator.members/ctor.pass.cpp @@ -15,8 +15,8 @@ // explicit directory_iterator(const path& p); // directory_iterator(const path& p, directory_options options); -// directory_iterator(const path& p, error_code& ec) noexcept; -// directory_iterator(const path& p, directory_options options, error_code& ec) noexcept; +// directory_iterator(const path& p, error_code& ec); +// directory_iterator(const path& p, directory_options options, error_code& ec); #include <experimental/filesystem> #include <type_traits> @@ -40,15 +40,22 @@ TEST_CASE(test_constructor_signatures) static_assert(std::is_constructible<D, path>::value, ""); static_assert(!std::is_nothrow_constructible<D, path>::value, ""); - // directory_iterator(path const&, error_code&) noexcept - static_assert(std::is_nothrow_constructible<D, path, std::error_code&>::value, ""); + // directory_iterator(path const&, error_code&) + static_assert(std::is_constructible<D, path, + std::error_code&>::value, ""); + static_assert(!std::is_nothrow_constructible<D, path, + std::error_code&>::value, ""); // directory_iterator(path const&, directory_options); static_assert(std::is_constructible<D, path, directory_options>::value, ""); static_assert(!std::is_nothrow_constructible<D, path, directory_options>::value, ""); - // directory_iterator(path const&, directory_options, error_code&) noexcept - static_assert(std::is_nothrow_constructible<D, path, directory_options, std::error_code&>::value, ""); + // directory_iterator(path const&, directory_options, error_code&) + static_assert(std::is_constructible<D, path, directory_options, + std::error_code&>::value, ""); + static_assert(!std::is_nothrow_constructible<D, path, directory_options, + std::error_code&>::value, ""); + } TEST_CASE(test_construction_from_bad_path) diff --git a/test/std/experimental/filesystem/class.directory_iterator/directory_iterator.members/increment.pass.cpp b/test/std/experimental/filesystem/class.directory_iterator/directory_iterator.members/increment.pass.cpp index 589b4eca7..8d888717b 100644 --- a/test/std/experimental/filesystem/class.directory_iterator/directory_iterator.members/increment.pass.cpp +++ b/test/std/experimental/filesystem/class.directory_iterator/directory_iterator.members/increment.pass.cpp @@ -14,7 +14,7 @@ // class directory_iterator // directory_iterator& operator++(); -// directory_iterator& increment(error_code& ec) noexcept; +// directory_iterator& increment(error_code& ec); #include <experimental/filesystem> #include <type_traits> @@ -40,7 +40,7 @@ TEST_CASE(test_increment_signatures) ASSERT_NOT_NOEXCEPT(++d); ASSERT_SAME_TYPE(decltype(d.increment(ec)), directory_iterator&); - ASSERT_NOEXCEPT(d.increment(ec)); + ASSERT_NOT_NOEXCEPT(d.increment(ec)); } TEST_CASE(test_prefix_increment) diff --git a/test/std/experimental/filesystem/class.rec.dir.itr/rec.dir.itr.members/ctor.pass.cpp b/test/std/experimental/filesystem/class.rec.dir.itr/rec.dir.itr.members/ctor.pass.cpp index 8f6009d39..1469dae04 100644 --- a/test/std/experimental/filesystem/class.rec.dir.itr/rec.dir.itr.members/ctor.pass.cpp +++ b/test/std/experimental/filesystem/class.rec.dir.itr/rec.dir.itr.members/ctor.pass.cpp @@ -16,8 +16,8 @@ // // explicit recursive_directory_iterator(const path& p); // recursive_directory_iterator(const path& p, directory_options options); -// recursive_directory_iterator(const path& p, error_code& ec) noexcept; -// recursive_directory_iterator(const path& p, directory_options options, error_code& ec) noexcept; +// recursive_directory_iterator(const path& p, error_code& ec); +// recursive_directory_iterator(const path& p, directory_options options, error_code& ec); #include <experimental/filesystem> @@ -44,15 +44,19 @@ TEST_CASE(test_constructor_signatures) static_assert(std::is_constructible<D, path>::value, ""); static_assert(!std::is_nothrow_constructible<D, path>::value, ""); - // directory_iterator(path const&, error_code&) noexcept - static_assert(std::is_nothrow_constructible<D, path, std::error_code&>::value, ""); + // directory_iterator(path const&, error_code&) + static_assert(std::is_constructible<D, path, + std::error_code&>::value, ""); + static_assert(!std::is_nothrow_constructible<D, path, + std::error_code&>::value, ""); // directory_iterator(path const&, directory_options); static_assert(std::is_constructible<D, path, directory_options>::value, ""); static_assert(!std::is_nothrow_constructible<D, path, directory_options>::value, ""); - // directory_iterator(path const&, directory_options, error_code&) noexcept - static_assert(std::is_nothrow_constructible<D, path, directory_options, std::error_code&>::value, ""); + // directory_iterator(path const&, directory_options, error_code&) + static_assert(std::is_constructible<D, path, directory_options, std::error_code&>::value, ""); + static_assert(!std::is_nothrow_constructible<D, path, directory_options, std::error_code&>::value, ""); } TEST_CASE(test_construction_from_bad_path) diff --git a/test/std/experimental/filesystem/class.rec.dir.itr/rec.dir.itr.members/increment.pass.cpp b/test/std/experimental/filesystem/class.rec.dir.itr/rec.dir.itr.members/increment.pass.cpp index e91bd50f2..ea81ee253 100644 --- a/test/std/experimental/filesystem/class.rec.dir.itr/rec.dir.itr.members/increment.pass.cpp +++ b/test/std/experimental/filesystem/class.rec.dir.itr/rec.dir.itr.members/increment.pass.cpp @@ -40,7 +40,7 @@ TEST_CASE(test_increment_signatures) ASSERT_NOT_NOEXCEPT(++d); ASSERT_SAME_TYPE(decltype(d.increment(ec)), recursive_directory_iterator&); - ASSERT_NOEXCEPT(d.increment(ec)); + ASSERT_NOT_NOEXCEPT(d.increment(ec)); } TEST_CASE(test_prefix_increment) diff --git a/test/std/experimental/filesystem/fs.op.funcs/fs.op.copy/copy.pass.cpp b/test/std/experimental/filesystem/fs.op.funcs/fs.op.copy/copy.pass.cpp index c9b42b359..8f44e0d5a 100644 --- a/test/std/experimental/filesystem/fs.op.funcs/fs.op.copy/copy.pass.cpp +++ b/test/std/experimental/filesystem/fs.op.funcs/fs.op.copy/copy.pass.cpp @@ -12,10 +12,10 @@ // <experimental/filesystem> // void copy(const path& from, const path& to); -// void copy(const path& from, const path& to, error_code& ec) noexcept; +// void copy(const path& from, const path& to, error_code& ec); // void copy(const path& from, const path& to, copy_options options); // void copy(const path& from, const path& to, copy_options options, -// error_code& ec) noexcept; +// error_code& ec); #include <experimental/filesystem> #include <type_traits> @@ -39,9 +39,9 @@ TEST_CASE(signature_test) std::error_code ec; ((void)ec); const copy_options opts{}; ((void)opts); ASSERT_NOT_NOEXCEPT(fs::copy(p, p)); - ASSERT_NOEXCEPT(fs::copy(p, p, ec)); + ASSERT_NOT_NOEXCEPT(fs::copy(p, p, ec)); ASSERT_NOT_NOEXCEPT(copy(p, p, opts)); - ASSERT_NOEXCEPT(copy(p, p, opts, ec)); + ASSERT_NOT_NOEXCEPT(copy(p, p, opts, ec)); } // There are 4 cases is the proposal for absolute path. diff --git a/test/std/experimental/filesystem/fs.op.funcs/fs.op.is_empty/is_empty.pass.cpp b/test/std/experimental/filesystem/fs.op.funcs/fs.op.is_empty/is_empty.pass.cpp index bc62086c2..2da163c33 100644 --- a/test/std/experimental/filesystem/fs.op.funcs/fs.op.is_empty/is_empty.pass.cpp +++ b/test/std/experimental/filesystem/fs.op.funcs/fs.op.is_empty/is_empty.pass.cpp @@ -12,7 +12,7 @@ // <experimental/filesystem> // bool is_empty(path const& p); -// bool is_empty(path const& p, std::error_code& ec) noexcept; +// bool is_empty(path const& p, std::error_code& ec); #include <experimental/filesystem> #include <type_traits> @@ -30,7 +30,7 @@ TEST_CASE(signature_test) { const path p; ((void)p); std::error_code ec; ((void)ec); - ASSERT_NOEXCEPT(is_empty(p, ec)); + ASSERT_NOT_NOEXCEPT(is_empty(p, ec)); ASSERT_NOT_NOEXCEPT(is_empty(p)); } |