From 09a41f5bfa6008ce545f8745306145ad9264103b Mon Sep 17 00:00:00 2001 From: Gautam Shah Date: Wed, 11 Apr 2018 19:55:29 +0530 Subject: Reducing onboarding backend maven build time Reducing onboarding backend maven build time Change-Id: Iab7af70c0e9f60b8a50bef7937e802df5be89fd0 Issue-ID: SDC-1189 Signed-off-by: GAUTAMS --- .../openecomp-sdc-translator-core/pom.xml | 41 ++++++++++++++++++++++ .../heattotosca/ConsolidationDataUtilTest.java | 4 +-- .../GlobalTypesServiceTemplatesTest.java | 14 +++++--- .../BaseFullTranslationTest.java | 34 ++++++++---------- .../BaseResourceTranslationTest.java | 37 +++++++++---------- .../ComputeNewNodeTemplateIdGeneratorTest.java | 12 +++---- .../PortNewNodeTemplateIdGeneratorTest.java | 12 +++---- ...SubInterfaceNewNodeTemplateIdGeneratorTest.java | 12 +++---- 8 files changed, 102 insertions(+), 64 deletions(-) (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core') diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/pom.xml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/pom.xml index 795d64de64..b08067b6b4 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/pom.xml @@ -31,6 +31,13 @@ ${junit.version} test + + + org.mockito + mockito-all + test + ${mockito.all.version} + org.openecomp.sdc.core openecomp-utilities-lib @@ -70,4 +77,38 @@ + + + + org.apache.maven.plugins + maven-surefire-plugin + ${mvn.surefire.version} + + + org.apache.maven.surefire + surefire-junit47 + ${mvn.surefire.version} + + + + classes + 1 + 0 + false + true + 1 + + ${project.basedir}/src/test/resources + + + src/test/resources/logback-test.xml + + + org.openecomp.sdc:build-helper + + + + + + diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/ConsolidationDataUtilTest.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/ConsolidationDataUtilTest.java index 246bc478e6..6b637d2992 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/ConsolidationDataUtilTest.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/ConsolidationDataUtilTest.java @@ -1,8 +1,8 @@ package org.openecomp.sdc.translator.services.heattotosca; -import org.testng.annotations.Test; +import org.junit.Test; -import static org.testng.Assert.assertEquals; +import static org.junit.Assert.assertEquals; public class ConsolidationDataUtilTest { private static final String PORT_TYPE_FORMAT_1 = "a_11_network_port_22"; diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/globaltypes/GlobalTypesServiceTemplatesTest.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/globaltypes/GlobalTypesServiceTemplatesTest.java index 32315d1b33..23915601d1 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/globaltypes/GlobalTypesServiceTemplatesTest.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/globaltypes/GlobalTypesServiceTemplatesTest.java @@ -21,8 +21,8 @@ import static org.openecomp.sdc.translator.services.heattotosca.globaltypes.Glob import org.openecomp.core.utilities.orchestration.OnboardingTypesEnum; import org.openecomp.sdc.common.errors.CoreException; import org.openecomp.sdc.tosca.datatypes.model.ServiceTemplate; -import org.testng.Assert; -import org.testng.annotations.Test; +import org.junit.Assert; +import org.junit.Test; import java.util.List; import java.util.Map; @@ -31,10 +31,14 @@ import java.util.stream.Collectors; public class GlobalTypesServiceTemplatesTest { - @Test(expectedExceptions = CoreException.class, - expectedExceptionsMessageRegExp = "Failed to generate globalTypes") + @Test public void testGetGlobalTypesServiceTemplatesOnboardingMethodNull() { - Map globalTypesServiceTemplates = getGlobalTypesServiceTemplates(null); + try { + Map globalTypesServiceTemplates = getGlobalTypesServiceTemplates(null); + Assert.fail(); + }catch(CoreException ce){ + Assert.assertEquals(ce.getMessage(), "Failed to generate globalTypes"); + } } @Test diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/BaseFullTranslationTest.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/BaseFullTranslationTest.java index c4a83e01d4..2387390df9 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/BaseFullTranslationTest.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/BaseFullTranslationTest.java @@ -19,9 +19,10 @@ package org.openecomp.sdc.translator.services.heattotosca.impl.resourcetranslati import static org.junit.Assert.assertEquals; import org.apache.commons.collections4.MapUtils; -import org.junit.AfterClass; import org.junit.Assert; import org.junit.BeforeClass; +import org.junit.Rule; +import org.junit.rules.TestName; import org.openecomp.core.translator.api.HeatToToscaTranslator; import org.openecomp.core.translator.datatypes.TranslatorOutput; import org.openecomp.core.translator.factory.HeatToToscaTranslatorFactory; @@ -33,7 +34,6 @@ import org.openecomp.sdc.common.errors.ErrorCode; import org.openecomp.sdc.common.togglz.ToggleableFeature; import org.openecomp.sdc.datatypes.error.ErrorLevel; import org.openecomp.sdc.datatypes.error.ErrorMessage; -import org.openecomp.sdc.tosca.services.ToscaFileOutputService; import org.openecomp.sdc.tosca.services.impl.ToscaFileOutputServiceCsarImpl; import org.openecomp.sdc.translator.TestUtils; import org.togglz.testing.TestFeatureManager; @@ -42,7 +42,7 @@ import org.togglz.testing.TestFeatureManagerProvider; import java.io.BufferedInputStream; import java.io.File; import java.io.FileInputStream; -import java.io.FileOutputStream; +import java.io.ByteArrayInputStream; import java.io.IOException; import java.net.URL; import java.util.HashMap; @@ -59,7 +59,11 @@ public class BaseFullTranslationTest { public static final String IN_POSTFIX = "/in"; public static final String OUT_POSTFIX = "/out"; + @Rule + public TestName name = new TestName(); + protected static TestFeatureManager manager; + private static File tempDir = new File(System.getProperty("java.io.tmpdir")); @BeforeClass public static void enableToggleableFeatures(){ @@ -69,7 +73,6 @@ public class BaseFullTranslationTest { } - @AfterClass public static void disableToggleableFeatures() { manager.disableAll(); manager = null; @@ -77,16 +80,16 @@ public class BaseFullTranslationTest { } protected void testTranslationWithInit(String path) throws IOException { - File translatedZipFile = initTranslatorAndTranslate(path); + byte[] translatedZipFile = initTranslatorAndTranslate(path); testTranslation(path, translatedZipFile); } - protected File initTranslatorAndTranslate(String path) throws IOException { + protected byte[] initTranslatorAndTranslate(String path) throws IOException { HeatToToscaTranslator heatToToscaTranslator = HeatToToscaTranslatorFactory.getInstance().createInterface(); return translateZipFile(path, heatToToscaTranslator); } - protected void testTranslation(String basePath, File translatedZipFile) throws IOException { + protected void testTranslation(String basePath, byte[] translatedZipFile) throws IOException { URL url = BaseFullTranslationTest.class.getResource(basePath + OUT_POSTFIX); Set expectedResultFileNameSet = new HashSet<>(); @@ -103,8 +106,8 @@ public class BaseFullTranslationTest { } } - try (FileInputStream fis = new FileInputStream(translatedZipFile); - ZipInputStream zis = new ZipInputStream(new BufferedInputStream(fis))) { + try (ByteArrayInputStream fis = new ByteArrayInputStream(translatedZipFile);BufferedInputStream bis = new BufferedInputStream(fis); + ZipInputStream zis = new ZipInputStream(bis)) { ZipEntry entry; String name; String expected; @@ -127,10 +130,9 @@ public class BaseFullTranslationTest { } } assertEquals(0, expectedResultFileNameSet.size()); - translatedZipFile.delete(); } - private File translateZipFile(String basePath, HeatToToscaTranslator heatToToscaTranslator) throws IOException { + private byte[] translateZipFile(String basePath, HeatToToscaTranslator heatToToscaTranslator) throws IOException { URL inputFilesUrl = this.getClass().getResource(basePath + IN_POSTFIX); String path = inputFilesUrl.getPath(); TestUtils.addFilesToTranslator(heatToToscaTranslator, path); @@ -144,15 +146,9 @@ public class BaseFullTranslationTest { .withId("Validation Error").withCategory(ErrorCategory.APPLICATION).build()); } - File file = File.createTempFile("VSP", "zip"); - - try (FileOutputStream fos = new FileOutputStream(file)) { - ToscaFileOutputService toscaFileOutputService = new ToscaFileOutputServiceCsarImpl(); - fos.write( - toscaFileOutputService.createOutputFile(translatorOutput.getToscaServiceModel(), null)); - } + byte[] data = new ToscaFileOutputServiceCsarImpl().createOutputFile(translatorOutput.getToscaServiceModel(), null); - return file; + return data; } private String getErrorAsString(Map> errorMessages) { diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/BaseResourceTranslationTest.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/BaseResourceTranslationTest.java index ddc13427a7..8820bc1b40 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/BaseResourceTranslationTest.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/BaseResourceTranslationTest.java @@ -31,10 +31,11 @@ import static org.openecomp.sdc.translator.services.heattotosca.buildconsolidati import static org.openecomp.sdc.translator.services.heattotosca.buildconsolidationdata.ConsolidationDataTestUtil.validateVolumeInConsolidationData; import org.apache.commons.collections4.MapUtils; -import org.junit.AfterClass; import org.junit.Assert; import org.junit.Before; import org.junit.BeforeClass; +import org.junit.Rule; +import org.junit.rules.TestName; import org.openecomp.core.translator.datatypes.TranslatorOutput; import org.openecomp.core.utilities.file.FileUtils; import org.openecomp.core.utilities.json.JsonUtil; @@ -49,7 +50,6 @@ import org.openecomp.sdc.heat.datatypes.manifest.FileData; import org.openecomp.sdc.heat.datatypes.manifest.ManifestContent; import org.openecomp.sdc.heat.datatypes.manifest.ManifestFile; import org.openecomp.sdc.tosca.datatypes.model.ServiceTemplate; -import org.openecomp.sdc.tosca.services.ToscaFileOutputService; import org.openecomp.sdc.tosca.services.impl.ToscaFileOutputServiceCsarImpl; import org.openecomp.sdc.translator.TestUtils; import org.openecomp.sdc.translator.datatypes.heattotosca.TranslationContext; @@ -64,11 +64,8 @@ import org.openecomp.sdc.translator.services.heattotosca.buildconsolidationdata. import org.togglz.testing.TestFeatureManager; import org.togglz.testing.TestFeatureManagerProvider; -import java.io.BufferedInputStream; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.IOException; + +import java.io.*; import java.net.URL; import java.util.Collection; import java.util.HashMap; @@ -86,9 +83,14 @@ public class BaseResourceTranslationTest { protected String outputFilesPath; protected TranslationContext translationContext; + @Rule + public TestName name = new TestName(); + private String zipFilename = "VSP.zip"; private TranslationService translationService; - private File translatedZipFile; + private byte[] translatedZipFile; + + private static File tempDir = new File(System.getProperty("java.io.tmpdir")); private Map expectedResultMap = new HashMap<>(); private Set expectedResultFileNameSet = new HashSet<>(); @@ -101,7 +103,6 @@ public class BaseResourceTranslationTest { manager.enableAll(); } - @AfterClass public static void disableToggleableFeatures() { manager.disableAll(); manager = null; @@ -113,6 +114,7 @@ public class BaseResourceTranslationTest { initTranslatorAndTranslate(); } + protected void initTranslatorAndTranslate() throws IOException { translationService = new TranslationService(); translationContext = new TranslationContext(); @@ -134,8 +136,8 @@ public class BaseResourceTranslationTest { } } - try (FileInputStream fis = new FileInputStream(translatedZipFile); - ZipInputStream zis = new ZipInputStream(new BufferedInputStream(fis))) { + try (ByteArrayInputStream fis = new ByteArrayInputStream(translatedZipFile); BufferedInputStream bis = new BufferedInputStream(fis); + ZipInputStream zis = new ZipInputStream(bis)) { ZipEntry entry; String name; String expected; @@ -158,10 +160,9 @@ public class BaseResourceTranslationTest { } } assertEquals(0, expectedResultFileNameSet.size()); - translatedZipFile.delete(); } - private File translateZipFile() throws IOException { + private byte[] translateZipFile() throws IOException { URL inputFilesUrl = this.getClass().getResource(inputFilesPath); String path = inputFilesUrl.getPath(); addFilesToTranslator(translationContext, path); @@ -174,17 +175,13 @@ public class BaseResourceTranslationTest { "Error in validation " + getErrorAsString(translatorOutput.getErrorMessages())) .withId("Validation Error").withCategory(ErrorCategory.APPLICATION).build()); } - File file = File.createTempFile("VSP", "zip"); - try (FileOutputStream fos = new FileOutputStream(file)) { - ToscaFileOutputService toscaFileOutputService = new ToscaFileOutputServiceCsarImpl(); - fos.write( - toscaFileOutputService.createOutputFile(translatorOutput.getToscaServiceModel(), null)); - } + byte[] data = new ToscaFileOutputServiceCsarImpl().createOutputFile(translatorOutput.getToscaServiceModel(), null); - return file; + return data; } + private String getErrorAsString(Map> errorMessages) { StringBuilder sb = new StringBuilder(); errorMessages.entrySet().forEach( diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/unifiedmodel/commands/ComputeNewNodeTemplateIdGeneratorTest.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/unifiedmodel/commands/ComputeNewNodeTemplateIdGeneratorTest.java index 361888f74e..1c44a30ed1 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/unifiedmodel/commands/ComputeNewNodeTemplateIdGeneratorTest.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/unifiedmodel/commands/ComputeNewNodeTemplateIdGeneratorTest.java @@ -25,21 +25,21 @@ import org.openecomp.sdc.translator.datatypes.heattotosca.unifiedmodel.compositi import org.openecomp.sdc.translator.datatypes.heattotosca.unifiedmodel.composition.commands.impl.ComputeNewNodeTemplateIdGenerator; import org.openecomp.sdc.translator.datatypes.heattotosca.unifiedmodel.composition.to.UnifiedCompositionTo; import org.openecomp.sdc.translator.services.heattotosca.impl.resourcetranslation.BaseResourceTranslationTest; -import org.testng.Assert; -import org.testng.annotations.BeforeClass; -import org.testng.annotations.Test; +import org.junit.Assert; +import org.junit.BeforeClass; +import org.junit.Test; import java.util.HashMap; import java.util.Map; import java.util.Optional; -public class ComputeNewNodeTemplateIdGeneratorTest extends BaseResourceTranslationTest { +public class ComputeNewNodeTemplateIdGeneratorTest { private static final String SERVER_PCM = "server_pcm"; - private UnifiedSubstitutionNodeTemplateIdGenerator unifiedSubstitutionNodeTemplateIdGenerator; + private static UnifiedSubstitutionNodeTemplateIdGenerator unifiedSubstitutionNodeTemplateIdGenerator; @BeforeClass - public void setUp(){ + public static void setItUp(){ unifiedSubstitutionNodeTemplateIdGenerator = new ComputeNewNodeTemplateIdGenerator(); } diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/unifiedmodel/commands/PortNewNodeTemplateIdGeneratorTest.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/unifiedmodel/commands/PortNewNodeTemplateIdGeneratorTest.java index ad39bb7148..c00a9b28c2 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/unifiedmodel/commands/PortNewNodeTemplateIdGeneratorTest.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/unifiedmodel/commands/PortNewNodeTemplateIdGeneratorTest.java @@ -32,9 +32,9 @@ import org.openecomp.sdc.translator.datatypes.heattotosca.unifiedmodel.compositi import org.openecomp.sdc.translator.datatypes.heattotosca.unifiedmodel.composition.to.UnifiedCompositionTo; import org.openecomp.sdc.translator.datatypes.heattotosca.unifiedmodel.consolidation.ComputeTemplateConsolidationData; import org.openecomp.sdc.translator.services.heattotosca.impl.resourcetranslation.BaseResourceTranslationTest; -import org.testng.Assert; -import org.testng.annotations.BeforeClass; -import org.testng.annotations.Test; +import org.junit.Assert; +import org.junit.BeforeClass; +import org.junit.Test; import java.util.ArrayList; import java.util.HashMap; @@ -42,16 +42,16 @@ import java.util.List; import java.util.Map; import java.util.Optional; -public class PortNewNodeTemplateIdGeneratorTest extends BaseResourceTranslationTest { +public class PortNewNodeTemplateIdGeneratorTest { private static final String SERVER_PCM = "server_pcm"; private static final String PCM_PORT_0 = "pcm_port_0"; private static final String PCM_PORT_1 = "pcm_port_1"; - private UnifiedSubstitutionNodeTemplateIdGenerator unifiedSubstitutionNodeTemplateIdGenerator; + private static UnifiedSubstitutionNodeTemplateIdGenerator unifiedSubstitutionNodeTemplateIdGenerator; @BeforeClass - public void setUp(){ + public static void setItUp(){ unifiedSubstitutionNodeTemplateIdGenerator = new PortNewNodeTemplateIdGenerator(); } diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/unifiedmodel/commands/SubInterfaceNewNodeTemplateIdGeneratorTest.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/unifiedmodel/commands/SubInterfaceNewNodeTemplateIdGeneratorTest.java index 63f12622f7..b33df907d9 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/unifiedmodel/commands/SubInterfaceNewNodeTemplateIdGeneratorTest.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/unifiedmodel/commands/SubInterfaceNewNodeTemplateIdGeneratorTest.java @@ -30,9 +30,9 @@ import org.openecomp.sdc.translator.datatypes.heattotosca.unifiedmodel.consolida import org.openecomp.sdc.translator.datatypes.heattotosca.unifiedmodel.consolidation.PortTemplateConsolidationData; import org.openecomp.sdc.translator.datatypes.heattotosca.unifiedmodel.consolidation.SubInterfaceTemplateConsolidationData; import org.openecomp.sdc.translator.services.heattotosca.impl.resourcetranslation.BaseResourceTranslationTest; -import org.testng.Assert; -import org.testng.annotations.BeforeClass; -import org.testng.annotations.Test; +import org.junit.Assert; +import org.junit.BeforeClass; +import org.junit.Test; import java.io.IOException; import java.util.ArrayList; @@ -41,7 +41,7 @@ import java.util.List; import java.util.Map; import java.util.Optional; -public class SubInterfaceNewNodeTemplateIdGeneratorTest extends BaseResourceTranslationTest { +public class SubInterfaceNewNodeTemplateIdGeneratorTest { private static final String VDBE_UNTR_1_PORT = "vdbe_untr_1_port"; private static final String VDBE_UNTR_1_SUBPORTS = "vdbe_untr_1_subports"; @@ -50,10 +50,10 @@ public class SubInterfaceNewNodeTemplateIdGeneratorTest extends BaseResourceTran private static final String SUBINTERFACE_TYPE_NESTED = "org.openecomp.resource.abstract.nodes.heat.subinterface.nested"; - private UnifiedSubstitutionNodeTemplateIdGenerator unifiedSubstitutionNodeTemplateIdGenerator; + private static UnifiedSubstitutionNodeTemplateIdGenerator unifiedSubstitutionNodeTemplateIdGenerator; @BeforeClass - public void setUp(){ + public static void setItUp(){ unifiedSubstitutionNodeTemplateIdGenerator = new SubInterfaceNewNodeTemplateIdGenerator(); } -- cgit 1.2.3-korg