From 5dd7bf3451168c1701b6c35b29d0db70c218595a Mon Sep 17 00:00:00 2001 From: sebdet Date: Fri, 19 Jun 2020 11:39:50 +0200 Subject: Fix sonar issues Fix sonar/checkstyle issues in sdc code Issue-ID: SDC-3116 Change-Id: I87802cc9edb378bdbe456c3ca4f10d8c6ebe9425 Signed-off-by: sebdet --- .../config/ValidationToolConfigurationTest.java | 2 +- .../tasks/module/json/ModuleJsonTaskTest.java | 101 +++++++++++++++++++++ .../tasks/moduleJson/ModuleJsonTaskTest.java | 101 --------------------- 3 files changed, 102 insertions(+), 102 deletions(-) create mode 100644 asdctool/src/test/java/org/openecomp/sdc/asdctool/impl/validator/tasks/module/json/ModuleJsonTaskTest.java delete mode 100644 asdctool/src/test/java/org/openecomp/sdc/asdctool/impl/validator/tasks/moduleJson/ModuleJsonTaskTest.java (limited to 'asdctool/src/test') diff --git a/asdctool/src/test/java/org/openecomp/sdc/asdctool/impl/validator/config/ValidationToolConfigurationTest.java b/asdctool/src/test/java/org/openecomp/sdc/asdctool/impl/validator/config/ValidationToolConfigurationTest.java index 31f6424e28..deadf3250d 100644 --- a/asdctool/src/test/java/org/openecomp/sdc/asdctool/impl/validator/config/ValidationToolConfigurationTest.java +++ b/asdctool/src/test/java/org/openecomp/sdc/asdctool/impl/validator/config/ValidationToolConfigurationTest.java @@ -31,7 +31,7 @@ import org.openecomp.sdc.asdctool.impl.validator.executers.VfValidatorExecuter; import org.openecomp.sdc.asdctool.impl.validator.tasks.artifacts.ArtifactValidationUtils; import org.openecomp.sdc.asdctool.impl.validator.tasks.artifacts.ServiceArtifactValidationTask; import org.openecomp.sdc.asdctool.impl.validator.tasks.artifacts.VfArtifactValidationTask; -import org.openecomp.sdc.asdctool.impl.validator.tasks.moduleJson.ModuleJsonTask; +import org.openecomp.sdc.asdctool.impl.validator.tasks.module.json.ModuleJsonTask; import org.openecomp.sdc.be.dao.JanusGraphClientStrategy; import org.openecomp.sdc.be.dao.cassandra.ArtifactCassandraDao; import org.openecomp.sdc.be.dao.cassandra.CassandraClient; diff --git a/asdctool/src/test/java/org/openecomp/sdc/asdctool/impl/validator/tasks/module/json/ModuleJsonTaskTest.java b/asdctool/src/test/java/org/openecomp/sdc/asdctool/impl/validator/tasks/module/json/ModuleJsonTaskTest.java new file mode 100644 index 0000000000..f6e0722aaa --- /dev/null +++ b/asdctool/src/test/java/org/openecomp/sdc/asdctool/impl/validator/tasks/module/json/ModuleJsonTaskTest.java @@ -0,0 +1,101 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed 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. + * ============LICENSE_END========================================================= + */ + +package org.openecomp.sdc.asdctool.impl.validator.tasks.module.json; + +import fj.data.Either; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.ArgumentMatchers; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.junit.MockitoJUnitRunner; +import org.openecomp.sdc.asdctool.impl.validator.report.Report; +import org.openecomp.sdc.asdctool.impl.validator.utils.VertexResult; +import org.openecomp.sdc.be.dao.jsongraph.GraphVertex; +import org.openecomp.sdc.be.datatypes.elements.ArtifactDataDefinition; +import org.openecomp.sdc.be.datatypes.elements.GroupInstanceDataDefinition; +import org.openecomp.sdc.be.datatypes.elements.MapArtifactDataDefinition; +import org.openecomp.sdc.be.datatypes.elements.MapGroupsDataDefinition; +import org.openecomp.sdc.be.datatypes.enums.GraphPropertyEnum; +import org.openecomp.sdc.be.model.ComponentParametersView; +import org.openecomp.sdc.be.model.LifecycleStateEnum; +import org.openecomp.sdc.be.model.jsonjanusgraph.datamodel.TopologyTemplate; +import org.openecomp.sdc.be.model.jsonjanusgraph.operations.TopologyTemplateOperation; + +import java.util.HashMap; +import java.util.Map; + +import static org.hamcrest.Matchers.is; +import static org.junit.Assert.assertThat; +import static org.mockito.Mockito.when; + +@RunWith(MockitoJUnitRunner.class) +public class ModuleJsonTaskTest { + + @InjectMocks + private ModuleJsonTask test; + @Mock + private TopologyTemplateOperation topologyTemplateOperation; + + @Test + public void testValidate() { + GraphVertex vertex = new GraphVertex(); + vertex.setUniqueId("uniqueId"); + Map hasProps1 = new HashMap<>(); + hasProps1.put(GraphPropertyEnum.STATE, LifecycleStateEnum.CERTIFIED.name()); + vertex.setMetadataProperties(hasProps1); + + Map mapDataDefinition = new HashMap<>(); + ArtifactDataDefinition artifactDataDefinition = new ArtifactDataDefinition(); + artifactDataDefinition.setArtifactName("one_modules.json"); + mapDataDefinition.put("one", artifactDataDefinition); + MapGroupsDataDefinition mapGroupsDataDefinition = new MapGroupsDataDefinition(); + Map mapToscaDataDefinition = new HashMap<>(); + mapToscaDataDefinition.put("one", new GroupInstanceDataDefinition()); + mapGroupsDataDefinition.setMapToscaDataDefinition(mapToscaDataDefinition); + + Map instGroups = new HashMap<>(); + instGroups.put("one", mapGroupsDataDefinition); + + Map instDeploymentArtifacts = new HashMap<>(); + MapArtifactDataDefinition mapArtifactDataDefinition = new MapArtifactDataDefinition(); + + mapArtifactDataDefinition.setMapToscaDataDefinition(mapDataDefinition); + instDeploymentArtifacts.put("one", mapArtifactDataDefinition); + + TopologyTemplate topologyTemplate = new TopologyTemplate(); + topologyTemplate.setInstGroups(instGroups); + topologyTemplate.setInstDeploymentArtifacts(instDeploymentArtifacts); + when(topologyTemplateOperation.getToscaElement(ArgumentMatchers.eq(vertex.getUniqueId()), + ArgumentMatchers.any(ComponentParametersView.class))).thenReturn(Either.left(topologyTemplate)); + + // Initially no outputFilePath was passed to this function (hence it is set to null) + // TODO: Fix this null and see if the argument is used by this function + try { + Report report = Report.make(); + VertexResult actual = test.validate(report, vertex, null); + assertThat(actual.getStatus(), is(true)); + } catch (Exception e) { + // TODO: Fix this test, as currently, any exception is ignored + // This will be addressed in another change + } + } +} diff --git a/asdctool/src/test/java/org/openecomp/sdc/asdctool/impl/validator/tasks/moduleJson/ModuleJsonTaskTest.java b/asdctool/src/test/java/org/openecomp/sdc/asdctool/impl/validator/tasks/moduleJson/ModuleJsonTaskTest.java deleted file mode 100644 index 4ea31386e4..0000000000 --- a/asdctool/src/test/java/org/openecomp/sdc/asdctool/impl/validator/tasks/moduleJson/ModuleJsonTaskTest.java +++ /dev/null @@ -1,101 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * SDC - * ================================================================================ - * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. - * ================================================================================ - * Licensed 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. - * ============LICENSE_END========================================================= - */ - -package org.openecomp.sdc.asdctool.impl.validator.tasks.moduleJson; - -import fj.data.Either; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.ArgumentMatchers; -import org.mockito.InjectMocks; -import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; -import org.openecomp.sdc.asdctool.impl.validator.report.Report; -import org.openecomp.sdc.asdctool.impl.validator.utils.VertexResult; -import org.openecomp.sdc.be.dao.jsongraph.GraphVertex; -import org.openecomp.sdc.be.datatypes.elements.ArtifactDataDefinition; -import org.openecomp.sdc.be.datatypes.elements.GroupInstanceDataDefinition; -import org.openecomp.sdc.be.datatypes.elements.MapArtifactDataDefinition; -import org.openecomp.sdc.be.datatypes.elements.MapGroupsDataDefinition; -import org.openecomp.sdc.be.datatypes.enums.GraphPropertyEnum; -import org.openecomp.sdc.be.model.ComponentParametersView; -import org.openecomp.sdc.be.model.LifecycleStateEnum; -import org.openecomp.sdc.be.model.jsonjanusgraph.datamodel.TopologyTemplate; -import org.openecomp.sdc.be.model.jsonjanusgraph.operations.TopologyTemplateOperation; - -import java.util.HashMap; -import java.util.Map; - -import static org.hamcrest.Matchers.is; -import static org.junit.Assert.assertThat; -import static org.mockito.Mockito.when; - -@RunWith(MockitoJUnitRunner.class) -public class ModuleJsonTaskTest { - - @InjectMocks - private ModuleJsonTask test; - @Mock - private TopologyTemplateOperation topologyTemplateOperation; - - @Test - public void testValidate() { - GraphVertex vertex = new GraphVertex(); - vertex.setUniqueId("uniqueId"); - Map hasProps1 = new HashMap<>(); - hasProps1.put(GraphPropertyEnum.STATE, LifecycleStateEnum.CERTIFIED.name()); - vertex.setMetadataProperties(hasProps1); - - Map mapDataDefinition = new HashMap<>(); - ArtifactDataDefinition artifactDataDefinition = new ArtifactDataDefinition(); - artifactDataDefinition.setArtifactName("one_modules.json"); - mapDataDefinition.put("one", artifactDataDefinition); - MapGroupsDataDefinition mapGroupsDataDefinition = new MapGroupsDataDefinition(); - Map mapToscaDataDefinition = new HashMap<>(); - mapToscaDataDefinition.put("one", new GroupInstanceDataDefinition()); - mapGroupsDataDefinition.setMapToscaDataDefinition(mapToscaDataDefinition); - - Map instGroups = new HashMap<>(); - instGroups.put("one", mapGroupsDataDefinition); - - Map instDeploymentArtifacts = new HashMap<>(); - MapArtifactDataDefinition mapArtifactDataDefinition = new MapArtifactDataDefinition(); - - mapArtifactDataDefinition.setMapToscaDataDefinition(mapDataDefinition); - instDeploymentArtifacts.put("one", mapArtifactDataDefinition); - - TopologyTemplate topologyTemplate = new TopologyTemplate(); - topologyTemplate.setInstGroups(instGroups); - topologyTemplate.setInstDeploymentArtifacts(instDeploymentArtifacts); - when(topologyTemplateOperation.getToscaElement(ArgumentMatchers.eq(vertex.getUniqueId()), - ArgumentMatchers.any(ComponentParametersView.class))).thenReturn(Either.left(topologyTemplate)); - - // Initially no outputFilePath was passed to this function (hence it is set to null) - // TODO: Fix this null and see if the argument is used by this function - try { - Report report = Report.make(); - VertexResult actual = test.validate(report, vertex, null); - assertThat(actual.getStatus(), is(true)); - } catch (Exception e) { - // TODO: Fix this test, as currently, any exception is ignored - // This will be addressed in another change - } - } -} -- cgit 1.2.3-korg