martinzink commented on code in PR #1634: URL: https://github.com/apache/nifi-minifi-cpp/pull/1634#discussion_r1320124320
########## extensions/smb/tests/utils/MockSmbConnectionControllerService.h: ########## @@ -0,0 +1,105 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#pragma once +#include <utility> +#include <string> +#include "../../SmbConnectionControllerService.h" +#include "core/controller/ControllerService.h" +#include "utils/OsUtils.h" +#include "ListSmb.h" +#include "Catch.h" + +using namespace std::literals::chrono_literals; + +namespace org::apache::nifi::minifi::extensions::smb::test { + +struct ListSmbExpectedAttributes { + std::string expected_filename; + std::string expected_path; + std::string expected_service_location; + std::chrono::system_clock::time_point expected_last_modified_time; + std::chrono::system_clock::time_point expected_creation_time; + std::chrono::system_clock::time_point expected_last_access_time; + std::string expected_size; + + void checkAttributes(core::FlowFile& flow_file) { + CHECK(flow_file.getAttribute(ListSmb::Filename.name) == expected_filename); + CHECK(flow_file.getAttribute(ListSmb::Path.name) == expected_path); + CHECK(flow_file.getAttribute(ListSmb::ServiceLocation.name) == expected_service_location); + auto last_modified_time_from_attribute = utils::timeutils::parseDateTimeStr(*flow_file.getAttribute(ListSmb::LastModifiedTime.name)); + auto creation_time_from_attribute = utils::timeutils::parseDateTimeStr(*flow_file.getAttribute(ListSmb::CreationTime.name)); + auto last_access_time_from_attribute = utils::timeutils::parseDateTimeStr(*flow_file.getAttribute(ListSmb::LastAccessTime.name)); + + CHECK(std::chrono::abs(expected_last_modified_time - *last_modified_time_from_attribute) < 1s); + CHECK(std::chrono::abs(expected_creation_time - *creation_time_from_attribute) < 1s); + CHECK(std::chrono::abs(expected_last_access_time - *last_access_time_from_attribute) < 1s); + CHECK(flow_file.getAttribute(ListSmb::Size.name) == expected_size); + } +}; + +class MockSmbConnectionControllerService : public SmbConnectionControllerService { + public: + using SmbConnectionControllerService::SmbConnectionControllerService; + EXTENSIONAPI static constexpr bool SupportsDynamicProperties = false; + ADD_COMMON_VIRTUAL_FUNCTIONS_FOR_CONTROLLER_SERVICES + + void onEnable() override {} + void notifyStop() override {} + + std::error_code validateConnection() override { + if (server_path_) + return {}; + return std::make_error_code(std::errc::not_connected); + } + std::filesystem::path getPath() const override { + gsl_Expects(server_path_); + return *server_path_; + } + + void setPath(std::filesystem::path path) { server_path_ = std::move(path);} + + nonstd::expected<ListSmbExpectedAttributes, std::error_code> addFile(const std::filesystem::path& relative_path, + std::string_view content, + std::chrono::file_clock::duration age) { + auto full_path = getPath() / relative_path; + std::filesystem::create_directories(full_path.parent_path()); + { + std::ofstream out_file(full_path, std::ios::binary | std::ios::out); + if (!out_file.is_open()) + return nonstd::make_unexpected(std::make_error_code(std::errc::bad_file_descriptor)); + out_file << content; + } + auto last_write_time_error = utils::file::set_last_write_time(full_path, std::chrono::file_clock::now() - age); + if (!last_write_time_error) + return nonstd::make_unexpected(std::make_error_code(std::errc::bad_file_descriptor)); + auto current_time = std::chrono::system_clock::now(); Review Comment: I had to add a time_point cast but otherwise great idea 👍 fixed it in https://github.com/apache/nifi-minifi-cpp/pull/1634/commits/3b513dcd2120d5e5ab361e8230060721450c6551#diff-20303d203ffeccc8c03a89411b15298f8c150a8f5b51d3575b2959f60e15dbcaR88-R89 ########## extensions/smb/tests/utils/MockSmbConnectionControllerService.h: ########## @@ -0,0 +1,105 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#pragma once +#include <utility> +#include <string> +#include "../../SmbConnectionControllerService.h" +#include "core/controller/ControllerService.h" +#include "utils/OsUtils.h" +#include "ListSmb.h" +#include "Catch.h" + +using namespace std::literals::chrono_literals; + +namespace org::apache::nifi::minifi::extensions::smb::test { + +struct ListSmbExpectedAttributes { + std::string expected_filename; + std::string expected_path; + std::string expected_service_location; + std::chrono::system_clock::time_point expected_last_modified_time; + std::chrono::system_clock::time_point expected_creation_time; + std::chrono::system_clock::time_point expected_last_access_time; + std::string expected_size; + + void checkAttributes(core::FlowFile& flow_file) { + CHECK(flow_file.getAttribute(ListSmb::Filename.name) == expected_filename); + CHECK(flow_file.getAttribute(ListSmb::Path.name) == expected_path); + CHECK(flow_file.getAttribute(ListSmb::ServiceLocation.name) == expected_service_location); + auto last_modified_time_from_attribute = utils::timeutils::parseDateTimeStr(*flow_file.getAttribute(ListSmb::LastModifiedTime.name)); + auto creation_time_from_attribute = utils::timeutils::parseDateTimeStr(*flow_file.getAttribute(ListSmb::CreationTime.name)); + auto last_access_time_from_attribute = utils::timeutils::parseDateTimeStr(*flow_file.getAttribute(ListSmb::LastAccessTime.name)); + + CHECK(std::chrono::abs(expected_last_modified_time - *last_modified_time_from_attribute) < 1s); + CHECK(std::chrono::abs(expected_creation_time - *creation_time_from_attribute) < 1s); + CHECK(std::chrono::abs(expected_last_access_time - *last_access_time_from_attribute) < 1s); + CHECK(flow_file.getAttribute(ListSmb::Size.name) == expected_size); + } +}; + +class MockSmbConnectionControllerService : public SmbConnectionControllerService { + public: + using SmbConnectionControllerService::SmbConnectionControllerService; + EXTENSIONAPI static constexpr bool SupportsDynamicProperties = false; + ADD_COMMON_VIRTUAL_FUNCTIONS_FOR_CONTROLLER_SERVICES + + void onEnable() override {} + void notifyStop() override {} + + std::error_code validateConnection() override { + if (server_path_) + return {}; + return std::make_error_code(std::errc::not_connected); + } + std::filesystem::path getPath() const override { + gsl_Expects(server_path_); + return *server_path_; + } + + void setPath(std::filesystem::path path) { server_path_ = std::move(path);} + + nonstd::expected<ListSmbExpectedAttributes, std::error_code> addFile(const std::filesystem::path& relative_path, + std::string_view content, + std::chrono::file_clock::duration age) { + auto full_path = getPath() / relative_path; + std::filesystem::create_directories(full_path.parent_path()); + { + std::ofstream out_file(full_path, std::ios::binary | std::ios::out); + if (!out_file.is_open()) + return nonstd::make_unexpected(std::make_error_code(std::errc::bad_file_descriptor)); + out_file << content; + } + auto last_write_time_error = utils::file::set_last_write_time(full_path, std::chrono::file_clock::now() - age); + if (!last_write_time_error) + return nonstd::make_unexpected(std::make_error_code(std::errc::bad_file_descriptor)); + auto current_time = std::chrono::system_clock::now(); Review Comment: I had to add a time_point cast but otherwise great idea 👍 fixed it in https://github.com/apache/nifi-minifi-cpp/pull/1634/commits/3b513dcd2120d5e5ab361e8230060721450c6551#diff-20303d203ffeccc8c03a89411b15298f8c150a8f5b51d3575b2959f60e15dbcaR88-R89 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
