diff options
author | Niall Douglas (s [underscore] sourceforge {at} nedprod [dot] com) <spamtrap@nedprod.com> | 2018-08-24 19:08:42 +0300 |
---|---|---|
committer | Niall Douglas (s [underscore] sourceforge {at} nedprod [dot] com) <spamtrap@nedprod.com> | 2018-08-24 19:08:42 +0300 |
commit | 3ce0b8439d2cf850d06bc9b046ffb56648875349 (patch) | |
tree | 1e6a6ec0e8ef2b7b5244e64c8b8235cd08042848 /test/tests/directory_handle_create_close | |
parent | 5f82c897584065164c593ea0ca3a602ac651198c (diff) |
Previous commit wasn't complete.
Diffstat (limited to 'test/tests/directory_handle_create_close')
-rw-r--r-- | test/tests/directory_handle_create_close/kernel_directory_handle.cpp.hpp | 8 | ||||
-rw-r--r-- | test/tests/directory_handle_create_close/runner.cpp | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/test/tests/directory_handle_create_close/kernel_directory_handle.cpp.hpp b/test/tests/directory_handle_create_close/kernel_directory_handle.cpp.hpp index 46d66536..12f47ad7 100644 --- a/test/tests/directory_handle_create_close/kernel_directory_handle.cpp.hpp +++ b/test/tests/directory_handle_create_close/kernel_directory_handle.cpp.hpp @@ -27,20 +27,20 @@ Distributed under the Boost Software License, Version 1.0. namespace directory_handle_create_close { LLFIO_TEST_KERNEL_DECL LLFIO_V2_NAMESPACE::result<LLFIO_V2_NAMESPACE::directory_handle> test_kernel_directory_handle_absolute(LLFIO_V2_NAMESPACE::directory_handle::mode m, LLFIO_V2_NAMESPACE::directory_handle::creation c, LLFIO_V2_NAMESPACE::directory_handle::flag f, - LLFIO_V2_NAMESPACE::directory_handle::buffers_type *entries, LLFIO_V2_NAMESPACE::result<LLFIO_V2_NAMESPACE::directory_handle::enumerate_info> *info) + LLFIO_V2_NAMESPACE::directory_handle::buffers_type *entries, LLFIO_V2_NAMESPACE::result<LLFIO_V2_NAMESPACE::directory_handle::buffers_type> *info) { auto h = LLFIO_V2_NAMESPACE::directory_handle::directory({}, "testdir", m, c, LLFIO_V2_NAMESPACE::directory_handle::caching::all, f); if(h) { // git needs a file in a directory to create it, so any directory created needs an empty file called pin.txt (void) LLFIO_V2_NAMESPACE::file_handle::file(h.value(), "pin.txt", LLFIO_V2_NAMESPACE::file_handle::mode::write, LLFIO_V2_NAMESPACE::file_handle::creation::if_needed); - *info = LLFIO_V2_NAMESPACE::result<LLFIO_V2_NAMESPACE::directory_handle::enumerate_info>(h.value().enumerate(std::move(*entries))); + *info = LLFIO_V2_NAMESPACE::result<LLFIO_V2_NAMESPACE::directory_handle::buffers_type>(h.value().read(std::move(*entries))); h.value().close().value(); } return h; } LLFIO_TEST_KERNEL_DECL LLFIO_V2_NAMESPACE::result<LLFIO_V2_NAMESPACE::directory_handle> test_kernel_directory_handle_relative(LLFIO_V2_NAMESPACE::directory_handle::mode m, LLFIO_V2_NAMESPACE::directory_handle::creation c, LLFIO_V2_NAMESPACE::directory_handle::flag f, - LLFIO_V2_NAMESPACE::directory_handle::buffers_type *entries, LLFIO_V2_NAMESPACE::result<LLFIO_V2_NAMESPACE::directory_handle::enumerate_info> *info) + LLFIO_V2_NAMESPACE::directory_handle::buffers_type *entries, LLFIO_V2_NAMESPACE::result<LLFIO_V2_NAMESPACE::directory_handle::buffers_type> *info) { OUTCOME_TRY(b, LLFIO_V2_NAMESPACE::path_handle::path(".")); auto h = LLFIO_V2_NAMESPACE::directory_handle::directory(b, "testdir", m, c, LLFIO_V2_NAMESPACE::directory_handle::caching::all, f); @@ -48,7 +48,7 @@ namespace directory_handle_create_close { // git needs a file in a directory to create it, so any directory created needs an empty file called pin.txt (void) LLFIO_V2_NAMESPACE::file_handle::file(h.value(), "pin.txt", LLFIO_V2_NAMESPACE::file_handle::mode::write, LLFIO_V2_NAMESPACE::file_handle::creation::if_needed); - *info = LLFIO_V2_NAMESPACE::result<LLFIO_V2_NAMESPACE::directory_handle::enumerate_info>(h.value().enumerate(std::move(*entries))); + *info = LLFIO_V2_NAMESPACE::result<LLFIO_V2_NAMESPACE::directory_handle::buffers_type>(h.value().read(std::move(*entries))); h.value().close().value(); } b.close().value(); diff --git a/test/tests/directory_handle_create_close/runner.cpp b/test/tests/directory_handle_create_close/runner.cpp index 0001df01..758f485d 100644 --- a/test/tests/directory_handle_create_close/runner.cpp +++ b/test/tests/directory_handle_create_close/runner.cpp @@ -37,7 +37,7 @@ template <class U> inline void directory_handle_create_close_creation(U &&f) // clang-format off static typename directory_handle::buffer_type _entries[5]; static typename directory_handle::buffers_type entries(_entries); - static result<typename directory_handle::enumerate_info> info(typename result<typename directory_handle::enumerate_info>::error_type{}); + static result<typename directory_handle::buffers_type> info(typename result<typename directory_handle::buffers_type>::error_type{}); static const auto permuter(mt_permute_parameters< result<void>, parameters< @@ -45,7 +45,7 @@ template <class U> inline void directory_handle_create_close_creation(U &&f) typename directory_handle::creation, typename directory_handle::flag, typename directory_handle::buffers_type *, - result<typename directory_handle::enumerate_info> * + result<typename directory_handle::buffers_type> * >, precondition::filesystem_setup_parameters, postcondition::filesystem_comparison_structure_parameters, @@ -87,7 +87,7 @@ template <class U> inline void directory_handle_create_close_creation(U &&f) i = typename directory_handle::buffer_type(); } entries = typename directory_handle::buffers_type(_entries); - info = typename result<typename directory_handle::enumerate_info>::error_type(); + info = typename result<typename directory_handle::buffers_type>::error_type(); return std::make_tuple(std::ref(permuter), std::ref(testreturn), idx, std::ref(enumeration_should_be)); }, [&](auto /*tuplestate*/) { |