summaryrefslogtreecommitdiffstats
path: root/asdc-tests/src/main/resources
diff options
context:
space:
mode:
authorMichael Lando <ml636r@att.com>2017-06-11 14:22:02 +0300
committerMichael Lando <ml636r@att.com>2017-06-11 17:48:32 +0300
commitb3d4898d9e8452ea0b8d848c048e712d43b8d9a3 (patch)
tree0609319203be13f6c29ccbe24cb39c9d64f90095 /asdc-tests/src/main/resources
parentaf9929df75604ce407d0ca542b200630164e0ae6 (diff)
[SDC-29] rebase continue work to align source
Change-Id: I218f1c5ee23fb2c8314f1c70921d3ad8682c10f4 Signed-off-by: Michael Lando <ml636r@att.com>
Diffstat (limited to 'asdc-tests/src/main/resources')
-rw-r--r--asdc-tests/src/main/resources/ci/conf/attsdc-packages.yaml3
-rw-r--r--asdc-tests/src/main/resources/ci/testSuites/ciFull.xml49
-rw-r--r--asdc-tests/src/main/resources/ci/testSuites/product.xml14
-rw-r--r--asdc-tests/src/main/resources/ci/testSuites/resource.xml40
-rw-r--r--asdc-tests/src/main/resources/ci/testSuites/sanity.xml47
5 files changed, 2 insertions, 151 deletions
diff --git a/asdc-tests/src/main/resources/ci/conf/attsdc-packages.yaml b/asdc-tests/src/main/resources/ci/conf/attsdc-packages.yaml
index 5d1a3e1537..fae7ab7ece 100644
--- a/asdc-tests/src/main/resources/ci/conf/attsdc-packages.yaml
+++ b/asdc-tests/src/main/resources/ci/conf/attsdc-packages.yaml
@@ -8,5 +8,4 @@ packages:
- org.openecomp.sdc.ci.tests.execute.artifacts
- org.openecomp.sdc.ci.tests.execute.imports
- org.openecomp.sdc.ci.tests.execute.category
- - org.openecomp.sdc.ci.tests.execute.distribution
- - org.openecomp.sdc.ci.tests.execute.product \ No newline at end of file
+ - org.openecomp.sdc.ci.tests.execute.distribution \ No newline at end of file
diff --git a/asdc-tests/src/main/resources/ci/testSuites/ciFull.xml b/asdc-tests/src/main/resources/ci/testSuites/ciFull.xml
index 26a85fd9c6..1d81e0f689 100644
--- a/asdc-tests/src/main/resources/ci/testSuites/ciFull.xml
+++ b/asdc-tests/src/main/resources/ci/testSuites/ciFull.xml
@@ -83,54 +83,7 @@
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
diff --git a/asdc-tests/src/main/resources/ci/testSuites/product.xml b/asdc-tests/src/main/resources/ci/testSuites/product.xml
deleted file mode 100644
index 4ea495d0d7..0000000000
--- a/asdc-tests/src/main/resources/ci/testSuites/product.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
-<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/asdc-tests/src/main/resources/ci/testSuites/resource.xml b/asdc-tests/src/main/resources/ci/testSuites/resource.xml
index 803fb01e70..64f4377420 100644
--- a/asdc-tests/src/main/resources/ci/testSuites/resource.xml
+++ b/asdc-tests/src/main/resources/ci/testSuites/resource.xml
@@ -315,46 +315,6 @@
<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>
- <!-- Product tests end-->
</classes>
</test> <!-- Test -->
</suite> <!-- Sanity -->
diff --git a/asdc-tests/src/main/resources/ci/testSuites/sanity.xml b/asdc-tests/src/main/resources/ci/testSuites/sanity.xml
index 8e787bc8cd..21b7043ad3 100644
--- a/asdc-tests/src/main/resources/ci/testSuites/sanity.xml
+++ b/asdc-tests/src/main/resources/ci/testSuites/sanity.xml
@@ -152,53 +152,6 @@
</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" />