From aae39fb87077e4c2738d9ad11c4be25c6770d70d Mon Sep 17 00:00:00 2001 From: avigaffa Date: Mon, 18 Jun 2018 19:56:59 +0300 Subject: [PATCH] Change TestNG scope Change TestNG scope to compile in artifact generator Change-Id: I3e1edffd35a78b2cce99bac683eee32769920216 Issue-ID: SDC-1435 Signed-off-by: avigaffa --- .../onap-sdc-artifact-generator-api/pom.xml | 2 +- .../onap-sdc-artifact-generator-test/pom.xml | 2 +- .../sdc/generator/ArtifactGenerationServiceTest.java | 20 ++++++++++---------- .../java/org/onap/sdc/generator/SampleJUnitTest.java | 1 - common/pom.xml | 2 +- onboarding/pom.xml | 6 ++++++ .../vendor-license-rest-services/pom.xml | 4 ++++ .../openecomp-sdc-item-permissions-manager/pom.xml | 2 +- .../openecomp-sdc-vendor-license-manager/pom.xml | 8 +------- .../openecomp-nosqldb-core/pom.xml | 2 +- .../openecomp-utilities-lib/pom.xml | 2 +- .../openecomp-item-permissions-core/pom.xml | 1 + .../dao/impl/PermissionsServicesImplTest.java | 17 ++++++++++------- .../openecomp-item-permissions-impl/pom.xml | 6 ++++++ .../openecomp-sdc-enrichment-core/pom.xml | 2 +- .../openecomp-sdc-enrichment-impl/pom.xml | 2 +- .../openecomp-sdc-validation-core/pom.xml | 6 ------ .../openecomp-sdc-validation-impl/pom.xml | 2 +- .../openecomp-sdc-vendor-license-core/pom.xml | 2 +- .../openecomp-sdc-versioning-api/pom.xml | 2 +- .../openecomp-sdc-versioning-core/pom.xml | 2 +- .../activity-spec-web/activity-spec-service/pom.xml | 6 ++++++ 22 files changed, 56 insertions(+), 43 deletions(-) rename openecomp-be/lib/openecomp-item-permissions-lib/openecomp-item-permissions-core/src/{main => }/test/java/org/openecomp/sdc/itempermissions/dao/impl/PermissionsServicesImplTest.java (87%) diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/pom.xml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/pom.xml index 8cff61b397..7e40bc7b61 100644 --- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/pom.xml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/pom.xml @@ -65,7 +65,7 @@ org.testng testng test - 6.8.5 + ${testng.version} snakeyaml diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/pom.xml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/pom.xml index efd493f70c..48a16a3575 100644 --- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/pom.xml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/pom.xml @@ -44,7 +44,7 @@ org.testng testng - 6.8.8 + compile junit diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/java/org/onap/sdc/generator/ArtifactGenerationServiceTest.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/java/org/onap/sdc/generator/ArtifactGenerationServiceTest.java index b11c33ec9f..c8a915df4e 100644 --- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/java/org/onap/sdc/generator/ArtifactGenerationServiceTest.java +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/java/org/onap/sdc/generator/ArtifactGenerationServiceTest.java @@ -134,7 +134,7 @@ public class ArtifactGenerationServiceTest { if (baseResourceWidgetModelElements.getModelElement().size() != groupIdTypeStore.size()) { - org.testng.Assert.fail("Missing VFModule in VF model.xml"); + Assert.fail("Missing VFModule in VF model.xml"); } for (String key : groupIdTypeStore.keySet()) { @@ -285,11 +285,11 @@ public class ArtifactGenerationServiceTest { ModelElements containedModelElements = modelVersion.getModelElements().getModelElement(). get(0).getModelElements(); - org.testng.Assert.assertEquals(containedModelElements.getModelElement().get(0).getRelationshipList() + Assert.assertEquals(containedModelElements.getModelElement().get(0).getRelationshipList() .getRelationship().get(0).getRelationshipData().get(0).getRelationshipValue(), providingServiceDetails.get("providing_service_uuid")); - org.testng.Assert.assertEquals(containedModelElements.getModelElement().get(0).getRelationshipList() + Assert.assertEquals(containedModelElements.getModelElement().get(0).getRelationshipList() .getRelationship().get(0).getRelationshipData().get(1).getRelationshipValue(), providingServiceDetails.get("providing_service_invariant_uuid")); @@ -363,7 +363,7 @@ public class ArtifactGenerationServiceTest { ToscaTemplate serviceTosca = getServiceTosca(toscas); if (serviceTosca == null) { - org.testng.Assert.fail("Service Tosca not found"); + Assert.fail("Service Tosca not found"); } serviceTosca.getMetadata().put("version", SampleJUnitTest.additionalParams.get( AdditionalParams @@ -404,11 +404,11 @@ public class ArtifactGenerationServiceTest { } //Validate uuid and invariantuuid are populated in model-ver.model-version-id and model.model-invariant-id - org.testng.Assert.assertEquals(matchedResourceElements.get(0).getRelationshipList() + Assert.assertEquals(matchedResourceElements.get(0).getRelationshipList() .getRelationship().get(0) .getRelationshipData().get(0).getRelationshipValue(),entry.getKey()); - org.testng.Assert.assertEquals(matchedResourceElements.get(0).getRelationshipList().getRelationship().get(0) + Assert.assertEquals(matchedResourceElements.get(0).getRelationshipList().getRelationship().get(0) .getRelationshipData().get(1).getRelationshipValue(), nodeTemplateIdTypeStore .get(entry.getKey()+ INV_UID)); } else if(entry.getValue().contains("org.openecomp.resource.vl")){ @@ -418,11 +418,11 @@ public class ArtifactGenerationServiceTest { validateMatchedModelElementsInService(matchedResourceElements, Widget.getWidget(Widget.Type.L3_NET).getName()); //Validate uuid and invariantuuid are populated in model-ver.model-version-id and model.model-invariant-id - org.testng.Assert.assertEquals(matchedResourceElements.get(0).getRelationshipList() + Assert.assertEquals(matchedResourceElements.get(0).getRelationshipList() .getRelationship().get(0) .getRelationshipData().get(0).getRelationshipValue(),entry.getKey()); - org.testng.Assert.assertEquals(matchedResourceElements.get(0).getRelationshipList().getRelationship().get(0) + Assert.assertEquals(matchedResourceElements.get(0).getRelationshipList().getRelationship().get(0) .getRelationshipData().get(1).getRelationshipValue(), nodeTemplateIdTypeStore .get(entry.getKey() + INV_UID)); } @@ -432,12 +432,12 @@ public class ArtifactGenerationServiceTest { private static void validateWidgetIds(List matchedServiceBaseWidgetElements, String widgetName, String widgetInvUuId) { - org.testng.Assert.assertEquals(matchedServiceBaseWidgetElements.get(0).getRelationshipList().getRelationship().get(0) + Assert.assertEquals(matchedServiceBaseWidgetElements.get(0).getRelationshipList().getRelationship().get(0) .getRelationshipData().get(0).getRelationshipValue(), properties.getProperty( ArtifactType.AAI.name() + ".model-version-id."+ widgetName)); - org.testng.Assert.assertEquals(matchedServiceBaseWidgetElements.get(0).getRelationshipList().getRelationship().get(0) + Assert.assertEquals(matchedServiceBaseWidgetElements.get(0).getRelationshipList().getRelationship().get(0) .getRelationshipData().get(1).getRelationshipValue(), widgetInvUuId); } diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/java/org/onap/sdc/generator/SampleJUnitTest.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/java/org/onap/sdc/generator/SampleJUnitTest.java index 9c4def4808..6b59e2ebfa 100644 --- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/java/org/onap/sdc/generator/SampleJUnitTest.java +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/java/org/onap/sdc/generator/SampleJUnitTest.java @@ -31,7 +31,6 @@ import org.onap.sdc.generator.impl.ArtifactGenerationServiceImpl; import org.onap.sdc.generator.aai.model.Widget; import org.onap.sdc.generator.aai.tosca.ToscaTemplate; import org.onap.sdc.generator.aai.xml.Model; -import org.onap.sdc.generator.data.*; import junit.framework.TestCase; import org.junit.Assert; diff --git a/common/pom.xml b/common/pom.xml index e2dad0eefc..65a6c072d9 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -79,7 +79,7 @@ org.testng testng - 6.8.8 + ${testng.version} test diff --git a/onboarding/pom.xml b/onboarding/pom.xml index 0f14239255..28877803d7 100644 --- a/onboarding/pom.xml +++ b/onboarding/pom.xml @@ -132,6 +132,12 @@ 1.16.20 provided + + org.testng + testng + test + ${testng.version} + diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/pom.xml index f6f1a79471..6114876d2d 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/pom.xml @@ -50,6 +50,10 @@ httpcore ${http.core.version} + + org.testng + testng + diff --git a/openecomp-be/backend/openecomp-sdc-item-permissions-manager/pom.xml b/openecomp-be/backend/openecomp-sdc-item-permissions-manager/pom.xml index 8b2b6ac46f..6fddbe4ddf 100644 --- a/openecomp-be/backend/openecomp-sdc-item-permissions-manager/pom.xml +++ b/openecomp-be/backend/openecomp-sdc-item-permissions-manager/pom.xml @@ -59,7 +59,7 @@ org.testng testng - RELEASE + ${testng.version} org.mockito diff --git a/openecomp-be/backend/openecomp-sdc-vendor-license-manager/pom.xml b/openecomp-be/backend/openecomp-sdc-vendor-license-manager/pom.xml index 0b32076875..7d16e82dff 100644 --- a/openecomp-be/backend/openecomp-sdc-vendor-license-manager/pom.xml +++ b/openecomp-be/backend/openecomp-sdc-vendor-license-manager/pom.xml @@ -29,7 +29,7 @@ org.testng testng test - 6.8.5 + ${testng.version} snakeyaml @@ -37,12 +37,6 @@ - - junit - junit - test - ${junit.version} - javax.el javax.el-api diff --git a/openecomp-be/lib/openecomp-core-lib/openecomp-nosqldb-lib/openecomp-nosqldb-core/pom.xml b/openecomp-be/lib/openecomp-core-lib/openecomp-nosqldb-lib/openecomp-nosqldb-core/pom.xml index 0cb874de09..aea348f47d 100644 --- a/openecomp-be/lib/openecomp-core-lib/openecomp-nosqldb-lib/openecomp-nosqldb-core/pom.xml +++ b/openecomp-be/lib/openecomp-core-lib/openecomp-nosqldb-lib/openecomp-nosqldb-core/pom.xml @@ -36,7 +36,7 @@ org.testng testng test - 6.8.5 + ${testng.version} snakeyaml diff --git a/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/pom.xml b/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/pom.xml index 0130c0a065..9d621b4323 100644 --- a/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/pom.xml +++ b/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/pom.xml @@ -69,7 +69,7 @@ org.testng testng test - 6.8.5 + ${testng.version} snakeyaml diff --git a/openecomp-be/lib/openecomp-item-permissions-lib/openecomp-item-permissions-core/pom.xml b/openecomp-be/lib/openecomp-item-permissions-lib/openecomp-item-permissions-core/pom.xml index 0623879b96..e6922e778f 100644 --- a/openecomp-be/lib/openecomp-item-permissions-lib/openecomp-item-permissions-core/pom.xml +++ b/openecomp-be/lib/openecomp-item-permissions-lib/openecomp-item-permissions-core/pom.xml @@ -54,6 +54,7 @@ org.testng testng + test ${testng.version} diff --git a/openecomp-be/lib/openecomp-item-permissions-lib/openecomp-item-permissions-core/src/main/test/java/org/openecomp/sdc/itempermissions/dao/impl/PermissionsServicesImplTest.java b/openecomp-be/lib/openecomp-item-permissions-lib/openecomp-item-permissions-core/src/test/java/org/openecomp/sdc/itempermissions/dao/impl/PermissionsServicesImplTest.java similarity index 87% rename from openecomp-be/lib/openecomp-item-permissions-lib/openecomp-item-permissions-core/src/main/test/java/org/openecomp/sdc/itempermissions/dao/impl/PermissionsServicesImplTest.java rename to openecomp-be/lib/openecomp-item-permissions-lib/openecomp-item-permissions-core/src/test/java/org/openecomp/sdc/itempermissions/dao/impl/PermissionsServicesImplTest.java index 0a87c29f50..a4fcd24c25 100644 --- a/openecomp-be/lib/openecomp-item-permissions-lib/openecomp-item-permissions-core/src/main/test/java/org/openecomp/sdc/itempermissions/dao/impl/PermissionsServicesImplTest.java +++ b/openecomp-be/lib/openecomp-item-permissions-lib/openecomp-item-permissions-core/src/test/java/org/openecomp/sdc/itempermissions/dao/impl/PermissionsServicesImplTest.java @@ -1,5 +1,6 @@ package org.openecomp.sdc.itempermissions.dao.impl; +import java.util.Optional; import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.MockitoAnnotations; @@ -7,6 +8,7 @@ import org.mockito.Spy; import org.openecomp.sdc.common.session.SessionContextProviderFactory; import org.openecomp.sdc.itempermissions.PermissionsRules; import org.openecomp.sdc.itempermissions.dao.ItemPermissionsDao; +import org.openecomp.sdc.itempermissions.dao.UserPermissionsDao; import org.openecomp.sdc.itempermissions.type.ItemPermissionsEntity; import org.testng.Assert; import org.testng.annotations.BeforeMethod; @@ -35,12 +37,14 @@ public class PermissionsServicesImplTest { private static final String CHANGE_PERMISSIONS = "Change_Item_Permissions"; static { - SessionContextProviderFactory.getInstance().createInterface().create("testUser1"); + SessionContextProviderFactory.getInstance().createInterface().create("testUser1", "dox"); } @Mock private ItemPermissionsDao permissionsDaoMock; @Mock + private UserPermissionsDao userPermissionsDao; // do not delete. needed for permissionService + @Mock private PermissionsRules permissionsRules; @InjectMocks @Spy @@ -75,7 +79,7 @@ public class PermissionsServicesImplTest { @Test public void testIsAllowed(){ - when(permissionsDaoMock.getUserItemPermiission(ITEM1_ID,USER1_ID)).thenReturn(PERMISSION); + when(permissionsDaoMock.getUserItemPermission(ITEM1_ID,USER1_ID)).thenReturn(Optional.of(PERMISSION)); when(permissionsRules.isAllowed(PERMISSION,ACTION_SUBMIT)).thenReturn(true); Boolean result = permissionsServices.isAllowed(ITEM1_ID,USER1_ID,ACTION_SUBMIT); @@ -86,16 +90,15 @@ public class PermissionsServicesImplTest { @Test public void testUpdatePermissions(){ - Set addedUsers = new HashSet(); + Set addedUsers = new HashSet<>(); addedUsers.add(USER2_ID); - permissionsServices.updateItemPermissions(ITEM1_ID,PERMISSION,addedUsers, - new HashSet()); + permissionsServices.updateItemPermissions(ITEM1_ID,PERMISSION,addedUsers, new HashSet<>()); verify(permissionsRules).executeAction(ITEM1_ID,USER1_ID,CHANGE_PERMISSIONS); - verify(permissionsRules).updatePermission(ITEM1_ID,USER1_ID,PERMISSION,addedUsers,new HashSet()); + verify(permissionsRules).updatePermission(ITEM1_ID,USER1_ID,PERMISSION,addedUsers, new HashSet<>()); verify(permissionsDaoMock).updateItemPermissions(ITEM1_ID,PERMISSION,addedUsers,new - HashSet()); + HashSet<>()); } diff --git a/openecomp-be/lib/openecomp-item-permissions-lib/openecomp-item-permissions-impl/pom.xml b/openecomp-be/lib/openecomp-item-permissions-lib/openecomp-item-permissions-impl/pom.xml index 6935d5a57e..3d804612ca 100644 --- a/openecomp-be/lib/openecomp-item-permissions-lib/openecomp-item-permissions-impl/pom.xml +++ b/openecomp-be/lib/openecomp-item-permissions-lib/openecomp-item-permissions-impl/pom.xml @@ -23,5 +23,11 @@ ${project.version} runtime + + org.testng + testng + test + ${testng.version} + \ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/pom.xml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/pom.xml index 9b7c210f3d..9ec80418e0 100644 --- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/pom.xml @@ -28,7 +28,7 @@ org.testng testng test - 6.8.5 + ${testng.version} snakeyaml diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/pom.xml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/pom.xml index ab15802a05..1a4c06e466 100644 --- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/pom.xml @@ -29,7 +29,7 @@ org.testng testng test - 6.8.5 + ${testng.version} snakeyaml 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 fdceed694b..a05fb01bd7 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 @@ -27,12 +27,6 @@ ${project.version} runtime - - junit - junit - ${junit.version} - test - org.openecomp.sdc.core openecomp-utilities-lib diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/pom.xml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/pom.xml index 90c14b4dbd..be55d2fe60 100644 --- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/pom.xml @@ -24,7 +24,7 @@ org.testng testng test - 6.8.5 + ${testng.version} snakeyaml diff --git a/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-core/pom.xml b/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-core/pom.xml index 75b766d477..603aa6281d 100644 --- a/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-core/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-core/pom.xml @@ -40,7 +40,7 @@ org.testng testng test - 6.8.5 + ${testng.version} snakeyaml diff --git a/openecomp-be/lib/openecomp-sdc-versioning-lib/openecomp-sdc-versioning-api/pom.xml b/openecomp-be/lib/openecomp-sdc-versioning-lib/openecomp-sdc-versioning-api/pom.xml index ea12a86bab..88002d9b83 100644 --- a/openecomp-be/lib/openecomp-sdc-versioning-lib/openecomp-sdc-versioning-api/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-versioning-lib/openecomp-sdc-versioning-api/pom.xml @@ -68,7 +68,7 @@ org.testng testng test - 6.8.5 + ${testng.version} snakeyaml diff --git a/openecomp-be/lib/openecomp-sdc-versioning-lib/openecomp-sdc-versioning-core/pom.xml b/openecomp-be/lib/openecomp-sdc-versioning-lib/openecomp-sdc-versioning-core/pom.xml index 0b7264d5f9..8affe118e1 100644 --- a/openecomp-be/lib/openecomp-sdc-versioning-lib/openecomp-sdc-versioning-core/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-versioning-lib/openecomp-sdc-versioning-core/pom.xml @@ -41,7 +41,7 @@ org.testng testng test - 6.8.5 + ${testng.version} snakeyaml diff --git a/services/activity-spec/activity-spec-web/activity-spec-service/pom.xml b/services/activity-spec/activity-spec-web/activity-spec-service/pom.xml index 0914ed24fc..14fba4f3a7 100644 --- a/services/activity-spec/activity-spec-web/activity-spec-service/pom.xml +++ b/services/activity-spec/activity-spec-web/activity-spec-service/pom.xml @@ -83,6 +83,12 @@ 1.2.3 runtime + + org.testng + testng + test + ${testng.version} + -- 2.16.6