diff options
Diffstat (limited to 'asdctool/src/test')
11 files changed, 30 insertions, 30 deletions
diff --git a/asdctool/src/test/java/org/openecomp/sdc/asdctool/impl/validator/ArtifactToolBLTest.java b/asdctool/src/test/java/org/openecomp/sdc/asdctool/impl/validator/ArtifactToolBLTest.java index 47952f8d5c..138629b113 100644 --- a/asdctool/src/test/java/org/openecomp/sdc/asdctool/impl/validator/ArtifactToolBLTest.java +++ b/asdctool/src/test/java/org/openecomp/sdc/asdctool/impl/validator/ArtifactToolBLTest.java @@ -25,7 +25,7 @@ import static org.mockito.Mockito.mock; import java.util.ArrayList; import java.util.LinkedList; import org.junit.Test; -import org.openecomp.sdc.asdctool.impl.validator.executers.NodeToscaArtifactsValidatorExecutor; +import org.openecomp.sdc.asdctool.impl.validator.executor.NodeToscaArtifactsValidatorExecutor; import org.openecomp.sdc.be.dao.jsongraph.JanusGraphDao; import org.openecomp.sdc.be.model.jsonjanusgraph.operations.ToscaOperationFacade; diff --git a/asdctool/src/test/java/org/openecomp/sdc/asdctool/impl/validator/ValidationToolBLTest.java b/asdctool/src/test/java/org/openecomp/sdc/asdctool/impl/validator/ValidationToolBLTest.java index ddea391ab1..74a252c5aa 100644 --- a/asdctool/src/test/java/org/openecomp/sdc/asdctool/impl/validator/ValidationToolBLTest.java +++ b/asdctool/src/test/java/org/openecomp/sdc/asdctool/impl/validator/ValidationToolBLTest.java @@ -21,7 +21,7 @@ package org.openecomp.sdc.asdctool.impl.validator; import org.junit.Test; -import org.openecomp.sdc.asdctool.impl.validator.executers.ServiceValidatorExecuter; +import org.openecomp.sdc.asdctool.impl.validator.executor.ServiceValidatorExecutor; import org.openecomp.sdc.asdctool.impl.validator.report.Report; import org.openecomp.sdc.be.dao.jsongraph.JanusGraphDao; @@ -44,7 +44,7 @@ public class ValidationToolBLTest { JanusGraphDao janusGraphDaoMock = mock(JanusGraphDao.class); ValidationToolBL testSubject = createTestSubject(); testSubject.validators = new LinkedList<>(); - testSubject.validators.add(new ServiceValidatorExecuter(janusGraphDaoMock)); + testSubject.validators.add(new ServiceValidatorExecutor(janusGraphDaoMock)); Report report = Report.make(); testSubject.validateAll(report, makeTxtFile(makeConsoleWriter())); } 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 1903f0f1e7..47798f6777 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 @@ -23,11 +23,11 @@ package org.openecomp.sdc.asdctool.impl.validator.config; import org.junit.Test; import org.openecomp.sdc.asdctool.impl.validator.ArtifactToolBL; import org.openecomp.sdc.asdctool.impl.validator.ValidationToolBL; -import org.openecomp.sdc.asdctool.impl.validator.executers.NodeToscaArtifactsValidatorExecutor; -import org.openecomp.sdc.asdctool.impl.validator.executers.ServiceToscaArtifactsValidatorExecutor; -import org.openecomp.sdc.asdctool.impl.validator.executers.ServiceValidatorExecuter; -import org.openecomp.sdc.asdctool.impl.validator.executers.VFToscaArtifactValidatorExecutor; -import org.openecomp.sdc.asdctool.impl.validator.executers.VfValidatorExecuter; +import org.openecomp.sdc.asdctool.impl.validator.executor.NodeToscaArtifactsValidatorExecutor; +import org.openecomp.sdc.asdctool.impl.validator.executor.ServiceToscaArtifactsValidatorExecutor; +import org.openecomp.sdc.asdctool.impl.validator.executor.ServiceValidatorExecutor; +import org.openecomp.sdc.asdctool.impl.validator.executor.VFToscaArtifactValidatorExecutor; +import org.openecomp.sdc.asdctool.impl.validator.executor.VfValidatorExecutor; 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; @@ -57,7 +57,7 @@ public class ValidationToolConfigurationTest { @Test public void testBasicServiceValidator() { ValidationToolConfiguration testSubject; - ServiceValidatorExecuter result; + ServiceValidatorExecutor result; JanusGraphDao janusGraphDaoMock = mock(JanusGraphDao.class); // default test @@ -111,7 +111,7 @@ public class ValidationToolConfigurationTest { @Test public void testBasicVfValidator() { ValidationToolConfiguration testSubject; - VfValidatorExecuter result; + VfValidatorExecutor result; JanusGraphDao janusGraphDaoMock = mock(JanusGraphDao.class); // default test diff --git a/asdctool/src/test/java/org/openecomp/sdc/asdctool/impl/validator/executers/ArtifactValidatorExecutorContract.java b/asdctool/src/test/java/org/openecomp/sdc/asdctool/impl/validator/executor/ArtifactValidatorExecutorContract.java index 8564bb8251..3a325fcb09 100644 --- a/asdctool/src/test/java/org/openecomp/sdc/asdctool/impl/validator/executers/ArtifactValidatorExecutorContract.java +++ b/asdctool/src/test/java/org/openecomp/sdc/asdctool/impl/validator/executor/ArtifactValidatorExecutorContract.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdc.asdctool.impl.validator.executers; +package org.openecomp.sdc.asdctool.impl.validator.executor; import static org.mockito.Mockito.mock; diff --git a/asdctool/src/test/java/org/openecomp/sdc/asdctool/impl/validator/executers/IArtifactValidatorExecutorContract.java b/asdctool/src/test/java/org/openecomp/sdc/asdctool/impl/validator/executor/IArtifactValidatorExecutorContract.java index 39a1bbef0c..35c6ac1173 100644 --- a/asdctool/src/test/java/org/openecomp/sdc/asdctool/impl/validator/executers/IArtifactValidatorExecutorContract.java +++ b/asdctool/src/test/java/org/openecomp/sdc/asdctool/impl/validator/executor/IArtifactValidatorExecutorContract.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdc.asdctool.impl.validator.executers; +package org.openecomp.sdc.asdctool.impl.validator.executor; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/asdctool/src/test/java/org/openecomp/sdc/asdctool/impl/validator/executers/NodeToscaArtifactsValidatorExecutorTest.java b/asdctool/src/test/java/org/openecomp/sdc/asdctool/impl/validator/executor/NodeToscaArtifactsValidatorExecutorTest.java index 3870a98d78..b189b27d97 100644 --- a/asdctool/src/test/java/org/openecomp/sdc/asdctool/impl/validator/executers/NodeToscaArtifactsValidatorExecutorTest.java +++ b/asdctool/src/test/java/org/openecomp/sdc/asdctool/impl/validator/executor/NodeToscaArtifactsValidatorExecutorTest.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdc.asdctool.impl.validator.executers; +package org.openecomp.sdc.asdctool.impl.validator.executor; import org.openecomp.sdc.be.dao.jsongraph.JanusGraphDao; import org.openecomp.sdc.be.model.jsonjanusgraph.operations.ToscaOperationFacade; diff --git a/asdctool/src/test/java/org/openecomp/sdc/asdctool/impl/validator/executers/ServiceToscaArtifactsValidatorExecutorTest.java b/asdctool/src/test/java/org/openecomp/sdc/asdctool/impl/validator/executor/ServiceToscaArtifactsValidatorExecutorTest.java index 7998c52ea4..ef35d45e63 100644 --- a/asdctool/src/test/java/org/openecomp/sdc/asdctool/impl/validator/executers/ServiceToscaArtifactsValidatorExecutorTest.java +++ b/asdctool/src/test/java/org/openecomp/sdc/asdctool/impl/validator/executor/ServiceToscaArtifactsValidatorExecutorTest.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdc.asdctool.impl.validator.executers; +package org.openecomp.sdc.asdctool.impl.validator.executor; import org.openecomp.sdc.be.dao.jsongraph.JanusGraphDao; import org.openecomp.sdc.be.model.jsonjanusgraph.operations.ToscaOperationFacade; diff --git a/asdctool/src/test/java/org/openecomp/sdc/asdctool/impl/validator/executers/ServiceValidatorExecuterTest.java b/asdctool/src/test/java/org/openecomp/sdc/asdctool/impl/validator/executor/ServiceValidatorExecutorTest.java index 41fb048757..bc0eb25da2 100644 --- a/asdctool/src/test/java/org/openecomp/sdc/asdctool/impl/validator/executers/ServiceValidatorExecuterTest.java +++ b/asdctool/src/test/java/org/openecomp/sdc/asdctool/impl/validator/executor/ServiceValidatorExecutorTest.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdc.asdctool.impl.validator.executers; +package org.openecomp.sdc.asdctool.impl.validator.executor; import static org.mockito.Mockito.mock; import static org.openecomp.sdc.asdctool.impl.validator.report.ReportFile.makeTxtFile; @@ -28,11 +28,11 @@ import org.junit.Test; import org.openecomp.sdc.asdctool.impl.validator.report.Report; import org.openecomp.sdc.be.dao.jsongraph.JanusGraphDao; -public class ServiceValidatorExecuterTest { +public class ServiceValidatorExecutorTest { - private ServiceValidatorExecuter createTestSubject() { + private ServiceValidatorExecutor createTestSubject() { JanusGraphDao janusGraphDaoMock = mock(JanusGraphDao.class); - return new ServiceValidatorExecuter(janusGraphDaoMock); + return new ServiceValidatorExecutor(janusGraphDaoMock); } @Test diff --git a/asdctool/src/test/java/org/openecomp/sdc/asdctool/impl/validator/executers/TopologyTemplateValidatorExecuterTest.java b/asdctool/src/test/java/org/openecomp/sdc/asdctool/impl/validator/executor/TopologyTemplateValidatorExecutorTest.java index d74aaa49a2..57e99c3865 100644 --- a/asdctool/src/test/java/org/openecomp/sdc/asdctool/impl/validator/executers/TopologyTemplateValidatorExecuterTest.java +++ b/asdctool/src/test/java/org/openecomp/sdc/asdctool/impl/validator/executor/TopologyTemplateValidatorExecutorTest.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdc.asdctool.impl.validator.executers; +package org.openecomp.sdc.asdctool.impl.validator.executor; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; @@ -27,16 +27,16 @@ import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum; import static org.mockito.Mockito.mock; -public class TopologyTemplateValidatorExecuterTest { +public class TopologyTemplateValidatorExecutorTest { - private TopologyTemplateValidatorExecuter createTestSubject() { + private TopologyTemplateValidatorExecutor createTestSubject() { JanusGraphDao janusGraphDaoMock = mock(JanusGraphDao.class); - return new TopologyTemplateValidatorExecuter(janusGraphDaoMock); + return new TopologyTemplateValidatorExecutor(janusGraphDaoMock); } @Test public void testSetName() { - TopologyTemplateValidatorExecuter testSubject; + TopologyTemplateValidatorExecutor testSubject; String name = ""; // default test @@ -46,7 +46,7 @@ public class TopologyTemplateValidatorExecuterTest { @Test public void testGetName() { - TopologyTemplateValidatorExecuter testSubject; + TopologyTemplateValidatorExecutor testSubject; String result; // default test @@ -56,7 +56,7 @@ public class TopologyTemplateValidatorExecuterTest { @Test public void testGetVerticesToValidate() { - TopologyTemplateValidatorExecuter testSubject; + TopologyTemplateValidatorExecutor testSubject; // default test testSubject = createTestSubject(); diff --git a/asdctool/src/test/java/org/openecomp/sdc/asdctool/impl/validator/executers/VFToscaArtifactValidatorExecutorTest.java b/asdctool/src/test/java/org/openecomp/sdc/asdctool/impl/validator/executor/VFToscaArtifactValidatorExecutorTest.java index ae6dcc1623..3beec33e50 100644 --- a/asdctool/src/test/java/org/openecomp/sdc/asdctool/impl/validator/executers/VFToscaArtifactValidatorExecutorTest.java +++ b/asdctool/src/test/java/org/openecomp/sdc/asdctool/impl/validator/executor/VFToscaArtifactValidatorExecutorTest.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdc.asdctool.impl.validator.executers; +package org.openecomp.sdc.asdctool.impl.validator.executor; import org.openecomp.sdc.be.dao.jsongraph.JanusGraphDao; import org.openecomp.sdc.be.model.jsonjanusgraph.operations.ToscaOperationFacade; diff --git a/asdctool/src/test/java/org/openecomp/sdc/asdctool/impl/validator/executers/VfValidatorExecuterTest.java b/asdctool/src/test/java/org/openecomp/sdc/asdctool/impl/validator/executor/VfValidatorExecutorTest.java index aa388f68b7..c40f660d45 100644 --- a/asdctool/src/test/java/org/openecomp/sdc/asdctool/impl/validator/executers/VfValidatorExecuterTest.java +++ b/asdctool/src/test/java/org/openecomp/sdc/asdctool/impl/validator/executor/VfValidatorExecutorTest.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdc.asdctool.impl.validator.executers; +package org.openecomp.sdc.asdctool.impl.validator.executor; import static org.mockito.Mockito.mock; import static org.openecomp.sdc.asdctool.impl.validator.report.ReportFile.makeTxtFile; @@ -31,13 +31,13 @@ import org.openecomp.sdc.asdctool.impl.validator.report.Report; import org.openecomp.sdc.asdctool.impl.validator.tasks.VfValidationTask; import org.openecomp.sdc.be.dao.jsongraph.JanusGraphDao; -public class VfValidatorExecuterTest { +public class VfValidatorExecutorTest { - private VfValidatorExecuter createTestSubject() { + private VfValidatorExecutor createTestSubject() { List<VfValidationTask> validationTasks = new ArrayList<>(); JanusGraphDao janusGraphDaoMock = mock(JanusGraphDao.class); - return new VfValidatorExecuter(validationTasks, janusGraphDaoMock); + return new VfValidatorExecutor(validationTasks, janusGraphDaoMock); } @Test |