diff options
| author |   vasraz <vasyl.razinkov@est.tech> | 2019-10-15 10:23:08 +0100 |
|---|---|---|
| committer |   Ofir Sonsino <ofir.sonsino@intl.att.com> | 2020-01-26 09:17:08 +0000 |
| commit | cb7a00bf89efca5b784120e990f79c475347e89d (patch) | |
| tree | 2e434c227f7ac2bf3ba024f9496ded1f399554b9 /test-apis-ci/src/main/resources | |
| parent | c113cc3f10f72013a66c2eb5a52ab8460da196f9 (diff) | |
Increase junit TCs
1. Re-enable disabled TCs (enable = true)
2. Enable @Ignored TCs
3. Add some Assert when missing
4. Remove old unused TCs (covered in UI)
Change-Id: I900e52f4860b1fdc5bd1e529a1fe7f5c3491465b
Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech>
Issue-ID: SDC-2672
Diffstat (limited to 'test-apis-ci/src/main/resources')
13 files changed, 466 insertions, 1058 deletions
diff --git a/test-apis-ci/src/main/resources/ci/conf/testngLifeCycle.xml b/test-apis-ci/src/main/resources/ci/conf/testngLifeCycle.xml index aa390dc213..005bdba0f3 100644 --- a/test-apis-ci/src/main/resources/ci/conf/testngLifeCycle.xml +++ b/test-apis-ci/src/main/resources/ci/conf/testngLifeCycle.xml @@ -3,25 +3,7 @@ <suite name="lifeCycle" parallel="none"> <test name="Test"> <classes> - <class name="org.openecomp.sdc.ci.tests.execute.lifecycle.ServiceLCS_cerificationCITest"/> - <class name="org.openecomp.sdc.ci.tests.execute.lifecycle.ServiceResourceLCSTest"/> - <class name="org.openecomp.sdc.ci.tests.execute.lifecycle.LCS_UndoCheckOutCITest"/> - <class name="org.openecomp.sdc.ci.tests.execute.lifecycle.ServiceLCS_UndoCheckOutCITest"/> - <class name="org.openecomp.sdc.ci.tests.execute.lifecycle.LCS_StartCertificationCITest"/> - <class name="org.openecomp.sdc.ci.tests.execute.lifecycle.ServiceLCS_CheckinCITest"/> - <class name="org.openecomp.sdc.ci.tests.execute.lifecycle.LCS_CheckOutCITest"/> - <class name="org.openecomp.sdc.ci.tests.execute.lifecycle.ServiceCertWithResourceInstances"/> - <class name="org.openecomp.sdc.ci.tests.execute.lifecycle.CrossCheckOutTest"/> - <class name="org.openecomp.sdc.ci.tests.execute.lifecycle.CertifyVFWithNotCertRIs"/> - <class name="org.openecomp.sdc.ci.tests.execute.lifecycle.LCS_request4CerCITest"/> - <class name="org.openecomp.sdc.ci.tests.execute.lifecycle.CleanupIntermediateReources"/> - <class name="org.openecomp.sdc.ci.tests.execute.lifecycle.ServiceLCS_CheckOutCIT"/> - <class name="org.openecomp.sdc.ci.tests.execute.lifecycle.LCS_cerificationCITest"/> - <class name="org.openecomp.sdc.ci.tests.execute.lifecycle.CertifyServiceWithNotCertRI"/> - <class name="org.openecomp.sdc.ci.tests.execute.lifecycle.LCS_CheckInCITest"/> - <class name="org.openecomp.sdc.ci.tests.execute.lifecycle.ServiceLCS_request4CerCITest"/> <class name="org.openecomp.sdc.ci.tests.execute.lifecycle.LCSbaseTest"/> - <class name="org.openecomp.sdc.ci.tests.execute.lifecycle.ServiceLCS_StartCertificationCITest"/> </classes> </test> <!-- Test --> </suite> <!-- lifeCycle --> diff --git a/test-apis-ci/src/main/resources/ci/testSuites/artifacts.xml b/test-apis-ci/src/main/resources/ci/testSuites/artifacts.xml index 24229b8586..1352e75d58 100644 --- a/test-apis-ci/src/main/resources/ci/testSuites/artifacts.xml +++ b/test-apis-ci/src/main/resources/ci/testSuites/artifacts.xml @@ -1,19 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd"> -<suite name="Artifacts" > - <test name="Artifacts"> - <classes> - <class - name="org.openecomp.sdc.ci.tests.execute.artifacts.DownloadComponentArt" /> - <class - name="org.openecomp.sdc.ci.tests.execute.artifacts.ArtifactServletTest" /> - <class - name="org.openecomp.sdc.ci.tests.execute.artifacts.ValidateHeatArtFieldsTypes" /> - <class - name="org.openecomp.sdc.ci.tests.execute.artifacts.PlaceHolderValidations" /> - <class - name="org.openecomp.sdc.ci.tests.execute.artifacts.ValidateArtResponse" /> - <class name="org.openecomp.sdc.ci.tests.execute.artifacts.CrudArt" /> - </classes> - </test> +<suite name="Artifacts"> + <test name="Artifacts"> + <classes> + <class name="org.openecomp.sdc.ci.tests.execute.artifacts.DownloadComponentArt"/> + <class name="org.openecomp.sdc.ci.tests.execute.artifacts.ValidateHeatArtFieldsTypes"/> + <class name="org.openecomp.sdc.ci.tests.execute.artifacts.PlaceHolderValidations"/> + </classes> + </test> </suite> <!-- Artifacts --> diff --git a/test-apis-ci/src/main/resources/ci/testSuites/category.xml b/test-apis-ci/src/main/resources/ci/testSuites/category.xml index f2a0b3790c..3de83431e8 100644 --- a/test-apis-ci/src/main/resources/ci/testSuites/category.xml +++ b/test-apis-ci/src/main/resources/ci/testSuites/category.xml @@ -1,9 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd"> -<suite name="category" > +<suite name="category"> <test name="Test"> <classes> - <class name="org.openecomp.sdc.ci.tests.execute.category.CategoriesTests"/> <class name="org.openecomp.sdc.ci.tests.execute.category.GroupingTest"/> <class name="org.openecomp.sdc.ci.tests.execute.category.SubCategoriesTest"/> </classes> diff --git a/test-apis-ci/src/main/resources/ci/testSuites/ciFull.xml b/test-apis-ci/src/main/resources/ci/testSuites/ciFull.xml index 26a85fd9c6..47624c6266 100644 --- a/test-apis-ci/src/main/resources/ci/testSuites/ciFull.xml +++ b/test-apis-ci/src/main/resources/ci/testSuites/ciFull.xml @@ -1,221 +1,117 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd"> <suite name="ciFull" configfailurepolicy="continue" verbose="2"> - <test name="Category"> - <classes> - <class name="org.openecomp.sdc.ci.tests.execute.category.ElementsApiTest" /> - <class name="org.openecomp.sdc.ci.tests.execute.category.CategoriesTests"> - <methods> - <exclude name="importCategories" /> - <exclude name="getServiceCategoryHierarchySuccessFlow" /> - </methods> - </class> - <class name="org.openecomp.sdc.ci.tests.execute.category.CatalogDataApiTest" /> - <class name="org.openecomp.sdc.ci.tests.execute.category.GroupingTest" > - <methods> - <exclude name="createProductGroupForNonExistingCategory" /> - <exclude name="createProductGroupForNonExistingSunCategory" /> - <exclude name="getProductCategoryHierarchySuccessFlow" /> - </methods> - </class> - - <class name="org.openecomp.sdc.ci.tests.execute.category.SubCategoriesTest"> - <methods> - <exclude name="createProductSubCategoryForNonExistingCategory" /> - <exclude name="createResourceSubCategoryForNonExistingCategory" /> - <exclude name="getResourceCategoryHierarchySuccessFlow" /> - </methods> - </class> - </classes> - </test> <!-- Test --> - <test name="Distribution"> - <classes> - <class - name="org.openecomp.sdc.ci.tests.execute.distribution.AuthanticationTests" /> - <class - name="org.openecomp.sdc.ci.tests.execute.distribution.DistributionDownloadArtifactTest"> - <methods> - <exclude name="downloadServiceArtifact_ServiceVersionNotFound" /> - </methods> - </class> - </classes> - </test> <!-- Test --> - <test name="General"> - <classes> - <class - name="org.openecomp.sdc.ci.tests.execute.general.ManageEcompConsumerCredentials"> - <methods> - <exclude name="createEcompCredentialsByNoExistingIUser" /> - </methods> - </class> - <class name="org.openecomp.sdc.ci.tests.execute.general.FeProxyTest" /> - <class name="org.openecomp.sdc.ci.tests.execute.general.UuidTest" /> - </classes> - </test> - <test name="Resource"> - <classes> - <!-- <class - name="org.openecomp.sdc.ci.tests.execute.resource.SimultaneousApiTest" /> --> - <class - name="org.openecomp.sdc.ci.tests.execute.resource.ComponentRelationshipInVfTest"> - <methods> - <exclude name="associateOneOfTwoCPsToVl_ThenDiscocciate" /> - <exclude name="disassociateRelationInVfNotFound" /> - </methods> - </class> - <class - name="org.openecomp.sdc.ci.tests.execute.resource.UpdateResourceMetadataTest"> - <methods> - <exclude name="UpdateResourceCategory_negativeFlow" /> - </methods> - </class> - <class - name="org.openecomp.sdc.ci.tests.execute.resource.VFResourceInstanceNameCRUD"/> - <class - name="org.openecomp.sdc.ci.tests.execute.resource.VfComponentInstanceCRUDTest"> - <methods> - <exclude name="createAllAtomicInstancesTestGetReqCapAPI_suc" /> - <exclude name="createVfcInstance_UserIdIsEmpty" /> - </methods> - </class> - <class name="org.openecomp.sdc.ci.tests.execute.resource.ResourceApiTest" /> - <class - name="org.openecomp.sdc.ci.tests.execute.resource.ValidateExtendedVfData" /> - </classes> - </test> - <test name="Product"> - <classes> - <class - name="org.openecomp.sdc.ci.tests.execute.product.ProductUndoCheckoutTest"> - <methods> - <exclude name="undoCheckOutNotExist" /> - </methods> - </class> - <class - name="org.openecomp.sdc.ci.tests.execute.product.ProductComponentInstanceCRUDTest"> - <methods> - <exclude name="createServiceInstanceNameIsNull" /> - </methods> - </class> - <class - name="org.openecomp.sdc.ci.tests.execute.product.ChangeServiceInstanceVersionTest"> - <methods> - <exclude name="changeServiceInstanceVersionToNonExisitingServiceVersion" /> - </methods> - </class> - <class - name="org.openecomp.sdc.ci.tests.execute.product.ProductGetFollowedTest" /> - <class - name="org.openecomp.sdc.ci.tests.execute.product.ProductToscaYamlGenerationTest" /> - <class name="org.openecomp.sdc.ci.tests.execute.product.ProductCheckinTest"> - <methods> - <exclude name="checkInProductNotExist" /> - </methods> - </class> - <class name="org.openecomp.sdc.ci.tests.execute.product.ProductCheckoutTest" /> - <class name="org.openecomp.sdc.ci.tests.execute.product.ProductCrudTest"> - <methods> - <exclude name="updateProductDescriptionRemoveSpacesFromBeginning" /> - <exclude name="updateProductDescriptionRemoveSpacesFromTheEnd" /> - <exclude name="updateProductDescriptionValidCharacters02" /> - </methods> - </class> - <class - name="org.openecomp.sdc.ci.tests.execute.product.ProductCreateWithValidationsTest"> - <methods> - <exclude name="createProductDescriptionRemoveSpacesFromBeginning" /> - <exclude name="createProductDescriptionRemoveSpacesFromTheEnd" /> - <exclude name="createProductDescriptionValidCharacters01" /> - <exclude name="createProductDescriptionValidCharacters02" /> - </methods> - </class> - </classes> - </test> - <test name="Service"> - <classes> - <class - name="org.openecomp.sdc.ci.tests.execute.service.GetServiceLatestVersionTest" /> - <class - name="org.openecomp.sdc.ci.tests.execute.service.CreateServiceMetadataApiTest" /> - <class - name="org.openecomp.sdc.ci.tests.execute.service.ReqCapOccurrencesTest" /> - <class - name="org.openecomp.sdc.ci.tests.execute.service.ChangeServiceDistributionStatusApiTest"> - <methods> - <exclude name="approveCertifiedService_byDesigner" /> - <exclude name="approveCertifiedService_byOps" /> - <exclude name="approveCertifiedService_byTester" /> - <exclude - name="distributionStatusChange_approve_Reject_AprroveBysdncAdminDetails" /> - <exclude name="rejectCertifiedService_byDesigner" /> - <exclude name="rejectCertifiedService_byOps" /> - <exclude name="rejectCertifiedService_byTester" /> - <exclude name="rejectCertifiedService_bysdncAdminDetails" /> - <exclude name="rejectCertifiedService_bysdncGovernorDeatails" /> - <exclude name="rejectNotCertifiedService_checkedin" /> - <exclude name="rejectNotCertifiedService_checkeout" /> - <exclude name="rejectNotCertifiedService_inProgress" /> - <exclude name="rejectNotCertifiedService_readyForCer" /> - <exclude name="rejectServiceNotFound" /> - </methods> - </class> - <class - name="org.openecomp.sdc.ci.tests.execute.service.ServiceComponentInstanceCRUDTest"> - <methods> - <exclude name="associateAfterCheckoutAllInstancesTest" /> - <exclude name="associateAfterDeletingResourceTest" /> - <exclude name="associateDissociateTwoVFs" /> - <exclude name="associateInstancesInTwoServiceVersionsTest" /> - <exclude name="associateNotCompitableReqCapTest" /> - <exclude name="associateOnceAgainExistingRelationTest" /> - <exclude name="associateResourceInstanceToResourceInstanceNotFoundTest" /> - <exclude - name="associateTwoRelations_CheckinCheckout_DissoicateOneRelationInSecondVersion" /> - <exclude name="createResourceInstanceWithEmptyUserIdTest" /> - <exclude name="deleteNotFoundResourceInstanceTest" /> - <exclude name="deleteResourceInstanceWithEmptyUserIdTest" /> - <exclude name="dissociateOnceAgainTest" /> - <exclude name="dissociateRelationNotFoundTest" /> - <exclude name="dissoicateRelationWhileInstanceNotFound" /> - <exclude name="dissoicateWithEmptyUserIdHeaderTest" /> - <exclude name="relationDeletedAfterDeletingResourceInstanceTest" /> - </methods> - </class> - <class - name="org.openecomp.sdc.ci.tests.execute.service.UpdateServiceMetadataTest"> - <methods> - <exclude name="categoryValidationTest6" /> - <exclude name="categoryValidationTest7" /> - <exclude name="descriptionValidationTest11" /> - <exclude name="descriptionValidationTest12" /> - <exclude name="descriptionValidationTest13" /> - <exclude name="descriptionValidationTest7" /> - <exclude name="serviceNameValidationTest17" /> - <exclude name="updateCertifiedService" /> - <exclude name="updateCheckoutCertifiedService" /> - <exclude name="updateServiceByMethod_delete" /> - <exclude name="updateServiceByMethod_get" /> - <exclude name="updateServiceByMethod_post" /> - <exclude name="updateServiceNotExist" /> - </methods> - </class> - <class - name="org.openecomp.sdc.ci.tests.execute.service.GetAllServiceVersions" /> - </classes> - </test> - <test name="Artifacts"> - <classes> - <class - name="org.openecomp.sdc.ci.tests.execute.artifacts.DownloadComponentArt" /> - <class - name="org.openecomp.sdc.ci.tests.execute.artifacts.ArtifactServletTest" /> - <class - name="org.openecomp.sdc.ci.tests.execute.artifacts.ValidateHeatArtFieldsTypes" /> - <class - name="org.openecomp.sdc.ci.tests.execute.artifacts.PlaceHolderValidations" /> - <class - name="org.openecomp.sdc.ci.tests.execute.artifacts.ValidateArtResponse" /> - <class name="org.openecomp.sdc.ci.tests.execute.artifacts.CrudArt" /> - </classes> - </test> + <test name="Category"> + <classes> + <class name="org.openecomp.sdc.ci.tests.execute.category.CatalogDataApiTest"/> + <class name="org.openecomp.sdc.ci.tests.execute.category.GroupingTest"> + <methods> + <exclude name="createProductGroupForNonExistingCategory"/> + <exclude name="createProductGroupForNonExistingSunCategory"/> + <exclude name="getProductCategoryHierarchySuccessFlow"/> + </methods> + </class> + + <class name="org.openecomp.sdc.ci.tests.execute.category.SubCategoriesTest"> + <methods> + <exclude name="createProductSubCategoryForNonExistingCategory"/> + <exclude name="createResourceSubCategoryForNonExistingCategory"/> + <exclude name="getResourceCategoryHierarchySuccessFlow"/> + </methods> + </class> + </classes> + </test> <!-- Test --> + <test name="Distribution"> + <classes> + <class + name="org.openecomp.sdc.ci.tests.execute.distribution.AuthanticationTests"/> + <class + name="org.openecomp.sdc.ci.tests.execute.distribution.DistributionDownloadArtifactTest"> + <methods> + <exclude name="downloadServiceArtifact_ServiceVersionNotFound"/> + </methods> + </class> + </classes> + </test> <!-- Test --> + <test name="General"> + <classes> + <class name="org.openecomp.sdc.ci.tests.execute.general.FeProxyTest"/> + <class name="org.openecomp.sdc.ci.tests.execute.general.UuidTest"/> + </classes> + </test> + <test name="Resource"> + <classes> + <class name="org.openecomp.sdc.ci.tests.execute.resource.SimultaneousApiTest"/> + <class name="org.openecomp.sdc.ci.tests.execute.resource.UpdateResourceMetadataTest"> + <methods> + <exclude name="UpdateResourceCategory_negativeFlow"/> + </methods> + </class> + <class name="org.openecomp.sdc.ci.tests.execute.resource.VFResourceInstanceNameCRUD"/> + <class name="org.openecomp.sdc.ci.tests.execute.resource.ResourceApiTest"/> + <class + name="org.openecomp.sdc.ci.tests.execute.resource.ValidateExtendedVfData"/> + </classes> + </test> + <test name="Product"> + <classes> + <class + name="org.openecomp.sdc.ci.tests.execute.product.ProductUndoCheckoutTest"> + <methods> + <exclude name="undoCheckOutNotExist"/> + </methods> + </class> + <class + name="org.openecomp.sdc.ci.tests.execute.product.ProductGetFollowedTest"/> + <class + name="org.openecomp.sdc.ci.tests.execute.product.ProductToscaYamlGenerationTest"/> + <class name="org.openecomp.sdc.ci.tests.execute.product.ProductCheckinTest"> + <methods> + <exclude name="checkInProductNotExist"/> + </methods> + </class> + <class name="org.openecomp.sdc.ci.tests.execute.product.ProductCheckoutTest"/> + <class + name="org.openecomp.sdc.ci.tests.execute.product.ProductCreateWithValidationsTest"> + <methods> + <exclude name="createProductDescriptionRemoveSpacesFromBeginning"/> + <exclude name="createProductDescriptionRemoveSpacesFromTheEnd"/> + <exclude name="createProductDescriptionValidCharacters01"/> + <exclude name="createProductDescriptionValidCharacters02"/> + </methods> + </class> + </classes> + </test> + <test name="Service"> + <classes> + <class + name="org.openecomp.sdc.ci.tests.execute.service.ChangeServiceDistributionStatusApiTest"> + <methods> + <exclude name="approveCertifiedService_byDesigner"/> + <exclude name="approveCertifiedService_byOps"/> + <exclude name="approveCertifiedService_byTester"/> + <exclude + name="distributionStatusChange_approve_Reject_AprroveBysdncAdminDetails"/> + <exclude name="rejectCertifiedService_byDesigner"/> + <exclude name="rejectCertifiedService_byOps"/> + <exclude name="rejectCertifiedService_byTester"/> + <exclude name="rejectCertifiedService_bysdncAdminDetails"/> + <exclude name="rejectCertifiedService_bysdncGovernorDeatails"/> + <exclude name="rejectNotCertifiedService_checkedin"/> + <exclude name="rejectNotCertifiedService_checkeout"/> + <exclude name="rejectNotCertifiedService_inProgress"/> + <exclude name="rejectNotCertifiedService_readyForCer"/> + <exclude name="rejectServiceNotFound"/> + </methods> + </class> + <class name="org.openecomp.sdc.ci.tests.execute.service.GetAllServiceVersions"/> + </classes> + </test> + <test name="Artifacts"> + <classes> + <class name="org.openecomp.sdc.ci.tests.execute.artifacts.DownloadComponentArt"/> + <class name="org.openecomp.sdc.ci.tests.execute.artifacts.ValidateHeatArtFieldsTypes"/> + <class name="org.openecomp.sdc.ci.tests.execute.artifacts.PlaceHolderValidations"/> + </classes> + </test> </suite>
\ No newline at end of file diff --git a/test-apis-ci/src/main/resources/ci/testSuites/general.xml b/test-apis-ci/src/main/resources/ci/testSuites/general.xml index bd7e6b6650..a63f36423e 100644 --- a/test-apis-ci/src/main/resources/ci/testSuites/general.xml +++ b/test-apis-ci/src/main/resources/ci/testSuites/general.xml @@ -1,10 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd"> -<suite name="General" > +<suite name="General"> <test name="Test"> <classes> - <class name="org.openecomp.sdc.ci.tests.execute.general.SampleTest"/> - <class name="org.openecomp.sdc.ci.tests.execute.general.ManageEcompConsumerCredentials"/> <class name="org.openecomp.sdc.ci.tests.execute.general.UuidTest"/> </classes> </test> <!-- Test --> diff --git a/test-apis-ci/src/main/resources/ci/testSuites/imports.xml b/test-apis-ci/src/main/resources/ci/testSuites/imports.xml index ae4a5bc1f8..b9374cf47a 100644 --- a/test-apis-ci/src/main/resources/ci/testSuites/imports.xml +++ b/test-apis-ci/src/main/resources/ci/testSuites/imports.xml @@ -1,12 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd"> -<suite name="Imports" > +<suite name="Imports"> <test name="Imports"> <classes> - <class name="org.openecomp.sdc.ci.tests.execute.imports.ImportGenericResourceCITest"/> - <class name="org.openecomp.sdc.ci.tests.execute.imports.ImportCsarResourceTest"/> - <class name="org.openecomp.sdc.ci.tests.execute.imports.ImportNewResourceCITest"/> - <class name="org.openecomp.sdc.ci.tests.execute.imports.ImportToscaResourceTest"/> + <class name="org.openecomp.sdc.ci.tests.execute.imports.ImportGenericResourceCITest"/> </classes> </test> <!-- Test --> </suite> <!-- Imports --> diff --git a/test-apis-ci/src/main/resources/ci/testSuites/product.xml b/test-apis-ci/src/main/resources/ci/testSuites/product.xml index 4ea495d0d7..101b94a6bb 100644 --- a/test-apis-ci/src/main/resources/ci/testSuites/product.xml +++ b/test-apis-ci/src/main/resources/ci/testSuites/product.xml @@ -1,14 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd"> -<suite name="Product" > +<suite name="Product"> <test name="Test"> <classes> <class name="org.openecomp.sdc.ci.tests.execute.product.ProductLifecycleTest"/> <class name="org.openecomp.sdc.ci.tests.execute.product.ProductUndoCheckoutTest"/> <class name="org.openecomp.sdc.ci.tests.execute.product.ProductCheckinTest"/> <class name="org.openecomp.sdc.ci.tests.execute.product.ProductCheckoutTest"/> - <class name="org.openecomp.sdc.ci.tests.execute.product.ProductCrudTest"/> - <class name="org.openecomp.sdc.ci.tests.execute.product.ProductComponentInstanceCRUDTest"/> </classes> </test> <!-- Test --> </suite> <!-- Product --> diff --git a/test-apis-ci/src/main/resources/ci/testSuites/productAPIs.xml b/test-apis-ci/src/main/resources/ci/testSuites/productAPIs.xml index 61950e9de7..df9aa9f152 100644 --- a/test-apis-ci/src/main/resources/ci/testSuites/productAPIs.xml +++ b/test-apis-ci/src/main/resources/ci/testSuites/productAPIs.xml @@ -1,20 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd"> -<suite name="productAPIs" configfailurepolicy="continue" verbose="2" parallel="tests" thread-count="6"> +<suite name="productAPIs" configfailurepolicy="continue" verbose="2" parallel="tests" + thread-count="6"> <test name="Test"> <classes> - - <class name="org.openecomp.sdc.ci.tests.execute.product.ChangeServiceInstanceVersionTest"/> <class name="org.openecomp.sdc.ci.tests.execute.product.ProductCheckinTest"/> <class name="org.openecomp.sdc.ci.tests.execute.product.ProductCheckoutTest"/> - <class name="org.openecomp.sdc.ci.tests.execute.product.ProductComponentInstanceCRUDTest"/> <class name="org.openecomp.sdc.ci.tests.execute.product.ProductCreateWithValidationsTest"/> - <class name="org.openecomp.sdc.ci.tests.execute.product.ProductCrudTest"/> <class name="org.openecomp.sdc.ci.tests.execute.product.ProductGetFollowedTest"/> <class name="org.openecomp.sdc.ci.tests.execute.product.ProductUndoCheckoutTest"/> - - </classes> </test> <!-- Test --> </suite> <!-- Suite -->
\ No newline at end of file diff --git a/test-apis-ci/src/main/resources/ci/testSuites/resource.xml b/test-apis-ci/src/main/resources/ci/testSuites/resource.xml index 313fbb26db..4fd0e43a02 100644 --- a/test-apis-ci/src/main/resources/ci/testSuites/resource.xml +++ b/test-apis-ci/src/main/resources/ci/testSuites/resource.xml @@ -1,374 +1,123 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd"> -<suite name="Sanity" configfailurepolicy="continue" > - - <!-- - <listeners> - <listener class-name="org.openecomp.sdc.ci.tests.config.InvokedMethodListener" /> - </listeners> - --> - +<suite name="Sanity" configfailurepolicy="continue"> <test verbose="2" name="Sanity"> <classes> - <class name="org.openecomp.sdc.ci.tests.execute.artifacts.ArtifactServletTest"> - <methods> - <include name="upadteArtifactWithPayLoadToResourcseTest"/> - <include name="createAndUpdateArtifactToInterface"/> - </methods> - </class> - - <class name="org.openecomp.sdc.ci.tests.execute.artifacts.CrudArt"> - <methods> - <include name="addHeatArtifactToResourceAndCertify"/> - </methods> - </class> - - <class name="org.openecomp.sdc.ci.tests.execute.artifacts.LCS_Artifacts"> - <methods> - <include name="LCS_inherit_artifact"/> - </methods> - </class> - - <class name="org.openecomp.sdc.ci.tests.execute.artifacts.InformationalArt"> - <methods> - <include name="UpdateAllResourceMandatoryArtifacts"/> - <include name="updateInformationalArtifactMetadataOfResource"/> - </methods> - </class> - <class name="org.openecomp.sdc.ci.tests.execute.artifacts.InformationalArtCloudQuestionnaire"> - <methods> - <include name="updateMandatoryInformationalArtifact_CloudQuestionnaire"/> - </methods> - </class> - <class name="org.openecomp.sdc.ci.tests.execute.artifacts.ServiceApiArtifactTest"> - <methods> - <include name="uploadServiceApiArtifactSuccessfullyTest"/> - <include name="updateApiArtifactSuccessfullyTest"/> - <include name="deleteApiArtifactSuccessfully"/> - </methods> - </class> - <class name="org.openecomp.sdc.ci.tests.execute.artifacts.ServiceInformationalArtifact"> - <methods> - <include name="updateMandatoryInformationalArtifact_ServiceQuestionnaire"/> - </methods> - </class> - - <class name="org.openecomp.sdc.ci.tests.execute.artifacts.ValidateArtResponse"/> - - <class name="org.openecomp.sdc.ci.tests.execute.category.CatalogDataApiTest"/> - - <class name="org.openecomp.sdc.ci.tests.execute.category.ElementsApiTest"> - <methods> - <include name="getAllArtifactTypes"/> - <include name="getConfiguration"/> - <include name="getAllPropertyScopesSuccess"/> - </methods> - </class> - <class name="org.openecomp.sdc.ci.tests.execute.distribution.AuthanticationTests"> - <methods> - <include name="downloadServiceArtifactSuccessWithAutantication"/> - </methods> - </class> - <class name="org.openecomp.sdc.ci.tests.execute.distribution.DistributionDownloadArtifactTest"> - <methods> - <include name="downloadResourceArtifactSuccess"/> - </methods> - </class> - - <class name="org.openecomp.sdc.ci.tests.execute.general.BasicHttpAuthenticationTest"> - <methods> - <include name="sendAuthenticatedRequestTest_success"/> - </methods> - </class> - - - - <class name="org.openecomp.sdc.ci.tests.execute.general.FeProxyTest"/> - <class name="org.openecomp.sdc.ci.tests.execute.general.ManageEcompConsumerCredentials"> - <methods> - <include name="deleteEcompCredentialsMethodDelete"/> - </methods> - </class> - <class name="org.openecomp.sdc.ci.tests.execute.general.UuidTest"> - <methods> - <include name="testE2EUuidHeaderReturnedAndPreserved"/> - </methods> - </class> - - <class name="org.openecomp.sdc.ci.tests.execute.imports.ImportGenericResourceCITest"> - <methods> - <include name="importAllTestResources"/> - <include name="testImportCheckoutAndUpdateUserResource"/> - <include name="testImportWithUpdateNormativeType"/> - </methods> - </class> - <class name="org.openecomp.sdc.ci.tests.execute.imports.ImportNewResourceCITest"> - <methods> - <include name="importAllTestResources_toValidateNewAPI"/> - </methods> - </class> - - <class name="org.openecomp.sdc.ci.tests.execute.imports.ImportToscaResourceTest"> - <methods> - <include name="importToscaResource"/> - </methods> - </class> - - <class name="org.openecomp.sdc.ci.tests.execute.lifecycle.CleanupIntermediateReources"> - <methods> - <include name="test28"/> - <include name="test29"/> - <include name="test30"/> - </methods> - </class> - - <class name="org.openecomp.sdc.ci.tests.execute.lifecycle.CleanupIntermediateServicesTest"> - <methods> - <include name="testCleanupIntermediateServices"/> - </methods> - </class> - - - <class name="org.openecomp.sdc.ci.tests.execute.lifecycle.ResourceLCS_cerificationCITest"> - <methods> - <include name="verifyAllPrevVerDeleted"/> - <include name="verifyStartWithDesignerCertByAdmin"/> - </methods> - </class> - - <class name="org.openecomp.sdc.ci.tests.execute.lifecycle.ResourceLCS_CheckInCITest"> - <methods> - <include name="checkInTest_suc"/> - </methods> - </class> - - <class name="org.openecomp.sdc.ci.tests.execute.lifecycle.ResourceLCS_CheckOutCITest"> - <methods> - <include name="checkOutTest_currState_READY_FOR_CERTIFICATION_ownerDSIGNER_performByADMIN_suc"/> - </methods> - </class> - - <class name="org.openecomp.sdc.ci.tests.execute.lifecycle.ResourceLCS_request4CerCITest"> - <methods> - <include name="req4cer_fromCheckOut_designer_admin"/> - </methods> - </class> + <class name="org.openecomp.sdc.ci.tests.execute.category.CatalogDataApiTest"/> + + <class name="org.openecomp.sdc.ci.tests.execute.distribution.AuthanticationTests"> + <methods> + <include name="downloadServiceArtifactSuccessWithAutantication"/> + </methods> + </class> + + <class + name="org.openecomp.sdc.ci.tests.execute.distribution.DistributionDownloadArtifactTest"> + <methods> + <include name="downloadResourceArtifactSuccess"/> + </methods> + </class> + + <class name="org.openecomp.sdc.ci.tests.execute.general.FeProxyTest"/> + + <class name="org.openecomp.sdc.ci.tests.execute.general.UuidTest"> + <methods> + <include name="testE2EUuidHeaderReturnedAndPreserved"/> + </methods> + </class> + + <class name="org.openecomp.sdc.ci.tests.execute.imports.ImportGenericResourceCITest"> + <methods> + <include name="importAllTestResources"/> + <include name="testImportCheckoutAndUpdateUserResource"/> + <include name="testImportWithUpdateNormativeType"/> + </methods> + </class> + + <class name="org.openecomp.sdc.ci.tests.execute.property.AdditionalInformationServletTest"> + <methods> + <include name="createResourceAdditionalInformationTestDuringLifecycle"/> + <include name="updateResourceAdditionalInformationTest"/> + <include name="deleteResourceAdditionalInformationTest"/> + </methods> + </class> + + <class name="org.openecomp.sdc.ci.tests.execute.property.PropertyApisTest"> + <methods> + <include name="testPropertyApis"/> + </methods> + </class> + + <class name="org.openecomp.sdc.ci.tests.execute.resource.GetAllResourceVersions"> + <methods> + <include name="getResourceAllVersions_version15"/> + </methods> + </class> - - <class name="org.openecomp.sdc.ci.tests.execute.lifecycle.ResourceLCS_StartCertificationCITest"> - <methods> - <include name="startCer_suc"/> - </methods> - </class> + <class name="org.openecomp.sdc.ci.tests.execute.resource.ResourceApiTest"> + <methods> + <include name="updateResourceMetadataSuccess"/> + </methods> + </class> - <class name="org.openecomp.sdc.ci.tests.execute.lifecycle.ResourceLCS_UndoCheckOutCITest"> - <methods> - <include name="undoCheckOutTest_import_outAdmin_undoOut_designer"/> - </methods> - </class> - - <class name="org.openecomp.sdc.ci.tests.execute.lifecycle.ServiceCertWithMandatoryArt"> - <methods> - <include name="CertServiceWithHeatDeployArtOnResource"/> - </methods> - </class> + <class name="org.openecomp.sdc.ci.tests.execute.resource.UpdateResourceMetadataTest"> + <methods> + <include name="UpdateDerivedFromSuccess"/> + </methods> + </class> - <class name="org.openecomp.sdc.ci.tests.execute.lifecycle.ServiceCertWithResourceInstances"> - <methods> - <include name="certServiceWithCertResource"/> - </methods> - </class> - - <class name="org.openecomp.sdc.ci.tests.execute.property.AdditionalInformationServletTest"> - <methods> - <include name="createResourceAdditionalInformationTestDuringLifecycle"/> - <include name="updateResourceAdditionalInformationTest"/> - <include name="deleteResourceAdditionalInformationTest"/> - </methods> - </class> - - <class name="org.openecomp.sdc.ci.tests.execute.property.PropertyApisTest"> - <methods> - <include name="testPropertyApis"/> - </methods> - </class> - - <class name="org.openecomp.sdc.ci.tests.execute.property.PropertyServletTest"> - <methods> - <include name="createCascadeVfResource"/> - <include name="createPropertyTestSetClearDefaultValueInetegr"/> - </methods> - </class> - - - <class name="org.openecomp.sdc.ci.tests.execute.resource.GetAllLatestVersionNonAbstarctResources"> - <methods> - <include name="resourceCertifiedTwiceCoutCinCout"/> - </methods> - </class> - - <class name="org.openecomp.sdc.ci.tests.execute.resource.GetAllResourceVersions"> - <methods> - <include name="getResourceAllVersions_version15"/> - </methods> - </class> - - <class name="org.openecomp.sdc.ci.tests.execute.resource.GetFollwedElementsTest"> - <methods> - <include name="getResourcesListBolongsToSpecificDesigner"/> - </methods> - </class> - - <class name="org.openecomp.sdc.ci.tests.execute.resource.GetResourceAbstractApiTest"> - <methods> - <include name="getAbstractResourceList"/> - </methods> - </class> - - <class name="org.openecomp.sdc.ci.tests.execute.resource.GetResourceNotAbstractApiTest"> - <methods> - <include name="getNotAbstractResourceList"/> - </methods> - </class> + <class name="org.openecomp.sdc.ci.tests.execute.service.GetComponentAuditApiTest"> + <methods> + <include name="testServiceAuditCertifiedVersion"/> + </methods> + </class> - <class name="org.openecomp.sdc.ci.tests.execute.resource.GetResourceTagsApiTest"> - <methods> - <include name="getModifiedResourceTagsList"/> - </methods> - </class> - - <class name="org.openecomp.sdc.ci.tests.execute.resource.ResourceApiTest"> - <methods> - <include name="updateResourceMetadataSuccess"/> - </methods> - </class> - <!-- - <class name="org.openecomp.sdc.ci.tests.execute.resource.ResourceInstanceNameCRUD"> - <methods> - <include name="updateResourceInstanceNameAfterServiceCertification"/> - </methods> - </class> - --> -<!-- <class name="org.openecomp.sdc.ci.tests.execute.resource.ResourceInstanceServletTest"> - <methods> - <include name="updateRI_suc"/> - </methods> - </class> --> + <class name="org.openecomp.sdc.ci.tests.execute.user.ActivateDeActivateDeleteUser"> + <methods> + <include name="authorizeDeActivatedUser"/> + </methods> + </class> - <class name="org.openecomp.sdc.ci.tests.execute.resource.UpdateResourceMetadataTest"> - <methods> - <include name="UpdateDerivedFromSuccess"/> - </methods> - </class> - + <!-- Product tests start--> + <class name="org.openecomp.sdc.ci.tests.execute.product.ProductCheckinTest"> + <methods> + <include name="checkInProductByCreator"/> + </methods> + </class> - <class name="org.openecomp.sdc.ci.tests.execute.service.GetComponentAuditApiTest"> - <methods> - <include name="testServiceAuditCertifiedVersion"/> - </methods> - </class> - - <class name="org.openecomp.sdc.ci.tests.execute.service.ServiceApiTest"> - <methods> - <include name="createServiceTest"/> - <include name="getFollowedServicesTester"/> - </methods> - </class> - - <class name="org.openecomp.sdc.ci.tests.execute.service.ServiceInformationalArtifactApiTest"> - <methods> - <include name="addArtifactSuccessfuly"/> - <include name="deleteArtifact"/> - <include name="updateArtifactMetadataSuccessfully"/> - </methods> - </class> - - <class name="org.openecomp.sdc.ci.tests.execute.service.UpdateServiceMetadataTest"> - <methods> - <include name="updateServiceSuccessfully"/> - </methods> - </class> + <class name="org.openecomp.sdc.ci.tests.execute.product.ProductCheckoutTest"> + <methods> + <include name="checkOutProductByPmNotInContacts"/> + </methods> + </class> - - <class name="org.openecomp.sdc.ci.tests.execute.user.ActivateDeActivateDeleteUser"> - <methods> - <include name="authorizeDeActivatedUser"/> - </methods> - </class> - - <class name="org.openecomp.sdc.ci.tests.execute.user.CreateUserApiTest"> - <methods> - <include name="createUser"/> - </methods> - </class> - - <class name="org.openecomp.sdc.ci.tests.execute.user.GovernorWorkspaceApiTest"> - <methods> - <include name="governorList_AllCertifiedVersionsOfService"/> - </methods> - </class> - - <class name="org.openecomp.sdc.ci.tests.execute.user.OpsWorkspaceApiTest"> - <methods> - <include name="opsList_AllCertifiedVersionsOfServiceApproved"/> - </methods> - </class> - - <!-- Product tests start--> - <class name="org.openecomp.sdc.ci.tests.execute.product.ProductCheckinTest"> - <methods> - <include name="checkInProductByCreator"/> - </methods> - </class> - <class name="org.openecomp.sdc.ci.tests.execute.product.ChangeServiceInstanceVersionTest"> - <methods> - <include name="changeServiceInstanceVersionByPm"/> - </methods> - </class> - <class name="org.openecomp.sdc.ci.tests.execute.product.ProductCheckoutTest"> - <methods> - <include name="checkOutProductByPmNotInContacts"/> - </methods> - </class> - <class name="org.openecomp.sdc.ci.tests.execute.product.ProductComponentInstanceCRUDTest"> - <methods> - <include name="createServiceInstanceTest"/> - <include name="deleteServiceInstanceByPm"/> - <include name="updateServiceInstanceNameByPm"/> - </methods> - </class> - <class name="org.openecomp.sdc.ci.tests.execute.product.ProductCrudTest"> - <methods> - <include name="createManyGroupingsDiffCategories"/> - </methods> - </class> - <class name="org.openecomp.sdc.ci.tests.execute.product.ProductGetFollowedTest"> - <methods> - <include name="followedPageTest"/> - </methods> - </class> - <class name="org.openecomp.sdc.ci.tests.execute.product.ProductUndoCheckoutTest"> - <methods> - <include name="undoCheckOutProductByPm"/> - </methods> - </class> - <class name="org.openecomp.sdc.ci.tests.execute.interfaceoperation.InterfaceOperationsTest"> - <methods> - <include name="addInterfaceOperationsOfGlobalTypeOnResource"/> - <include name="addInterfaceOperationsOnResource"/> - <include name="getInterfaceOperationsFromResource"/> - <include name="updateInterfaceOperationsOnResource"/> - <include name="deleteInterfaceOperationsFromResource"/> - <include name="addInterfaceOperationsOfGlobalTypeOnPNFResource"/> - <include name="addInterfaceOperationsOnPNFResource"/> - <include name="getInterfaceOperationsFromPNFResource"/> - <include name="updateInterfaceOperationsOnPNFResource"/> - <include name="deleteInterfaceOperationsFromPNFResource"/> - </methods> - </class> - <!-- Product tests end--> - </classes> + <class name="org.openecomp.sdc.ci.tests.execute.product.ProductGetFollowedTest"> + <methods> + <include name="followedPageTest"/> + </methods> + </class> + <class name="org.openecomp.sdc.ci.tests.execute.product.ProductUndoCheckoutTest"> + <methods> + <include name="undoCheckOutProductByPm"/> + </methods> + </class> + <class name="org.openecomp.sdc.ci.tests.execute.interfaceoperation.InterfaceOperationsTest"> + <methods> + <include name="addInterfaceOperationsOfGlobalTypeOnResource"/> + <include name="addInterfaceOperationsOnResource"/> + <include name="getInterfaceOperationsFromResource"/> + <include name="updateInterfaceOperationsOnResource"/> + <include name="deleteInterfaceOperationsFromResource"/> + <include name="addInterfaceOperationsOfGlobalTypeOnPNFResource"/> + <include name="addInterfaceOperationsOnPNFResource"/> + <include name="getInterfaceOperationsFromPNFResource"/> + <include name="updateInterfaceOperationsOnPNFResource"/> + <include name="deleteInterfaceOperationsFromPNFResource"/> + </methods> + </class> + <!-- Product tests end--> + </classes> </test> <!-- Test --> </suite> <!-- Sanity --> diff --git a/test-apis-ci/src/main/resources/ci/testSuites/sanity.xml b/test-apis-ci/src/main/resources/ci/testSuites/sanity.xml index f642170b34..320c3ccd43 100644 --- a/test-apis-ci/src/main/resources/ci/testSuites/sanity.xml +++ b/test-apis-ci/src/main/resources/ci/testSuites/sanity.xml @@ -2,393 +2,227 @@ <!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd"> <suite name="Sanity" configfailurepolicy="continue" verbose="2"> - <test name="sanityE2Eflows"> - <classes> - <class name="org.openecomp.sdc.ci.tests.sanity.CrudE2E" /> - </classes> - </test> - - <test name="General"> - <classes> - <class - name="org.openecomp.sdc.ci.tests.execute.general.BasicHttpAuthenticationTest"> - <methods> - <include name="sendAuthenticatedRequestTest_success" /> - </methods> - </class> - <class name="org.openecomp.sdc.ci.tests.execute.general.FeProxyTest" /> - <class - name="org.openecomp.sdc.ci.tests.execute.general.ManageEcompConsumerCredentials"> - <methods> - <include name="deleteEcompCredentialsMethodDelete" /> - </methods> - </class> - <class name="org.openecomp.sdc.ci.tests.execute.general.UuidTest"> - <methods> - <include name="testE2EUuidHeaderReturnedAndPreserved" /> - </methods> - </class> - </classes> - </test> - - <test name="ArtifactOnInstance"> - <classes> - <class - name="org.openecomp.sdc.ci.tests.execute.artifacts.CrudArt"> - <methods> - <include name="addDcaeInventoryToscaArtifactToResourceInstanceAndCertify" /> - <include name="addDcaeInventoryJsonArtifactToResourceInstanceAndCertify" /> - <include name="addDcaeInventoryPolicyArtifactToResourceInstanceAndCertify" /> - <include name="addDcaeInventoryDocArtifactToResourceInstanceAndCertify" /> - <include name="addDcaeInventoryBluePrintArtifactToResourceInstanceAndCertify" /> - <include name="addDcaeInventoryEventArtifactToResourceInstanceAndCertify" /> - <include name="updateArtifactDescriptionToResourceInstance" /> - <include name="deleteArtifactToResourceInstance" /> - </methods> - </class> - </classes> - </test> - - <test name="Artifact"> - <classes> - <class - name="org.openecomp.sdc.ci.tests.execute.artifacts.ArtifactServletTest"> - <methods> - <include name="upadteArtifactWithPayLoadToResourcseTest" /> - <include name="createAndUpdateArtifactToInterface" /> - </methods> - </class> - - <class name="org.openecomp.sdc.ci.tests.execute.artifacts.CrudArt"> - <methods> - <include name="addHeatArtifactToResourceAndCertify" /> - </methods> - </class> - - <!-- <class name="org.openecomp.sdc.ci.tests.execute.artifacts.LCS_Artifacts"> - <methods> <include name="LCS_inherit_artifact" /> </methods> </class> --> - - <!-- <class name="org.openecomp.sdc.ci.tests.execute.artifacts.InformationalArt"> - <methods> <include name="UpdateAllResourceMandatoryArtifacts" /> <include - name="updateInformationalArtifactMetadataOfResource" /> </methods> </class> - <class name="org.openecomp.sdc.ci.tests.execute.artifacts.InformationalArtCloudQuestionnaire"> - <methods> <include name="updateMandatoryInformationalArtifact_CloudQuestionnaire" - /> </methods> </class> --> - <!-- <class name="org.openecomp.sdc.ci.tests.execute.artifacts.ServiceApiArtifactTest"> - <methods> <include name="uploadServiceApiArtifactSuccessfullyTest" /> <include - name="updateApiArtifactSuccessfullyTest" /> <include name="deleteApiArtifactSuccessfully" - /> </methods> </class> --> - <!-- <class name="org.openecomp.sdc.ci.tests.execute.artifacts.ServiceInformationalArtifact"> - <methods> <include name="updateMandatoryInformationalArtifact_ServiceQuestionnaire" - /> </methods> </class> --> - - <class name="org.openecomp.sdc.ci.tests.execute.artifacts.ValidateArtResponse" /> - - - <class - name="org.openecomp.sdc.ci.tests.execute.artifacts.DownloadComponentArt"> - <methods> - <include name="downloadArtifactFromResourceTest" /> - <include name="downloadArtifactFromServiceTest" /> - </methods> - </class> - </classes> - </test> - - <test name="Service"> - <classes> - <class - name="org.openecomp.sdc.ci.tests.execute.service.GetComponentAuditApiTest"> - <methods> - <include name="testServiceAuditCertifiedVersion" /> - </methods> - </class> - - <!-- <class name="org.openecomp.sdc.ci.tests.execute.service.ServiceApiTest"> - <methods> <include name="createServiceTest" /> <include name="getFollowedServicesTester" - /> </methods> </class> --> - - <!-- <class name="org.openecomp.sdc.ci.tests.execute.service.ServiceInformationalArtifactApiTest"> - <methods> <include name="addArtifactSuccessfuly" /> <include name="deleteArtifact" - /> <include name="updateArtifactMetadataSuccessfully" /> </methods> </class> --> - - <class - name="org.openecomp.sdc.ci.tests.execute.service.UpdateServiceMetadataTest"> - <methods> - <include name="updateServiceSuccessfully" /> - </methods> - </class> - </classes> - </test> - - <test name="Resource"> - <classes> - <!-- <class name="org.openecomp.sdc.ci.tests.execute.resource.GetAllLatestVersionNonAbstarctResources"> - <methods> <include name="resourceCertifiedTwiceCoutCinCout" /> </methods> - </class> --> - - <class - name="org.openecomp.sdc.ci.tests.execute.resource.GetAllResourceVersions"> - <methods> - <include name="getResourceAllVersions_version15" /> - </methods> - </class> - - <!-- <class name="org.openecomp.sdc.ci.tests.execute.resource.GetFollwedElementsTest"> - <methods> <include name="getResourcesListBolongsToSpecificDesigner" /> </methods> - </class> --> - - <!-- <class name="org.openecomp.sdc.ci.tests.execute.resource.GetResourceAbstractApiTest"> - <methods> <include name="getAbstractResourceList" /> </methods> </class> --> - - <class - name="org.openecomp.sdc.ci.tests.execute.resource.GetResourceNotAbstractApiTest"> - <methods> - <include name="getNotAbstractResourceList" /> - </methods> - </class> - - <!-- <class name="org.openecomp.sdc.ci.tests.execute.resource.GetResourceTagsApiTest"> - <methods> <include name="getModifiedResourceTagsList" /> </methods> </class> --> - - <class name="org.openecomp.sdc.ci.tests.execute.resource.ResourceApiTest"> - <methods> - <include name="updateResourceMetadataSuccess" /> - </methods> - </class> - <!-- <class name="org.openecomp.sdc.ci.tests.execute.resource.ResourceInstanceNameCRUD"> - <methods> <include name="updateResourceInstanceNameAfterServiceCertification"/> - </methods> </class> --> - <!-- <class name="org.openecomp.sdc.ci.tests.execute.resource.ResourceInstanceServletTest"> - <methods> <include name="updateRI_suc"/> </methods> </class> --> - - <class - name="org.openecomp.sdc.ci.tests.execute.resource.UpdateResourceMetadataTest"> - <methods> - <include name="UpdateDerivedFromSuccess" /> - </methods> - </class> - </classes> - </test> - <test name="Product"> - <classes> - <class name="org.openecomp.sdc.ci.tests.execute.product.ProductCheckinTest"> - <methods> - <include name="checkInProductByCreator" /> - </methods> - </class> - <class - name="org.openecomp.sdc.ci.tests.execute.product.ChangeServiceInstanceVersionTest"> - <methods> - <include name="changeServiceInstanceVersionByPm" /> - </methods> - </class> - <class name="org.openecomp.sdc.ci.tests.execute.product.ProductCheckoutTest"> - <methods> - <include name="checkOutProductByPmNotInContacts" /> - </methods> - </class> - <class - name="org.openecomp.sdc.ci.tests.execute.product.ProductComponentInstanceCRUDTest"> - <methods> - <include name="createServiceInstanceTest" /> - <include name="deleteServiceInstanceByPm" /> - <include name="updateServiceInstanceNameByPm" /> - </methods> - </class> - <class name="org.openecomp.sdc.ci.tests.execute.product.ProductCrudTest"> - <methods> - <include name="createManyGroupingsDiffCategories" /> - </methods> - </class> - <class - name="org.openecomp.sdc.ci.tests.execute.product.ProductGetFollowedTest"> - <methods> - <include name="followedPageTest" /> - </methods> - </class> - <class - name="org.openecomp.sdc.ci.tests.execute.product.ProductUndoCheckoutTest"> - <methods> - <include name="undoCheckOutProductByPm" /> - </methods> - </class> - <!-- Product tests end --> - </classes> - </test> - <test name="Catalog"> - <classes> - <class name="org.openecomp.sdc.ci.tests.execute.category.CatalogDataApiTest" /> - </classes> - </test> - - <test name="distribution"> - <classes> - <class - name="org.openecomp.sdc.ci.tests.execute.distribution.AuthanticationTests"> - <methods> - <include name="downloadServiceArtifactSuccessWithAutantication" /> - </methods> - </class> - - <class - name="org.openecomp.sdc.ci.tests.execute.distribution.DistributionDownloadArtifactTest"> - <methods> - <include name="downloadResourceArtifactSuccess" /> - </methods> - </class> - </classes> - </test> - - <test name="Category"> - <classes> - <class name="org.openecomp.sdc.ci.tests.execute.category.ElementsApiTest"> - <methods> - <include name="getAllArtifactTypes" /> - <include name="getConfiguration" /> - <include name="getAllPropertyScopesSuccess" /> - </methods> - </class> - </classes> - </test> - - <test name="Imports"> - <classes> - <class - name="org.openecomp.sdc.ci.tests.execute.imports.ImportGenericResourceCITest"> - <methods> - <include name="importAllTestResources" /> - <include name="testImportCheckoutAndUpdateUserResource" /> - <include name="testImportWithUpdateNormativeType" /> - </methods> - </class> - <class - name="org.openecomp.sdc.ci.tests.execute.imports.ImportNewResourceCITest"> - <methods> - <include name="importAllTestResources_toValidateNewAPI" /> - </methods> - </class> - - <class - name="org.openecomp.sdc.ci.tests.execute.imports.ImportToscaResourceTest"> - <methods> - <include name="importToscaResource" /> - </methods> - </class> - <class - name="org.openecomp.sdc.ci.tests.execute.imports.ImportToscaCapabilitiesWithProperties"> - <methods> - <include name="importNodeTypeWithCapabilityWithPropertiesFromYmlSucceed" /> - <include name="importResourceWithCapabilityWithPropertiesOverridingCapTypePropertiesSucceed" /> - </methods> - </class> - </classes> - </test> <!-- Test --> - - <test name="attribute"> - <classes> - <class - name="org.openecomp.sdc.ci.tests.execute.attribute.ComponentInstanceAttributeTest"> - <methods> - <include name="testUpdateAttributeOnResourceInstance" /> - </methods> - </class> - </classes> - </test> - - <test name="inputs"> - <classes> - <class - name="org.openecomp.sdc.ci.tests.execute.inputs.InputsApiTests"> - <methods> - <include name="testInputsMainFunctionality" /> - </methods> - </class> - </classes> - </test> - - <test name="property"> - <classes> - <class - name="org.openecomp.sdc.ci.tests.execute.property.AdditionalInformationServletTest"> - <methods> - <include name="createResourceAdditionalInformationTestDuringLifecycle" /> - <include name="updateResourceAdditionalInformationTest" /> - <include name="deleteResourceAdditionalInformationTest" /> - </methods> - </class> - - <class name="org.openecomp.sdc.ci.tests.execute.property.PropertyApisTest"> - <methods> - <include name="testPropertyApis" /> - </methods> - </class> - <class name="org.openecomp.sdc.ci.tests.execute.property.ComponentInstancePropertyTest"> - <methods> - <include name="nestedVfResourceProperty3Levels" /> - </methods> - </class> - - - - <!-- <class name="org.openecomp.sdc.ci.tests.execute.property.PropertyServletTest"> - <methods> <include name="createCascadeVfResource" /> <include name="createPropertyTestSetClearDefaultValueInetegr" - /> </methods> </class> --> - </classes> - </test> - - <test name="User"> - <classes> - - <!-- class - name="org.openecomp.sdc.ci.tests.execute.user.ActivateDeActivateDeleteUser"> - <methods> - <include name="authorizeDeActivatedUser" /> - </methods> - </class--> - - <class name="org.openecomp.sdc.ci.tests.execute.user.CreateUserApiTest"> - <methods> - <include name="createUser" /> - </methods> - </class> - - <class - name="org.openecomp.sdc.ci.tests.execute.user.GovernorWorkspaceApiTest"> - <methods> - <include name="governorList_AllCertifiedVersionsOfService" /> - </methods> - </class> - - </classes> - </test> - - <test name="ExternalApis"> - <classes> - <class name="org.openecomp.sdc.externalApis.GetAssetServlet" > - <methods> - <include name="getResourceAssetSuccess" /> - </methods> - </class> - <class name="org.openecomp.sdc.externalApis.GetFilteredAssetServlet"> - <methods> - <include name="getResourceAssetBySpecifiedCategoryAndSubCategory" /> - <include name="getServiceAssetBySpecifiedCategoryAndDistributionStatus" /> - </methods> - </class> - <class name="org.openecomp.sdc.externalApis.GetSpecificAssetMetadataServlet"> - <methods> - <include name="getResourceAssetMetadataWithResourceInstancesSuccess" /> - <include name="getServiceAssetMetadataWithCertifiedResourceInstancesAndArtifactsOnRIsAndServiceSuccess" /> - </methods> - </class> - </classes> - </test> - - - - - - - -</suite>
\ No newline at end of file + <test name="sanityE2Eflows"> + <classes> + <class name="org.openecomp.sdc.ci.tests.sanity.CrudE2E"/> + </classes> + </test> + + <test name="General"> + <classes> + <class name="org.openecomp.sdc.ci.tests.execute.general.FeProxyTest"/> + <class name="org.openecomp.sdc.ci.tests.execute.general.UuidTest"> + <methods> + <include name="testE2EUuidHeaderReturnedAndPreserved"/> + </methods> + </class> + </classes> + </test> + + <test name="ArtifactOnInstance"> + <classes> + </classes> + </test> + + <test name="Artifact"> + <classes> + <class + name="org.openecomp.sdc.ci.tests.execute.artifacts.DownloadComponentArt"> + <methods> + <include name="downloadArtifactFromResourceTest"/> + <include name="downloadArtifactFromServiceTest"/> + </methods> + </class> + </classes> + </test> + + <test name="Service"> + <classes> + <class + name="org.openecomp.sdc.ci.tests.execute.service.GetComponentAuditApiTest"> + <methods> + <include name="testServiceAuditCertifiedVersion"/> + </methods> + </class> + + </classes> + </test> + + <test name="Resource"> + <classes> + <class + name="org.openecomp.sdc.ci.tests.execute.resource.GetAllResourceVersions"> + <methods> + <include name="getResourceAllVersions_version15"/> + </methods> + </class> + + <class name="org.openecomp.sdc.ci.tests.execute.resource.ResourceApiTest"> + <methods> + <include name="updateResourceMetadataSuccess"/> + </methods> + </class> + + <class + name="org.openecomp.sdc.ci.tests.execute.resource.UpdateResourceMetadataTest"> + <methods> + <include name="UpdateDerivedFromSuccess"/> + </methods> + </class> + </classes> + </test> + <test name="Product"> + <classes> + <class name="org.openecomp.sdc.ci.tests.execute.product.ProductCheckinTest"> + <methods> + <include name="checkInProductByCreator"/> + </methods> + </class> + <class name="org.openecomp.sdc.ci.tests.execute.product.ProductCheckoutTest"> + <methods> + <include name="checkOutProductByPmNotInContacts"/> + </methods> + </class> + <class + name="org.openecomp.sdc.ci.tests.execute.product.ProductGetFollowedTest"> + <methods> + <include name="followedPageTest"/> + </methods> + </class> + <class + name="org.openecomp.sdc.ci.tests.execute.product.ProductUndoCheckoutTest"> + <methods> + <include name="undoCheckOutProductByPm"/> + </methods> + </class> + <!-- Product tests end --> + </classes> + </test> + <test name="Catalog"> + <classes> + <class name="org.openecomp.sdc.ci.tests.execute.category.CatalogDataApiTest"/> + </classes> + </test> + + <test name="distribution"> + <classes> + <class + name="org.openecomp.sdc.ci.tests.execute.distribution.AuthanticationTests"> + <methods> + <include name="downloadServiceArtifactSuccessWithAutantication"/> + </methods> + </class> + + <class + name="org.openecomp.sdc.ci.tests.execute.distribution.DistributionDownloadArtifactTest"> + <methods> + <include name="downloadResourceArtifactSuccess"/> + </methods> + </class> + </classes> + </test> + + <test name="Category"> + <classes> + </classes> + </test> + + <test name="Imports"> + <classes> + <class + name="org.openecomp.sdc.ci.tests.execute.imports.ImportGenericResourceCITest"> + <methods> + <include name="importAllTestResources"/> + <include name="testImportCheckoutAndUpdateUserResource"/> + <include name="testImportWithUpdateNormativeType"/> + </methods> + </class> + <class + name="org.openecomp.sdc.ci.tests.execute.imports.ImportToscaCapabilitiesWithProperties"> + <methods> + <include name="importNodeTypeWithCapabilityWithPropertiesFromYmlSucceed"/> + <include + name="importResourceWithCapabilityWithPropertiesOverridingCapTypePropertiesSucceed"/> + </methods> + </class> + </classes> + </test> <!-- Test --> + + <test name="attribute"> + <classes> + <class + name="org.openecomp.sdc.ci.tests.execute.attribute.ComponentInstanceAttributeTest"> + <methods> + <include name="testUpdateAttributeOnResourceInstance"/> + </methods> + </class> + </classes> + </test> + + <test name="inputs"> + <classes> + <class + name="org.openecomp.sdc.ci.tests.execute.inputs.InputsApiTests"> + <methods> + <include name="testInputsMainFunctionality"/> + </methods> + </class> + </classes> + </test> + + <test name="property"> + <classes> + <class + name="org.openecomp.sdc.ci.tests.execute.property.AdditionalInformationServletTest"> + <methods> + <include name="createResourceAdditionalInformationTestDuringLifecycle"/> + <include name="updateResourceAdditionalInformationTest"/> + <include name="deleteResourceAdditionalInformationTest"/> + </methods> + </class> + + <class name="org.openecomp.sdc.ci.tests.execute.property.PropertyApisTest"> + <methods> + <include name="testPropertyApis"/> + </methods> + </class> + <class name="org.openecomp.sdc.ci.tests.execute.property.ComponentInstancePropertyTest"> + <methods> + <include name="nestedVfResourceProperty3Levels"/> + </methods> + </class> + + </classes> + </test> + + <test name="User"> + <classes> + + </classes> + </test> + + <test name="ExternalApis"> + <classes> + <class name="org.openecomp.sdc.externalApis.GetAssetServlet"> + <methods> + <include name="getResourceAssetSuccess"/> + </methods> + </class> + <class name="org.openecomp.sdc.externalApis.GetFilteredAssetServlet"> + <methods> + <include name="getResourceAssetBySpecifiedCategoryAndSubCategory"/> + <include name="getServiceAssetBySpecifiedCategoryAndDistributionStatus"/> + </methods> + </class> + <class name="org.openecomp.sdc.externalApis.GetSpecificAssetMetadataServlet"> + <methods> + <include name="getResourceAssetMetadataWithResourceInstancesSuccess"/> + <include + name="getServiceAssetMetadataWithCertifiedResourceInstancesAndArtifactsOnRIsAndServiceSuccess"/> + </methods> + </class> + </classes> + </test> + + +</suite>
\ No newline at end of file diff --git a/test-apis-ci/src/main/resources/ci/testSuites/service.xml b/test-apis-ci/src/main/resources/ci/testSuites/service.xml index 770d2bebf0..4b2842d7fc 100644 --- a/test-apis-ci/src/main/resources/ci/testSuites/service.xml +++ b/test-apis-ci/src/main/resources/ci/testSuites/service.xml @@ -1,14 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd"> -<suite name="Service" > - <test name="Service"> +<suite name="Service"> + <test name="Service"> <classes> - <class name="org.openecomp.sdc.ci.tests.execute.service.GetServiceLatestVersionTest"/> - <class name="org.openecomp.sdc.ci.tests.execute.service.CreateServiceMetadataApiTest"/> - <class name="org.openecomp.sdc.ci.tests.execute.service.ReqCapOccurrencesTest"/> <class name="org.openecomp.sdc.ci.tests.execute.service.ChangeServiceDistributionStatusApiTest"/> - <class name="org.openecomp.sdc.ci.tests.execute.service.ServiceComponentInstanceCRUDTest"/> - <class name="org.openecomp.sdc.ci.tests.execute.service.UpdateServiceMetadataTest"/> <class name="org.openecomp.sdc.ci.tests.execute.service.GetAllServiceVersions"/> <class name="org.openecomp.sdc.ci.tests.execute.interfaceoperation.InterfaceOperationsTest"> <methods> @@ -19,6 +14,6 @@ <include name="testCreateOperationWithLocalInterfaceAndDownloadArtifact"/> </methods> </class> - </classes> - </test> + </classes> + </test> </suite> <!-- Service --> diff --git a/test-apis-ci/src/main/resources/ci/testSuites/testngLifeCycle.xml b/test-apis-ci/src/main/resources/ci/testSuites/testngLifeCycle.xml index 54f1868470..7f1cba4d9c 100644 --- a/test-apis-ci/src/main/resources/ci/testSuites/testngLifeCycle.xml +++ b/test-apis-ci/src/main/resources/ci/testSuites/testngLifeCycle.xml @@ -1,27 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd"> -<suite name="lifeCycle" > +<suite name="lifeCycle"> <test name="Test"> <classes> - <class name="org.openecomp.sdc.ci.tests.execute.lifecycle.ServiceLCS_cerificationCITest"/> - <class name="org.openecomp.sdc.ci.tests.execute.lifecycle.ServiceResourceLCSTest"/> - <class name="org.openecomp.sdc.ci.tests.execute.lifecycle.LCS_UndoCheckOutCITest"/> - <class name="org.openecomp.sdc.ci.tests.execute.lifecycle.ServiceLCS_UndoCheckOutCITest"/> - <class name="org.openecomp.sdc.ci.tests.execute.lifecycle.LCS_StartCertificationCITest"/> - <class name="org.openecomp.sdc.ci.tests.execute.lifecycle.ServiceLCS_CheckinCITest"/> - <class name="org.openecomp.sdc.ci.tests.execute.lifecycle.LCS_CheckOutCITest"/> - <class name="org.openecomp.sdc.ci.tests.execute.lifecycle.ServiceCertWithResourceInstances"/> - <class name="org.openecomp.sdc.ci.tests.execute.lifecycle.CrossCheckOutTest"/> - <class name="org.openecomp.sdc.ci.tests.execute.lifecycle.CertifyVFWithNotCertRIs"/> - <class name="org.openecomp.sdc.ci.tests.execute.lifecycle.LCS_request4CerCITest"/> - <class name="org.openecomp.sdc.ci.tests.execute.lifecycle.CleanupIntermediateReources"/> - <class name="org.openecomp.sdc.ci.tests.execute.lifecycle.ServiceLCS_CheckOutCIT"/> - <class name="org.openecomp.sdc.ci.tests.execute.lifecycle.LCS_cerificationCITest"/> - <class name="org.openecomp.sdc.ci.tests.execute.lifecycle.CertifyServiceWithNotCertRI"/> - <class name="org.openecomp.sdc.ci.tests.execute.lifecycle.LCS_CheckInCITest"/> - <class name="org.openecomp.sdc.ci.tests.execute.lifecycle.ServiceLCS_request4CerCITest"/> <class name="org.openecomp.sdc.ci.tests.execute.lifecycle.LCSbaseTest"/> - <class name="org.openecomp.sdc.ci.tests.execute.lifecycle.ServiceLCS_StartCertificationCITest"/> </classes> </test> <!-- Test --> </suite> <!-- lifeCycle --> diff --git a/test-apis-ci/src/main/resources/ci/testSuites/user.xml b/test-apis-ci/src/main/resources/ci/testSuites/user.xml index 948993c144..3ab1f971fb 100644 --- a/test-apis-ci/src/main/resources/ci/testSuites/user.xml +++ b/test-apis-ci/src/main/resources/ci/testSuites/user.xml @@ -1,17 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd"> -<suite name="User" > +<suite name="User"> <test name="Test"> <classes> - <class name="org.openecomp.sdc.ci.tests.execute.user.AuthorizedUserApiTest_extend"/> - <class name="org.openecomp.sdc.ci.tests.execute.user.AuthorizedUserApiTest"/> - <class name="org.openecomp.sdc.ci.tests.execute.user.OpsWorkspaceApiTest"/> - <class name="org.openecomp.sdc.ci.tests.execute.user.UserApiTest"/> - <class name="org.openecomp.sdc.ci.tests.execute.user.GetAllAdminUsersApiTest"/> - <class name="org.openecomp.sdc.ci.tests.execute.user.CRUDUserTest"/> - <class name="org.openecomp.sdc.ci.tests.execute.user.CreateUserApiTest"/> - <class name="org.openecomp.sdc.ci.tests.execute.user.GovernorWorkspaceApiTest"/> - <class name="org.openecomp.sdc.ci.tests.execute.user.GetListsOfTesterUserApiTest"/> <class name="org.openecomp.sdc.ci.tests.execute.user.ActivateDeActivateDeleteUser"/> </classes> </test> <!-- Test --> |