From 09a41f5bfa6008ce545f8745306145ad9264103b Mon Sep 17 00:00:00 2001 From: Gautam Shah Date: Wed, 11 Apr 2018 19:55:29 +0530 Subject: [PATCH] Reducing onboarding backend maven build time Reducing onboarding backend maven build time Change-Id: Iab7af70c0e9f60b8a50bef7937e802df5be89fd0 Issue-ID: SDC-1189 Signed-off-by: GAUTAMS --- catalog-be/pom.xml | 2 +- onboarding/pom.xml | 10 ++-- .../onboarding-rest-war/pom.xml | 2 - .../src/main/resources/logback-test.xml | 21 +++++++++ .../openecomp-sdc-enrichment-api/pom.xml | 5 -- .../openecomp-sdc-logging-core/pom.xml | 6 --- .../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 ++--- .../openecomp-sdc-validation-core/pom.xml | 1 + .../openecomp-sdc-validation-sdk/pom.xml | 2 +- .../sdc/validation/util/ValidationTestUtil.java | 8 ++-- .../pom.xml | 11 +---- openecomp-be/lib/openecomp-tosca-lib/pom.xml | 6 +++ openecomp-be/pom.xml | 7 +++ openecomp-be/tools/build-helper/pom.xml | 31 +++++++++++++ .../build/test/StaleCodeDetectionTest.java | 54 ++++++++++++++++++++++ openecomp-be/tools/swagger-ui/assembly/swagger.xml | 2 +- openecomp-be/tools/swagger-ui/pom.xml | 31 +------------ openecomp-be/tools/zusammen-tools/pom.xml | 31 +++---------- .../main/assembly/zusammen-tools-lib-assembly.xml | 12 +---- .../src/main/resources/zusammenMainTool.sh | 2 +- 27 files changed, 250 insertions(+), 160 deletions(-) create mode 100644 openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/src/main/resources/logback-test.xml create mode 100644 openecomp-be/tools/build-helper/pom.xml create mode 100644 openecomp-be/tools/build-helper/src/main/java/org/openecomp/onboarding/build/test/StaleCodeDetectionTest.java diff --git a/catalog-be/pom.xml b/catalog-be/pom.xml index e99789d08c..9fa78926c1 100644 --- a/catalog-be/pom.xml +++ b/catalog-be/pom.xml @@ -942,7 +942,7 @@ - ${project.parent.basedir}/openecomp-be/tools/swagger-ui/api-docs + ${project.parent.basedir}/openecomp-be/tools/swagger-ui/target/api-docs api-docs.war diff --git a/onboarding/pom.xml b/onboarding/pom.xml index 08f2c92c34..1c0dbfede3 100644 --- a/onboarding/pom.xml +++ b/onboarding/pom.xml @@ -13,6 +13,7 @@ + ../openecomp-be/tools/build-helper ../common ../openecomp-be ../openecomp-ui @@ -31,7 +32,7 @@ 1.10 2.3 2.19.1 - 3.1.0 + 3.1.5 2.1.1 1.8 @@ -175,7 +176,7 @@ ${project.build.directory} - test-classes/** + test-classes/**/*.class pmd/** maven-status/** @@ -192,13 +193,16 @@ false true - ${project.build.directory}/../src/test/resources + ${project.basedir}/src/test/resources src/test/resources/logback-test.xml ${project.basedir}/src/test/resources/config/Artifact-Generator.properties ${project.basedir}/configuration + + org.openecomp.sdc:build-helper + diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/pom.xml index 04954fee62..39ed3aef06 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/pom.xml @@ -251,8 +251,6 @@ http://www.github.com/kongchen/swagger-maven-plugin - ${basedir}/templates/strapdown.html.hbs - ${basedir}/target/generated/api.html ${basedir}/target/generated/swagger-ui diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/src/main/resources/logback-test.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/src/main/resources/logback-test.xml new file mode 100644 index 0000000000..f69355bd67 --- /dev/null +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/src/main/resources/logback-test.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + ${defaultPattern} + + + + + + + + \ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-api/pom.xml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-api/pom.xml index 148e8fcb98..890cdeb20a 100644 --- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-api/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-api/pom.xml @@ -19,11 +19,6 @@ openecomp-facade-core ${project.version} - - io.swagger - swagger-annotations - ${swagger.version} - org.openecomp.sdc openecomp-sdc-datatypes-lib diff --git a/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-core/pom.xml b/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-core/pom.xml index e3fb79915e..758461c316 100644 --- a/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-core/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-core/pom.xml @@ -33,12 +33,6 @@ 1.2.3 provided - - javax.servlet - servlet-api - ${servlet.version} - provided - org.testng testng 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(); } diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-core/pom.xml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-core/pom.xml index 01fce0153d..cedb850165 100644 --- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-core/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-core/pom.xml @@ -80,6 +80,7 @@ org.testng testng ${testng.version} + test diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-sdk/pom.xml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-sdk/pom.xml index fe342f58b2..ad49dac2f6 100644 --- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-sdk/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-sdk/pom.xml @@ -23,7 +23,7 @@ org.testng testng ${testng.version} - provided + test org.openecomp.sdc diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-sdk/src/main/java/org/openecomp/sdc/validation/util/ValidationTestUtil.java b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-sdk/src/main/java/org/openecomp/sdc/validation/util/ValidationTestUtil.java index 068e147874..13f2d638d2 100644 --- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-sdk/src/main/java/org/openecomp/sdc/validation/util/ValidationTestUtil.java +++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-sdk/src/main/java/org/openecomp/sdc/validation/util/ValidationTestUtil.java @@ -21,7 +21,7 @@ import org.openecomp.sdc.validation.ResourceValidator; import org.openecomp.sdc.validation.ValidationContext; import org.openecomp.sdc.validation.Validator; import org.openecomp.sdc.validation.base.ResourceBaseValidator; -import org.testng.Assert; + import java.io.File; import java.io.FileInputStream; @@ -169,9 +169,11 @@ public class ValidationTestUtil { } public static void validateErrorMessage(String actualMessage, String expected, String... params) { - Assert.assertEquals(actualMessage.replace("\n", "").replace("\r", ""), + if (!Objects.equals(actualMessage.replace("\n", "").replace("\r", ""), ErrorMessagesFormatBuilder.getErrorWithParameters(expected, params).replace("\n", "") - .replace("\r", "")); + .replace("\r", ""))){ + throw new RuntimeException("validation failed"); + } } diff --git a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/pom.xml b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/pom.xml index 05715e4751..ef5ff185b0 100644 --- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/pom.xml @@ -28,11 +28,6 @@ openecomp-nosqldb-api ${project.version} - - org.freemarker - freemarker - ${freemarker.version} - org.testng testng @@ -50,11 +45,6 @@ ${project.version} test - - org.apache.xmlgraphics - fop - ${fop.version} - com.fasterxml.jackson.dataformat jackson-dataformat-xml @@ -69,6 +59,7 @@ org.mockito mockito-all ${mockito.all.version} + test junit diff --git a/openecomp-be/lib/openecomp-tosca-lib/pom.xml b/openecomp-be/lib/openecomp-tosca-lib/pom.xml index 5138f62899..c6f8aa17a0 100644 --- a/openecomp-be/lib/openecomp-tosca-lib/pom.xml +++ b/openecomp-be/lib/openecomp-tosca-lib/pom.xml @@ -51,6 +51,12 @@ ${junit.version} test + + org.mockito + mockito-all + test + ${mockito.all.version} + org.openecomp.sdc openecomp-sdc-logging-core diff --git a/openecomp-be/pom.xml b/openecomp-be/pom.xml index 598f9736f0..5437a5d1c2 100644 --- a/openecomp-be/pom.xml +++ b/openecomp-be/pom.xml @@ -45,6 +45,13 @@ ${togglz.version} test + + org.openecomp.sdc + build-helper + ${project.version} + runtime + + diff --git a/openecomp-be/tools/build-helper/pom.xml b/openecomp-be/tools/build-helper/pom.xml new file mode 100644 index 0000000000..bcdf52a79e --- /dev/null +++ b/openecomp-be/tools/build-helper/pom.xml @@ -0,0 +1,31 @@ + + + 4.0.0 + + build-helper + + + sdc-onboarding + org.openecomp.sdc + 1.2.0-SNAPSHOT + ../../../onboarding + + + + true + true + + + + + junit + junit + ${junit.version} + provided + + + + + diff --git a/openecomp-be/tools/build-helper/src/main/java/org/openecomp/onboarding/build/test/StaleCodeDetectionTest.java b/openecomp-be/tools/build-helper/src/main/java/org/openecomp/onboarding/build/test/StaleCodeDetectionTest.java new file mode 100644 index 0000000000..69f77357ae --- /dev/null +++ b/openecomp-be/tools/build-helper/src/main/java/org/openecomp/onboarding/build/test/StaleCodeDetectionTest.java @@ -0,0 +1,54 @@ +/* + * Copyright © 2016-2017 European Support Limited + * + * 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 a "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. + */ + +package org.openecomp.onboarding.build.test; + +import org.junit.Assert; +import org.junit.Test; + +import java.io.File; +import java.nio.file.Paths; +import java.util.Arrays; +import java.util.Collections; + +public class StaleCodeDetectionTest { + + private static final String JAVA_EXT = ".java"; + private static final String CLASS_EXT = ".class"; + + @Test + public void checkIfStale() { + + String moduleLocation = System.getProperty("basedir"); + if (isStale(moduleLocation + File.separator + "target" + File.separator + "test-classes", + moduleLocation + File.separator + "src" + File.separator + "test" + File.separator + "java")) { + Assert.fail("****** Please remove 'target' directory manually under path " + moduleLocation); + } + } + + private boolean isStale(String compiledCodeLocation, String javaSourceLocation) { + File compiledFiles = new File(compiledCodeLocation); + File[] list = compiledFiles.listFiles((dir, file) -> file.endsWith(CLASS_EXT) && file.indexOf('$') == -1); + if (list == null || list.length == 0) { + return false; + } + File candidate = Collections.min(Arrays.asList(list), + (file1, file2) -> file1.lastModified() >= file2.lastModified() ? 1 : -1); + String sourceFilePath = javaSourceLocation + candidate.getAbsolutePath().replace(compiledCodeLocation, "") + .replace(CLASS_EXT, JAVA_EXT); + return !Paths.get(sourceFilePath).toFile().exists(); + } +} diff --git a/openecomp-be/tools/swagger-ui/assembly/swagger.xml b/openecomp-be/tools/swagger-ui/assembly/swagger.xml index 37911dc627..5a4302145b 100644 --- a/openecomp-be/tools/swagger-ui/assembly/swagger.xml +++ b/openecomp-be/tools/swagger-ui/assembly/swagger.xml @@ -60,7 +60,7 @@ - ./target + ./target/api-docs / ${api.json.file} diff --git a/openecomp-be/tools/swagger-ui/pom.xml b/openecomp-be/tools/swagger-ui/pom.xml index 84322762d4..f470c0eb8c 100644 --- a/openecomp-be/tools/swagger-ui/pom.xml +++ b/openecomp-be/tools/swagger-ui/pom.xml @@ -14,36 +14,11 @@ api-docs - ${basedir}/${plugin.name} ${basedir}/../../api/openecomp-sdc-rest-webapp/onboarding-rest-war api.json - api.html - - - - - maven-clean-plugin - 2.6.1 - - - clean.dist.folder - clean - - clean - - - - - ${basedir}/api-docs - - - - - - org.apache.maven.plugins maven-deploy-plugin @@ -72,9 +47,7 @@ - - - + @@ -90,7 +63,7 @@ assembly/swagger.xml ${plugin.name} - ${package.dir} + ${basedir}/target/${plugin.name} false diff --git a/openecomp-be/tools/zusammen-tools/pom.xml b/openecomp-be/tools/zusammen-tools/pom.xml index aef0eb73ad..a1183b52ac 100644 --- a/openecomp-be/tools/zusammen-tools/pom.xml +++ b/openecomp-be/tools/zusammen-tools/pom.xml @@ -64,6 +64,12 @@ openecomp-sdc-vendor-software-product-manager ${project.version} + + org.testng + testng + ${testng.version} + test + openecomp-zusammen-tools org.openecomp.sdc.core.tools @@ -130,7 +136,6 @@ - org.apache.maven.plugins maven-dependency-plugin @@ -157,26 +162,8 @@ org.apache.maven.plugins maven-jar-plugin 2.4 - - - package - - - - - true - custom - - lib/${artifact.artifactId}-${baseVersion}.${artifact.extension} - - org.openecomp.core.tools.main.ZusammenMainTool - - - - lib/ - - + ${project.build.directory}/lib @@ -192,10 +179,6 @@ - - - - run diff --git a/openecomp-be/tools/zusammen-tools/src/main/assembly/zusammen-tools-lib-assembly.xml b/openecomp-be/tools/zusammen-tools/src/main/assembly/zusammen-tools-lib-assembly.xml index 923115ee5d..5a15f4f288 100644 --- a/openecomp-be/tools/zusammen-tools/src/main/assembly/zusammen-tools-lib-assembly.xml +++ b/openecomp-be/tools/zusammen-tools/src/main/assembly/zusammen-tools-lib-assembly.xml @@ -7,7 +7,6 @@ false - src/main/resources/zusammenMainTool.sh @@ -21,19 +20,12 @@ 0755 - - ${basedir}/target - - - openecomp-zusammen*.jar - - - / - ${basedir}/target/lib /lib + + diff --git a/openecomp-be/tools/zusammen-tools/src/main/resources/zusammenMainTool.sh b/openecomp-be/tools/zusammen-tools/src/main/resources/zusammenMainTool.sh index 61388a1e09..025ecabaa8 100644 --- a/openecomp-be/tools/zusammen-tools/src/main/resources/zusammenMainTool.sh +++ b/openecomp-be/tools/zusammen-tools/src/main/resources/zusammenMainTool.sh @@ -23,5 +23,5 @@ else fi echo "Configuration file location: ${CONF_FILE_LOCATION}" -java -Dconfig.home=/opt/app/jetty/base/be/config -Dlog.home=/apps/jetty/base/be/logs -Dconfiguration.yaml=${CONF_FILE_LOCATION} -classpath openecomp-zusammen-tools-1.2.0-SNAPSHOT.jar:lib/* org.openecomp.core.tools.main.ZusammenMainTool $1 $2 $3 $4 $5 $6 +java -Dconfig.home=/opt/app/jetty/base/be/config -Dlog.home=/apps/jetty/base/be/logs -Dconfiguration.yaml=${CONF_FILE_LOCATION} -classpath lib/* org.openecomp.core.tools.main.ZusammenMainTool $1 $2 $3 $4 $5 $6 STATUS="${?}" echo "${STATUS}" -- 2.16.6