Catalog alignment

[sdc.git] / asdctool / src / test / java / org / openecomp / sdc / asdctool / configuration / ArtifactUUIDFixConfigurationTest.java

diff --git a/asdctool/src/test/java/org/openecomp/sdc/asdctool/configuration/ArtifactUUIDFixConfigurationTest.java b/asdctool/src/test/java/org/openecomp/sdc/asdctool/configuration/ArtifactUUIDFixConfigurationTest.java
index 1ee1c4a..bc1c87d 100644 (file)
--- a/asdctool/src/test/java/org/openecomp/sdc/asdctool/configuration/ArtifactUUIDFixConfigurationTest.java
+++ b/asdctool/src/test/java/org/openecomp/sdc/asdctool/configuration/ArtifactUUIDFixConfigurationTest.java
@@ -20,8 +20,6 @@
 
 package org.openecomp.sdc.asdctool.configuration;
 
-import static org.mockito.Mockito.mock;
-
 import org.junit.Test;
 import org.openecomp.sdc.asdctool.impl.ArtifactUuidFix;
 import org.openecomp.sdc.be.components.distribution.engine.ServiceDistributionArtifactsBuilder;
@@ -30,7 +28,8 @@ import org.openecomp.sdc.be.dao.jsongraph.JanusGraphDao;
 import org.openecomp.sdc.be.model.jsonjanusgraph.operations.ToscaOperationFacade;
 import org.openecomp.sdc.be.tosca.CsarUtils;
 import org.openecomp.sdc.be.tosca.ToscaExportHandler;
-import org.springframework.beans.factory.config.PropertiesFactoryBean;
+
+import static org.mockito.Mockito.mock;
 
 public class ArtifactUUIDFixConfigurationTest {
 
@@ -38,6 +37,9 @@ public class ArtifactUUIDFixConfigurationTest {
                return new ArtifactUUIDFixConfiguration();
        }
 
+       private static ToscaExportHandler toscaExportHandler;
+       private static CsarUtils csarUtils;
+
        @Test
        public void testArtifactUuidFix() throws Exception {
                ArtifactUUIDFixConfiguration testSubject;
@@ -47,9 +49,7 @@ public class ArtifactUUIDFixConfigurationTest {
                testSubject = createTestSubject();
                JanusGraphDao janusGraphDao = mock(JanusGraphDao.class);
                ToscaOperationFacade toscaOperationFacade = mock(ToscaOperationFacade.class);
-               ToscaExportHandler toscaExportHandler = mock(ToscaExportHandler.class);
                ArtifactCassandraDao artifactCassandraDao = mock(ArtifactCassandraDao.class);
-               CsarUtils csarUtils = mock(CsarUtils.class);
 
                result = testSubject.artifactUuidFix(janusGraphDao, toscaOperationFacade,
                        toscaExportHandler, artifactCassandraDao, csarUtils);
@@ -64,13 +64,4 @@ public class ArtifactUUIDFixConfigurationTest {
                testSubject = createTestSubject();
        }
 
-       @Test
-       public void testMapper() throws Exception {
-               ArtifactUUIDFixConfiguration testSubject;
-               PropertiesFactoryBean result;
-
-               // default test
-               testSubject = createTestSubject();
-               result = testSubject.mapper();
-       }
 }