Skip to content

Commit

Permalink
resolve conflicts
Browse files Browse the repository at this point in the history
Signed-off-by: Anup Nehe <[email protected]>
  • Loading branch information
anup-nehe committed Oct 23, 2024
1 parent e147e49 commit aff7cdb
Showing 1 changed file with 20 additions and 20 deletions.
40 changes: 20 additions & 20 deletions api-test/testNgXmlFiles/pmsApi.xml
Original file line number Diff line number Diff line change
Expand Up @@ -340,23 +340,23 @@
<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
</classes>
</test>
<test name="GetConfiguration">
<test name="GetConfiguration">
<parameter name="ymlFile"
value="pms/GetConfiguration/GetConfiguration.yml" />
<classes>
<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
</classes>
</test>

<test name="saveUserConsent">
<test name="saveUserConsent">
<parameter name="ymlFile"
value="pms/SaveUserConsent/SaveUserConsent.yml" />
<classes>
<class
name="io.mosip.testrig.apirig.testscripts.SimplePostWithoutBody" />
</classes>
</test>

<test name="GetUserConsent">
<parameter name="ymlFile"
value="pms/GetUserConsent/GetUserConsent.yml" />
Expand All @@ -367,16 +367,16 @@
<test name="GetOriginalPartnerCertificates">
<parameter name="ymlFile"
value="pms/GetOriginalPartnerCertificates/GetOriginalPartnerCertificates.yml"
/>
/>
<classes>
<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
</classes>
</test>
<test name="GetAllApprovedDeviceProviderIds">

<test name="GetAllApprovedDeviceProviderIds">
<parameter name="ymlFile"
value="pms/GetAllApprovedDeviceProviderIds/GetAllApprovedDeviceProviderIds.yml"
/>
/>
<classes>
<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
</classes>
Expand Down Expand Up @@ -447,7 +447,7 @@
name="io.mosip.testrig.apirig.testscripts.SimplePost" />
</classes>
</test>
<test name="RejectMappingDeviceToSbi">
<test name="RejectMappingDeviceToSbi">
<parameter name="ymlFile"
value="pms/RejectMappingDeviceToSbi/RejectMappingDeviceToSbi.yml" />
<classes>
Expand Down Expand Up @@ -478,15 +478,15 @@
name="io.mosip.testrig.apirig.testscripts.SimplePost" />
</classes>
</test>
<test name="GetAllApprovedFtmProvider">
<test name="GetAllApprovedFtmProvider">
<parameter name="ymlFile"
value="pms/GetAllApprovedFtmProvider/GetAllApprovedFtmProvider.yml"
/>
/>
<classes>
<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
</classes>
</test>
<test name="CreateFtmChipDetails">
<test name="CreateFtmChipDetails">
<parameter name="ymlFile"
value="pms/CreateFtmChipDetails/CreateFtmChipDetails.yml" />
<parameter name="idKeyName" value="id" />
Expand All @@ -495,48 +495,48 @@
name="io.mosip.testrig.apirig.testscripts.SimplePostForAutoGenId" />
</classes>
</test>
<test name="UploadCertificateOfFtpChip">
<test name="UploadCertificateOfFtpChip">
<parameter name="ymlFile"
value="pms/UploadCertificateOfFtpChip/UploadCertificateOfFtpChip.yml" />
<classes>
<class
name="io.mosip.testrig.apirig.testscripts.SimplePost" />
</classes>
</test>
<test name="ApproveFTMChipDetail">
<test name="ApproveFTMChipDetail">
<parameter name="ymlFile"
value="pms/ApproveFTMChipDetail/ApproveFTMChipDetail.yml" />
<classes>
<class name="io.mosip.testrig.apirig.testscripts.SimplePatch" />
</classes>
</test>
<test name="GetListAllFTMChip">
<test name="GetListAllFTMChip">
<parameter name="ymlFile"
value="pms/GetListAllFTMChip/GetListAllFTMChip.yml" />
<classes>
<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
</classes>
</test>
<test name="GetOriginalFtmCertifacte">
</test>
<test name="GetOriginalFtmCertifacte">
<parameter name="ymlFile"
value="pms/GetOriginalFtmCertifacte/GetOriginalFtmCertifacte.yml" />
<classes>
<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
</classes>
</test>
<test name="DeactivateFtm">
</test>
<test name="DeactivateFtm">
<parameter name="ymlFile"
value="pms/DeactivateFtm/DeactivateFtm.yml" />
<classes>
<class
name="io.mosip.testrig.apirig.testscripts.SimplePost" />
</classes>
</test>
<test name="GetOriginalFtmCertifacteAfterDeactiveFtm">
<test name="GetOriginalFtmCertifacteAfterDeactiveFtm">
<parameter name="ymlFile"
value="pms/GetOriginalFtmCertifacteAfterDeactiveFtm/GetOriginalFtmCertifacteAfterDeactiveFtm.yml" />
<classes>
<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
</classes>
</test>
</test>
</suite>

0 comments on commit aff7cdb

Please sign in to comment.