MINIFICPP-1152 - Remove duplicated tailfile integration test code
Signed-off-by: Arpad Boda <aboda@apache.org>
Approved by szaszm on GH
This closes #730
diff --git a/extensions/standard-processors/tests/CMakeLists.txt b/extensions/standard-processors/tests/CMakeLists.txt
index 8021279..bcc228d 100644
--- a/extensions/standard-processors/tests/CMakeLists.txt
+++ b/extensions/standard-processors/tests/CMakeLists.txt
@@ -76,5 +76,5 @@
add_test(NAME TailFileTest COMMAND TailFileTest "${TEST_RESOURCES}/TestTailFile.yml" "${TEST_RESOURCES}/")
-add_test(NAME TailFileCronTest COMMAND TailFileCronTest "${TEST_RESOURCES}/TestTailFileCron.yml" "${TEST_RESOURCES}/")
+add_test(NAME TailFileCronTest COMMAND TailFileTest "${TEST_RESOURCES}/TestTailFileCron.yml" "${TEST_RESOURCES}/")
diff --git a/extensions/standard-processors/tests/integration/TailFileCronTest.cpp b/extensions/standard-processors/tests/integration/TailFileCronTest.cpp
deleted file mode 100644
index a3b2a57..0000000
--- a/extensions/standard-processors/tests/integration/TailFileCronTest.cpp
+++ /dev/null
@@ -1,106 +0,0 @@
-/**
- *
- * 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.
- */
-
-#include <sys/stat.h>
-#include <chrono>
-#include <thread>
-#undef NDEBUG
-#include <cassert>
-#include <utility>
-#include <fstream>
-#include <memory>
-#include <string>
-#include <type_traits>
-#include <vector>
-#include <iostream>
-#include <sstream>
-#include "utils/StringUtils.h"
-#include "core/Core.h"
-#include "core/logging/Logger.h"
-#include "core/ProcessGroup.h"
-#include "core/yaml/YamlConfiguration.h"
-#include "FlowController.h"
-#include "properties/Configure.h"
-#include "TestBase.h"
-#include "processors/TailFile.h"
-#include "processors/LogAttribute.h"
-#include "state/ProcessorController.h"
-#include "integration/IntegrationBase.h"
-
-class TailFileTestHarness : public IntegrationBase {
- public:
- TailFileTestHarness() {
- char format[] = "/tmp/ssth.XXXXXX";
- dir = testController.createTempDirectory(format);
- statefile = dir + utils::file::FileUtils::get_separator();
- statefile += "statefile";
- std::fstream file;
- ss << dir << utils::file::FileUtils::get_separator() << "tstFile.ext";
- file.open(ss.str(), std::ios::out);
- file << "Lin\\e1\nli\\nen\nli\\ne3\nli\\ne4\nli\\ne5\n";
- file.close();
- }
-
- void testSetup() {
- LogTestController::getInstance().setInfo<minifi::processors::LogAttribute>();
- LogTestController::getInstance().setTrace<minifi::processors::TailFile>();
- LogTestController::getInstance().setInfo<minifi::FlowController>();
- LogTestController::getInstance().setDebug<core::ConfigurableComponent>();
- }
-
- virtual void cleanup() {
- unlink(ss.str().c_str());
- unlink(statefile.c_str());
- }
-
- virtual void runAssertions() {
- assert(LogTestController::getInstance().contains("5 flowfiles were received from TailFile input") == true);
- assert(LogTestController::getInstance().contains("Looking for delimiter 0xA") == true);
- assert(LogTestController::getInstance().contains("li\\ne5") == true);
- }
-
- protected:
- virtual void updateProperties(std::shared_ptr<minifi::FlowController> fc) {
- for (auto &comp : fc->getComponents("tf")) {
- std::shared_ptr<minifi::state::ProcessorController> proc = std::dynamic_pointer_cast<minifi::state::ProcessorController>(comp);
- if (nullptr != proc) {
- proc->getProcessor()->setProperty(minifi::processors::TailFile::FileName, ss.str());
- proc->getProcessor()->setProperty(minifi::processors::TailFile::StateFile, statefile);
- }
- }
- }
-
- std::string statefile;
- std::string dir;
- std::stringstream ss;
- TestController testController;
-};
-
-int main(int argc, char **argv) {
- std::string key_dir, test_file_location, url;
- if (argc > 1) {
- test_file_location = argv[1];
- key_dir = argv[2];
- }
-
- TailFileTestHarness harness;
-
- harness.run(test_file_location);
-
- return 0;
-}
diff --git a/extensions/standard-processors/tests/integration/TailFileTest.cpp b/extensions/standard-processors/tests/integration/TailFileTest.cpp
index 933b489..3a460a9 100644
--- a/extensions/standard-processors/tests/integration/TailFileTest.cpp
+++ b/extensions/standard-processors/tests/integration/TailFileTest.cpp
@@ -61,7 +61,6 @@
LogTestController::getInstance().setInfo<minifi::processors::LogAttribute>();
LogTestController::getInstance().setTrace<minifi::processors::TailFile>();
LogTestController::getInstance().setTrace<minifi::FlowController>();
- LogTestController::getInstance().setDebug<core::ConfigurableComponent>();
}
virtual void cleanup() {
@@ -93,10 +92,9 @@
};
int main(int argc, char **argv) {
- std::string key_dir, test_file_location, url;
+ std::string test_file_location;
if (argc > 1) {
test_file_location = argv[1];
- key_dir = argv[2];
}
TailFileTestHarness harness;
