From 24a28ea3ae18dff5adf0db4cfa7afc3ee1945edf Mon Sep 17 00:00:00 2001 From: liamfallon Date: Tue, 8 Sep 2020 15:35:27 +0100 Subject: Cosmetic changes to the apex-editor GUI Some minor changes to remove some eclipse warnings and to tidy the the tets and formatting in the APEX policy editor GUI. Issue-ID: POLICY-2621 Change-Id: Ib9b9b054fbe146feec4e477434097094e8ecae26 Signed-off-by: liamfallon --- .../converter/tosca/ApexConfigProcessorTest.java | 24 +++++----- .../tosca/ToscaTemplateProcessorTest.java | 52 +++++++++------------- .../resources/processor/ApexConfig-invalid.json | 1 - .../resources/processor/ApexConfig-invalid.jsonbad | 1 + .../resources/processor/ToscaTemplate-invalid.json | 1 - .../processor/ToscaTemplate-invalid.jsonbad | 1 + 6 files changed, 33 insertions(+), 47 deletions(-) delete mode 100644 gui-editors/gui-editor-apex/src/test/resources/processor/ApexConfig-invalid.json create mode 100644 gui-editors/gui-editor-apex/src/test/resources/processor/ApexConfig-invalid.jsonbad delete mode 100644 gui-editors/gui-editor-apex/src/test/resources/processor/ToscaTemplate-invalid.json create mode 100644 gui-editors/gui-editor-apex/src/test/resources/processor/ToscaTemplate-invalid.jsonbad (limited to 'gui-editors/gui-editor-apex/src/test') diff --git a/gui-editors/gui-editor-apex/src/test/java/org/onap/policy/gui/editors/apex/rest/handling/converter/tosca/ApexConfigProcessorTest.java b/gui-editors/gui-editor-apex/src/test/java/org/onap/policy/gui/editors/apex/rest/handling/converter/tosca/ApexConfigProcessorTest.java index a12f7e1..0842b1b 100644 --- a/gui-editors/gui-editor-apex/src/test/java/org/onap/policy/gui/editors/apex/rest/handling/converter/tosca/ApexConfigProcessorTest.java +++ b/gui-editors/gui-editor-apex/src/test/java/org/onap/policy/gui/editors/apex/rest/handling/converter/tosca/ApexConfigProcessorTest.java @@ -57,8 +57,8 @@ public class ApexConfigProcessorTest { @Test public void testProcessMissingPoliciesEntry() throws IOException { final ProcessedTemplate processedTemplate; - try (final FileInputStream fileInputStream = - readFileAsStream("ApexConfig-missing-engineServiceParameters.json")) { + try (final FileInputStream fileInputStream = readFileAsStream( + "ApexConfig-missing-engineServiceParameters.json")) { processedTemplate = apexConfigProcessor.process(fileInputStream); } assertProcessedTemplate(processedTemplate, false, @@ -68,18 +68,17 @@ public class ApexConfigProcessorTest { @Test public void testProcessInvalidToscaTemplate() throws IOException { final ProcessedTemplate processedTemplate; - try (final FileInputStream fileInputStream = readFileAsStream("ApexConfig-invalid.json")) { + try (final FileInputStream fileInputStream = readFileAsStream("ApexConfig-invalid.jsonbad")) { processedTemplate = apexConfigProcessor.process(fileInputStream); } - assertProcessedTemplate(processedTemplate, false, - List.of(INVALID_APEX_CONFIG.getMessage())); + assertProcessedTemplate(processedTemplate, false, List.of(INVALID_APEX_CONFIG.getMessage())); } @Test public void testProcessInvalidEngineServiceParameters() throws IOException { final ProcessedTemplate processedTemplate; - try (final FileInputStream fileInputStream = - readFileAsStream("ApexConfig-invalid-engineServiceParameters.json")) { + try (final FileInputStream fileInputStream = readFileAsStream( + "ApexConfig-invalid-engineServiceParameters.json")) { processedTemplate = apexConfigProcessor.process(fileInputStream); } assertProcessedTemplate(processedTemplate, false, @@ -87,17 +86,16 @@ public class ApexConfigProcessorTest { } private void assertProcessedTemplate(final ProcessedTemplate process, boolean isValid, - final List expectedErrorList) { + final List expectedErrorList) { assertThat("Template should be valid", process.isValid(), is(isValid)); if (isValid || expectedErrorList == null) { return; } - assertThat("Should contains the expected quantity of errors", - process.getErrorSet().size(), is(expectedErrorList.size())); - expectedErrorList - .forEach(errorMsg -> assertThat("Should contains a specific error message", process.getErrorSet(), - contains(errorMsg))); + assertThat("Should contains the expected quantity of errors", process.getErrorSet().size(), + is(expectedErrorList.size())); + expectedErrorList.forEach(errorMsg -> assertThat("Should contains a specific error message", + process.getErrorSet(), contains(errorMsg))); } private FileInputStream readFileAsStream(final String fileName) throws FileNotFoundException { diff --git a/gui-editors/gui-editor-apex/src/test/java/org/onap/policy/gui/editors/apex/rest/handling/converter/tosca/ToscaTemplateProcessorTest.java b/gui-editors/gui-editor-apex/src/test/java/org/onap/policy/gui/editors/apex/rest/handling/converter/tosca/ToscaTemplateProcessorTest.java index 461b26e..7166621 100644 --- a/gui-editors/gui-editor-apex/src/test/java/org/onap/policy/gui/editors/apex/rest/handling/converter/tosca/ToscaTemplateProcessorTest.java +++ b/gui-editors/gui-editor-apex/src/test/java/org/onap/policy/gui/editors/apex/rest/handling/converter/tosca/ToscaTemplateProcessorTest.java @@ -91,8 +91,8 @@ public class ToscaTemplateProcessorTest { @Test public void testProcessMissingToscaDefinitionsVersion() throws IOException { final ProcessedTemplate processedTemplate; - try (final FileInputStream fileInputStream = - readFileAsStream("ToscaTemplate-missing-tosca-definitions-version.json")) { + try (final FileInputStream fileInputStream = readFileAsStream( + "ToscaTemplate-missing-tosca-definitions-version.json")) { processedTemplate = toscaTemplateProcessor.process(fileInputStream); } assertProcessedTemplate(processedTemplate, false, @@ -105,8 +105,7 @@ public class ToscaTemplateProcessorTest { try (final FileInputStream fileInputStream = readFileAsStream("ToscaTemplate-missing-properties.json")) { processedTemplate = toscaTemplateProcessor.process(fileInputStream); } - assertProcessedTemplate(processedTemplate, false, - List.of(MISSING_ENTRY.getMessage(PROPERTIES.getKey()))); + assertProcessedTemplate(processedTemplate, false, List.of(MISSING_ENTRY.getMessage(PROPERTIES.getKey()))); } @Test @@ -115,25 +114,22 @@ public class ToscaTemplateProcessorTest { try (final FileInputStream fileInputStream = readFileAsStream("ToscaTemplate-more-than-one-policy.json")) { processedTemplate = toscaTemplateProcessor.process(fileInputStream); } - assertProcessedTemplate(processedTemplate, false, - List.of(ONLY_ONE_POLICY_ALLOWED.getMessage())); + assertProcessedTemplate(processedTemplate, false, List.of(ONLY_ONE_POLICY_ALLOWED.getMessage())); } @Test public void testProcessInvalidToscaTemplate() throws IOException { final ProcessedTemplate processedTemplate; - try (final FileInputStream fileInputStream = readFileAsStream("ToscaTemplate-invalid.json")) { + try (final FileInputStream fileInputStream = readFileAsStream("ToscaTemplate-invalid.jsonbad")) { processedTemplate = toscaTemplateProcessor.process(fileInputStream); } - assertProcessedTemplate(processedTemplate, false, - List.of(INVALID_TOSCA_TEMPLATE.getMessage())); + assertProcessedTemplate(processedTemplate, false, List.of(INVALID_TOSCA_TEMPLATE.getMessage())); } @Test public void testProcessInvalidEntryToscaDefinitionsVersion() throws IOException { final ProcessedTemplate processedTemplate; - try (final FileInputStream fileInputStream = - readFileAsStream("ToscaTemplate-invalid-toscaDefinitions.json")) { + try (final FileInputStream fileInputStream = readFileAsStream("ToscaTemplate-invalid-toscaDefinitions.json")) { processedTemplate = toscaTemplateProcessor.process(fileInputStream); } assertProcessedTemplate(processedTemplate, false, @@ -143,8 +139,8 @@ public class ToscaTemplateProcessorTest { @Test public void testProcessInvalidEntryTopologyTemplate() throws IOException { final ProcessedTemplate processedTemplate; - try (final FileInputStream fileInputStream = - readFileAsStream("ToscaTemplate-invalidEntry-topologyTemplate.json")) { + try (final FileInputStream fileInputStream = readFileAsStream( + "ToscaTemplate-invalidEntry-topologyTemplate.json")) { processedTemplate = toscaTemplateProcessor.process(fileInputStream); } assertProcessedTemplate(processedTemplate, false, @@ -154,12 +150,10 @@ public class ToscaTemplateProcessorTest { @Test public void testProcessInvalidEntryPolicies() throws IOException { final ProcessedTemplate processedTemplate; - try (final FileInputStream fileInputStream = - readFileAsStream("ToscaTemplate-invalidEntry-policies.json")) { + try (final FileInputStream fileInputStream = readFileAsStream("ToscaTemplate-invalidEntry-policies.json")) { processedTemplate = toscaTemplateProcessor.process(fileInputStream); } - assertProcessedTemplate(processedTemplate, false, - List.of(INVALID_ENTRY.getMessage(POLICIES.getKey()))); + assertProcessedTemplate(processedTemplate, false, List.of(INVALID_ENTRY.getMessage(POLICIES.getKey()))); } @Test @@ -168,39 +162,33 @@ public class ToscaTemplateProcessorTest { try (final FileInputStream fileInputStream = readFileAsStream("ToscaTemplate-invalidPolicy1.json")) { processedTemplate = toscaTemplateProcessor.process(fileInputStream); } - assertProcessedTemplate(processedTemplate, false, - List.of(INVALID_POLICY.getMessage())); + assertProcessedTemplate(processedTemplate, false, List.of(INVALID_POLICY.getMessage())); try (final FileInputStream fileInputStream = readFileAsStream("ToscaTemplate-invalidPolicy2.json")) { processedTemplate = toscaTemplateProcessor.process(fileInputStream); } - assertProcessedTemplate(processedTemplate, false, - List.of(INVALID_POLICY.getMessage())); + assertProcessedTemplate(processedTemplate, false, List.of(INVALID_POLICY.getMessage())); } @Test public void testProcessInvalidEntryProperties() throws IOException { final ProcessedTemplate processedTemplate; - try (final FileInputStream fileInputStream = - readFileAsStream("ToscaTemplate-invalidEntry-properties.json")) { + try (final FileInputStream fileInputStream = readFileAsStream("ToscaTemplate-invalidEntry-properties.json")) { processedTemplate = toscaTemplateProcessor.process(fileInputStream); } - assertProcessedTemplate(processedTemplate, false, - List.of(INVALID_ENTRY.getMessage(PROPERTIES.getKey()))); + assertProcessedTemplate(processedTemplate, false, List.of(INVALID_ENTRY.getMessage(PROPERTIES.getKey()))); } - private void assertProcessedTemplate(final ProcessedTemplate process, boolean isValid, - final List expectedErrorList) { + final List expectedErrorList) { assertThat("Template should be valid", process.isValid(), is(isValid)); if (isValid || expectedErrorList == null) { return; } - assertThat("Should contains the expected quantity of errors", - process.getErrorSet().size(), is(expectedErrorList.size())); - expectedErrorList - .forEach(errorMsg -> assertThat("Should contains a specific error message", process.getErrorSet(), - contains(errorMsg))); + assertThat("Should contains the expected quantity of errors", process.getErrorSet().size(), + is(expectedErrorList.size())); + expectedErrorList.forEach(errorMsg -> assertThat("Should contains a specific error message", + process.getErrorSet(), contains(errorMsg))); } private FileInputStream readFileAsStream(final String fileName) throws FileNotFoundException { diff --git a/gui-editors/gui-editor-apex/src/test/resources/processor/ApexConfig-invalid.json b/gui-editors/gui-editor-apex/src/test/resources/processor/ApexConfig-invalid.json deleted file mode 100644 index 2517d8b..0000000 --- a/gui-editors/gui-editor-apex/src/test/resources/processor/ApexConfig-invalid.json +++ /dev/null @@ -1 +0,0 @@ -- this is an invalid JSON \ No newline at end of file diff --git a/gui-editors/gui-editor-apex/src/test/resources/processor/ApexConfig-invalid.jsonbad b/gui-editors/gui-editor-apex/src/test/resources/processor/ApexConfig-invalid.jsonbad new file mode 100644 index 0000000..2517d8b --- /dev/null +++ b/gui-editors/gui-editor-apex/src/test/resources/processor/ApexConfig-invalid.jsonbad @@ -0,0 +1 @@ +- this is an invalid JSON \ No newline at end of file diff --git a/gui-editors/gui-editor-apex/src/test/resources/processor/ToscaTemplate-invalid.json b/gui-editors/gui-editor-apex/src/test/resources/processor/ToscaTemplate-invalid.json deleted file mode 100644 index 0705d6b..0000000 --- a/gui-editors/gui-editor-apex/src/test/resources/processor/ToscaTemplate-invalid.json +++ /dev/null @@ -1 +0,0 @@ -- this is a invalid json \ No newline at end of file diff --git a/gui-editors/gui-editor-apex/src/test/resources/processor/ToscaTemplate-invalid.jsonbad b/gui-editors/gui-editor-apex/src/test/resources/processor/ToscaTemplate-invalid.jsonbad new file mode 100644 index 0000000..0705d6b --- /dev/null +++ b/gui-editors/gui-editor-apex/src/test/resources/processor/ToscaTemplate-invalid.jsonbad @@ -0,0 +1 @@ +- this is a invalid json \ No newline at end of file -- cgit 1.2.3-korg