diff options
4 files changed, 26 insertions, 23 deletions
diff --git a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/executers/TopologyTemplateValidatorExecuter.java b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/executers/TopologyTemplateValidatorExecuter.java index 497e589234..52c8cb5f96 100644 --- a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/executers/TopologyTemplateValidatorExecuter.java +++ b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/executers/TopologyTemplateValidatorExecuter.java @@ -114,7 +114,7 @@ public class TopologyTemplateValidatorExecuter { String componentScanStatus = successAllTasks ? "success" : "failed"; log.info("Topology Template " + vertex.getUniqueId() + " Validation finished with " + componentScanStatus); } - ReportManager.reportValidatorTypeSummary(getName(), failedTasks, successTasks, outputFilePath); + reportFile.reportValidatorTypeSummary(getName(), failedTasks, successTasks); return successAllVertices; } } diff --git a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/report/ReportFile.java b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/report/ReportFile.java index f1f084e2a8..b22edb6cee 100644 --- a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/report/ReportFile.java +++ b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/report/ReportFile.java @@ -20,6 +20,8 @@ package org.openecomp.sdc.asdctool.impl.validator.report; +import java.util.Set; +import org.apache.commons.text.StrBuilder; import org.openecomp.sdc.be.dao.jsongraph.GraphVertex; /** @@ -79,6 +81,20 @@ public class ReportFile { "-----------------------" ); } + + public void reportValidatorTypeSummary( + String validatorName, + Set<String> failedTasksNames, + Set<String> successTasksNames + ) { + StrBuilder sb = new StrBuilder(); + sb.appendln("-----------------------ValidatorExecuter " + validatorName + + " Validation Summary-----------------------"); + sb.appendln("Failed tasks: " + failedTasksNames); + sb.appendln("Success tasks: " + successTasksNames); + writer.writeln(""); + writer.write(sb.toString()); + } } /** diff --git a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/utils/ReportManager.java b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/utils/ReportManager.java index 3149d049c1..a733eec38b 100644 --- a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/utils/ReportManager.java +++ b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/utils/ReportManager.java @@ -69,16 +69,6 @@ public class ReportManager { } } - public static void reportValidatorTypeSummary(String validatorName, Set<String> failedTasksNames, - Set<String> successTasksNames, String outputFilePath) { - StrBuilder sb = new StrBuilder(); - sb.appendln( - "-----------------------ValidatorExecuter " + validatorName + " Validation Summary-----------------------"); - sb.appendln("Failed tasks: " + failedTasksNames); - sb.appendln("Success tasks: " + successTasksNames); - writeReportLineToFile(sb.toString(), outputFilePath); - } - public static void reportEndOfToolRun(Report report, String outputFilePath) { StrBuilder sb = new StrBuilder(); sb.appendln("-----------------------------------Validator Tool Summary-----------------------------------"); diff --git a/asdctool/src/test/java/org/openecomp/sdc/asdctool/impl/validator/utils/ReportManagerTest.java b/asdctool/src/test/java/org/openecomp/sdc/asdctool/impl/validator/utils/ReportManagerTest.java index 9a237af812..e78ab31763 100644 --- a/asdctool/src/test/java/org/openecomp/sdc/asdctool/impl/validator/utils/ReportManagerTest.java +++ b/asdctool/src/test/java/org/openecomp/sdc/asdctool/impl/validator/utils/ReportManagerTest.java @@ -156,21 +156,18 @@ public class ReportManagerTest { @Test public void testReportValidatorTypeSummary() { // when - ReportManager - .reportValidatorTypeSummary(VALIDATOR_NAME, failedTasksNames, successTasksNames, txtReportFilePath); - - List<String> reportOutputFile = ReportManagerHelper.getReportOutputFileAsList(txtReportFilePath); + List<String> reportTxtFile = ReportFileNioHelper.withTxtFile(txtReportFilePath, file -> { + file.reportValidatorTypeSummary(VALIDATOR_NAME, failedTasksNames, successTasksNames); + return ReportFileNioHelper.readFileAsList(txtReportFilePath); + }); // then - assertNotNull(reportOutputFile); - assertEquals(EXPECTED_OUTPUT_FILE_HEADER, reportOutputFile.get(0)); - + assertNotNull(reportTxtFile); + assertEquals(EXPECTED_OUTPUT_FILE_HEADER, reportTxtFile.get(0)); assertEquals("-----------------------ValidatorExecuter " + VALIDATOR_NAME - + " Validation Summary-----------------------", reportOutputFile.get(2)); - assertEquals("Failed tasks: [" + TASK_1_FAILED_NAME + ", " + TASK_2_FAILED_NAME + "]", - reportOutputFile.get(3)); - assertEquals("Success tasks: [" + TASK_1_NAME + ", " + TASK_2_NAME + "]", - reportOutputFile.get(4)); + + " Validation Summary-----------------------", reportTxtFile.get(2)); + assertEquals("Failed tasks: [" + TASK_1_FAILED_NAME + ", " + TASK_2_FAILED_NAME + "]", reportTxtFile.get(3)); + assertEquals("Success tasks: [" + TASK_1_NAME + ", " + TASK_2_NAME + "]", reportTxtFile.get(4)); } @Test |