This is an automated email from the ASF dual-hosted git repository. aboda pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git
commit 589db71624b7f90f27e80fe3aa40e056a22c6374 Author: Adam Markovics <[email protected]> AuthorDate: Mon Jul 6 11:08:34 2020 +0200 MINIFICPP-1276 - CAPITests should clean up the temporary files it creates Signed-off-by: Arpad Boda <[email protected]> This closes #830 --- nanofi/include/api/nanofi.h | 6 +++++- nanofi/src/api/nanofi.cpp | 4 ++-- nanofi/tests/CAPITests.cpp | 14 +++----------- 3 files changed, 10 insertions(+), 14 deletions(-) diff --git a/nanofi/include/api/nanofi.h b/nanofi/include/api/nanofi.h index f401073..bec0f83 100644 --- a/nanofi/include/api/nanofi.h +++ b/nanofi/include/api/nanofi.h @@ -68,13 +68,17 @@ void set_terminate_callback(void (*terminate_callback)()); * ################################################################## */ +nifi_instance *create_instance_repo(const char *url, nifi_port *port, const char* const repo_type); + /** * Creates a new MiNiFi instance * @param url remote URL the instance connects to * @param port remote port the instance connects to * @return pointer to the new instance **/ -nifi_instance *create_instance(const char *url, nifi_port *port); +static nifi_instance *create_instance(const char *url, nifi_port *port){ + return create_instance_repo(url, port, "filesystemrepository"); +} /** * Initialize remote connection of instance for transfers diff --git a/nanofi/src/api/nanofi.cpp b/nanofi/src/api/nanofi.cpp index 29944bb..616398c 100644 --- a/nanofi/src/api/nanofi.cpp +++ b/nanofi/src/api/nanofi.cpp @@ -108,7 +108,7 @@ class DirectoryConfiguration { * @Deprecated for API version 0.2 in favor of the following prototype * nifi_instance *create_instance(nifi_port const *port) { */ -nifi_instance *create_instance(const char *url, nifi_port *port) { +nifi_instance *create_instance_repo(const char *url, nifi_port *port, const char* const repo_type) { // make sure that we have a thread safe way of initializing the content directory DirectoryConfiguration::initialize(); @@ -118,7 +118,7 @@ nifi_instance *create_instance(const char *url, nifi_port *port) { * This API will gradually move away from C++, hence malloc is used for nifi_instance * Since minifi::Instance is currently being used, then we need to use new in that case. */ - instance->instance_ptr = new minifi::Instance(url, port->port_id, "filesystemrepository"); + instance->instance_ptr = new minifi::Instance(url, port->port_id, repo_type); NULL_CHECK(nullptr, instance->instance_ptr); diff --git a/nanofi/tests/CAPITests.cpp b/nanofi/tests/CAPITests.cpp index 4112155..b130c16 100644 --- a/nanofi/tests/CAPITests.cpp +++ b/nanofi/tests/CAPITests.cpp @@ -15,29 +15,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include <sys/stat.h> #include <utility> -#include <memory> #include <string> -#include <vector> -#include <set> #include <fstream> - #include "utils/file/FileUtils.h" #include "TestBase.h" - -#include <chrono> -#include <thread> #include "api/nanofi.h" -std::string test_file_content = "C API raNdOMcaSe test d4t4 th1s is!"; -std::string test_file_name = "tstFile.ext"; +const std::string test_file_content = "C API raNdOMcaSe test d4t4 th1s is!"; +const std::string test_file_name = "tstFile.ext"; static nifi_instance *create_instance_obj(const char *name = "random_instance") { nifi_port port; char port_str[] = "12345"; port.port_id = port_str; - return create_instance("random_instance", &port); + return create_instance_repo("random_instance", &port, "volatilerepository"); } static int failure_count = 0;
