MOSIP-29955

Sohandey · Oct 26, 2023 · 1f8a89a · 1f8a89a
1 parent 2652092
commit 1f8a89a
Show file tree

Hide file tree

Showing 23 changed files with 74 additions and 100 deletions.
diff --git a/automationtests/src/main/resources/masterdata/BiometricAttributes/BiometricAttributes.yml b/automationtests/src/main/resources/masterdata/BiometricAttributes/BiometricAttributes.yml
@@ -45,7 +45,7 @@ BiometricAttributes:
   ]
 }'
 
-   MasterData_BiometricAttributes_Invalid_invalid_biometricTypeCode:
+   MasterData_BiometricAttributes_Invalid_biometricTypeCode:
       endPoint: /v1/masterdata/biometricattributes
       role: admin
       templateFields: ["langCode"]
@@ -69,7 +69,7 @@ BiometricAttributes:
   ]
 }'
 
-   MasterData_BiometricAttributes_Invalid_empty_langCode:
+   MasterData_BiometricAttributes_empty_langCode:
       endPoint: /v1/masterdata/biometricattributes
       role: admin
       restMethod: post
@@ -93,7 +93,7 @@ BiometricAttributes:
   ]
 }'
 
-   MasterData_BiometricAttributes_Invalid_Invalid_langCode:
+   MasterData_BiometricAttributes_Invalid_langCode:
       endPoint: /v1/masterdata/biometricattributes
       role: admin
       restMethod: post
@@ -117,7 +117,7 @@ BiometricAttributes:
   ]
 }'
 
-   MasterData_BiometricAttributes_Invalid_empty_code:
+   MasterData_BiometricAttributes_empty_code:
       endPoint: /v1/masterdata/biometricattributes
       role: admin
       templateFields: ["langCode"]

diff --git a/automationtests/src/main/resources/masterdata/DeviceSearch/DeviceSearch.yml b/automationtests/src/main/resources/masterdata/DeviceSearch/DeviceSearch.yml
@@ -205,7 +205,7 @@ DeviceSearch:
       templateFields: ["value"]
       restMethod: post
       inputTemplate: masterdata/DeviceSearch/deviceSearch
-      outputTemplate: masterdata/error
+      outputTemplate: masterdata/NilSearchResult
       input: '{
     "filters": [
       {
@@ -228,11 +228,9 @@ DeviceSearch:
     "requesttime": "$TIMESTAMP$"
   }'
       output: '{
-  "errors": [
-    {
-      "errorCode": "KER-MSD-358"
-    }
-  ]
+    "fromRecord": 0,
+    "toRecord": 0,
+    "totalRecord": 0
 }'
    MasterData_DeviceSearch_Invalid_SortType_neg:
       endPoint: /v1/masterdata/devices/search

diff --git a/automationtests/src/main/resources/masterdata/DeviceSpecFilter/DeviceSpecFilter.yml b/automationtests/src/main/resources/masterdata/DeviceSpecFilter/DeviceSpecFilter.yml
@@ -77,7 +77,7 @@ DeviceSpecFilter:
       templateFields: ["languageCode"]
       restMethod: post
       inputTemplate: masterdata/DeviceSpecFilter/deviceSpecFilter
-      outputTemplate: masterdata/DeviceSpecFilter/deviceSpecFilterResult
+      outputTemplate: masterdata/NilFilterResult
       input: '{
 	"filters": [{
 		"columnName": "brand",
@@ -88,13 +88,8 @@ DeviceSpecFilter:
 	"requesttime": "$TIMESTAMP$"
 }'
       output: '{
-    "filters": [
-      {
-        "fieldID": "brand",
-        "fieldValue": "hogwarts"
-      }
-    ]
-  }'
+    "totalCount": 0
+}'
    MasterData_DeviceSpecFilter_Unique_Model_smoke:
       endPoint: /v1/masterdata/devicespecifications/filtervalues
       role: admin

diff --git a/automationtests/src/main/resources/masterdata/DeviceSpecSearch/DeviceSpecSearch.yml b/automationtests/src/main/resources/masterdata/DeviceSpecSearch/DeviceSpecSearch.yml
@@ -174,7 +174,7 @@ DeviceSpecSearch:
       templateFields: []
       restMethod: post
       inputTemplate: masterdata/DeviceSpecSearch/deviceSpecSearch
-      outputTemplate: masterdata/error
+      outputTemplate: masterdata/NilSearchResult
       input: '{
     "filters": [
       {
@@ -197,11 +197,9 @@ DeviceSpecSearch:
     "requesttime": "$TIMESTAMP$"
   }'
       output: '{
-  "errors": [
-    {
-      "errorCode": "KER-MSD-317"
-    }
-  ]
+    "fromRecord": 0,
+    "toRecord": 0,
+    "totalRecord": 0
 }'
    MasterData_DeviceSpecSearch_InvalidPageFetch:
       endPoint: /v1/masterdata/devicespecifications/search

diff --git a/...tiontests/src/main/resources/masterdata/DeviceSpecification/CreateDeviceSpecification.yml b/...tiontests/src/main/resources/masterdata/DeviceSpecification/CreateDeviceSpecification.yml
@@ -23,7 +23,7 @@ CreateDeviceSpecification:
       "id": "$IGNORE$"
       }'
 
-   MasterData_CreateDeviceSpecification_Dublicate_DeviceSpecification_Neg:
+   MasterData_CreateDeviceSpecification_Duplicate_DeviceSpecification_Neg:
       endPoint: /v1/masterdata/devicespecifications
       role: admin
       templateFields: ["name","description"]

diff --git a/automationtests/src/main/resources/masterdata/DeviceTypeFilter/DeviceTypeFilter.yml b/automationtests/src/main/resources/masterdata/DeviceTypeFilter/DeviceTypeFilter.yml
@@ -101,7 +101,7 @@ DeviceTypeFilter:
       templateFields: ["languageCode"]
       restMethod: post
       inputTemplate: masterdata/DeviceTypeFilter/deviceTypeFilter
-      outputTemplate: masterdata/error
+      outputTemplate: masterdata/NilFilterResult
       input: '{
 	"filters": [{
 		"columnName": "name",
@@ -112,13 +112,8 @@ DeviceTypeFilter:
 	"requesttime": "$TIMESTAMP$"
 }'
       output: '{
-  "errors": [
-    {
-      "errorCode": "KER-MSD-322",
-      "message": "Filter Type cannot be empty or null"
-    }
-  ]
-  }'
+    "totalCount": 0
+}'
    MasterData_DeviceTypeFilter_Invalid_FilterType_neg:
       endPoint: /v1/masterdata/devicetypes/filtervalues
       role: admin

diff --git a/automationtests/src/main/resources/masterdata/DeviceTypeFilter/deviceTypeNilFilterResult.hbs b/automationtests/src/main/resources/masterdata/DeviceTypeFilter/deviceTypeNilFilterResult.hbs
@@ -0,0 +1,6 @@
+{
+  "response": {
+    "filters": [],
+    "totalCount": "{{totalCount}}"
+  }
+}
diff --git a/automationtests/src/main/resources/masterdata/FetchLocation/FetchLocation.yml b/automationtests/src/main/resources/masterdata/FetchLocation/FetchLocation.yml
@@ -46,7 +46,7 @@ FetchLocation:
       outputTemplate: masterdata/FetchLocation/fetchLocationResult
       input: '{
       "langcode": "eng",
-      "locationcode": "10036",
+      "locationcode": "$LOCATIONCODE$",
       "locationname": "$REMOVE$",
       "hierarchyname": "$REMOVE$"
       }'
@@ -83,7 +83,7 @@ FetchLocation:
       outputTemplate: masterdata/error
       input: '{
       "langcode": "en@@@#EDFF",
-      "locationcode": "10036",
+      "locationcode": "$LOCATIONCODE$",
       "locationname": "$REMOVE$",
       "hierarchyname": "$REMOVE$"
       }'
@@ -104,7 +104,7 @@ FetchLocation:
       outputTemplate: masterdata/FetchLocation/fetchLocationDetailsbyLangcodeResult
       input: '{
       "langcode": "eng",
-      "locationcode": "10036",
+      "locationcode": "$LOCATIONCODE$",
       "locationname": "$REMOVE$",
       "hierarchyname": "$REMOVE$"
       }'
@@ -119,7 +119,7 @@ FetchLocation:
       outputTemplate: masterdata/error
       input: '{
       "langcode": "endgysgshw66wg",
-      "locationcode": "10036",
+      "locationcode": "$LOCATIONCODE$",
       "locationname": "$REMOVE$",
       "hierarchyname": "$REMOVE$"
       }'
@@ -225,7 +225,7 @@ FetchLocation:
       input: '{
       "langcode": "eng",
       "locationname": "$REMOVE$",
-      "locationcode": "MOR",
+      "locationcode": "$LOCATIONCODE$",
       "hierarchyname": "$REMOVE$"
       }'
       output: '{

diff --git a/...tests/src/main/resources/masterdata/FetchMissingDynamicField/FetchMissingDynamicField.yml b/...tests/src/main/resources/masterdata/FetchMissingDynamicField/FetchMissingDynamicField.yml
@@ -1,5 +1,5 @@
 FetchMissingDynamicField:
-   MasterData_FetchMissingDynamicField_valid_smoke:
+   MasterData_FetchMissingDynamicField_All_Valid_smoke:
       endPoint: /v1/masterdata/dynamicfields/missingids/{langcode}?fieldName={fieldName}
       role: admin
       checkErrorsOnlyInResponse: true

diff --git a/automationtests/src/main/resources/masterdata/FetchRegCent/FetchRegCent.yml b/automationtests/src/main/resources/masterdata/FetchRegCent/FetchRegCent.yml
@@ -253,7 +253,7 @@ FetchRegCent:
   "year": "$REMOVE$",
   "id": "$REMOVE$",
   "hierarchylevel": "1",
-  "name": "केंद्र एक बेन मंसूर",
+  "name": "Rabat Sale Kenitra",
   "zonecode": "$REMOVE$",
   "timestamp": "$REMOVE$"
 }'
@@ -441,7 +441,7 @@ FetchRegCent:
   "id": "$REMOVE$",
   "hierarchylevel": "$REMOVE$",
   "name": "$REMOVE$",
-  "zonecode": "KTA",
+  "zonecode": "$ZONE_CODE$",
   "timestamp": "$REMOVE$"
 }'
       output: '{
@@ -581,7 +581,7 @@ FetchRegCent:
   "id": "$REMOVE$",
   "hierarchylevel": "$REMOVE$",
   "name": "$REMOVE$",
-  "zonecode": "RBT",
+  "zonecode": "$ZONE_CODE$",
   "timestamp": "$REMOVE$"
 }'
       output: '{

diff --git a/automationtests/src/main/resources/masterdata/FilterHolidays/FilterHolidays.yml b/automationtests/src/main/resources/masterdata/FilterHolidays/FilterHolidays.yml
@@ -24,7 +24,7 @@ FilterHolidays:
       role: admin
       restMethod: post
       inputTemplate: masterdata/FilterHolidays/filterHolidays
-      outputTemplate: masterdata/error
+      outputTemplate: masterdata/NilFilterResult
       input: '{
 	"filters": [{
 		"columnName": "isActive",
@@ -35,12 +35,8 @@ FilterHolidays:
 	"requesttime": "$TIMESTAMP$"
 }'
       output: '{
-  "errors": [
-    {
-      "errorCode": "KER-MSD-324"
-    }
-  ]
-  }'
+    "totalCount": 0
+}'
    MasterData_FilterHolidays_inValid_filterType_blank:
       endPoint: /v1/masterdata/holidays/filtervalues
       role: admin

diff --git a/automationtests/src/main/resources/masterdata/FilterRegCenterType/FilterRegCenterType.yml b/automationtests/src/main/resources/masterdata/FilterRegCenterType/FilterRegCenterType.yml
@@ -103,7 +103,7 @@ FilterRegCenterType:
       templateFields: ["languageCode"]
       restMethod: post
       inputTemplate: masterdata/FilterRegCenterType/filterRegCenterType
-      outputTemplate: masterdata/error
+      outputTemplate: masterdata/NilFilterResult
       input: '{
 	"filters": [{
 		"columnName": "code",
@@ -114,13 +114,8 @@ FilterRegCenterType:
 	"requesttime": "$TIMESTAMP$"
 }'
       output: '{
-  "errors": [
-    {
-      "errorCode": "KER-MSD-317",
-      "message": "$IGNORE$"
-    }
-  ]
-  }'
+    "totalCount": 0
+}'
    MasterData_FilterRegCenterType_inValid_filterType_blank:
       endPoint: /v1/masterdata/registrationcentertypes/filtervalues
       role: admin

diff --git a/...GetLocationHierarchyLevelByLastUpdatedDate/GetLocationHierarchyLevelByLastUpdatedDate.yml b/...GetLocationHierarchyLevelByLastUpdatedDate/GetLocationHierarchyLevelByLastUpdatedDate.yml
@@ -12,7 +12,7 @@ GetLocationHierarchyLevelByLastUpdatedDate:
       output: '{
 }'
 
-   Admin_GetLocationHierarchyLevelByLastUpdatedDate_Invalid_Invalid_lD:
+   Admin_GetLocationHierarchyLevelByLastUpdatedDate_with_Invalid_lD:
       endPoint: /v1/masterdata/locationHierarchyLevels?lastUpdated=abc
       role: admin
       restMethod: get

diff --git a/...tests/src/main/resources/masterdata/GetPacketRejectionReason/GetPacketRejectionReason.yml b/...tests/src/main/resources/masterdata/GetPacketRejectionReason/GetPacketRejectionReason.yml
@@ -14,7 +14,7 @@ GetPacketRejectionReason:
       output: '{
    "errors": null
 }'  
-   Masterdata_GetPacketRejectionReason_Valid:
+   Masterdata_GetPacketRejectionReason_with_empty_data:
       endPoint: /v1/masterdata/packetrejectionreasons/{reasoncategorycode}/{langcode}
       role: admin
       restMethod: get
@@ -32,14 +32,14 @@ GetPacketRejectionReason:
     }
   ]
 }'
-   Masterdata_GetPacketRejectionReason_Invalid_Invalid_reasoncategorycode:
+   Masterdata_GetPacketRejectionReason_Invalid_reasoncategorycode:
       endPoint: /v1/masterdata/packetrejectionreasons/{reasoncategorycode}/{langcode}
       role: admin
       restMethod: get
       inputTemplate: masterdata/GetPacketRejectionReason/getPacketRejectionReason
       outputTemplate: masterdata/error
       input: '{
-  "reasoncategorycode":"abc",
+  "reasoncategorycode":"a@b@12c",
   "langcode":"eng"
 }'
       output: '{
@@ -51,7 +51,7 @@ GetPacketRejectionReason:
   ]
 }'
 
-   Masterdata_GetPacketRejectionReason_Invalid_Invalid_langcode:
+   Masterdata_GetPacketRejectionReason_Invalid_langcode:
       endPoint: /v1/masterdata/packetrejectionreasons/{reasoncategorycode}/{langcode}
       role: admin
       restMethod: get

diff --git a/automationtests/src/main/resources/masterdata/GetUserDetails/GetUserDetails.yml b/automationtests/src/main/resources/masterdata/GetUserDetails/GetUserDetails.yml
@@ -22,7 +22,7 @@ GetUserDetails:
       inputTemplate: masterdata/GetUserDetails/getUserDetails
       outputTemplate: masterdata/GetUserDetails/getUserDetailsByIDResult
       input: '{
-  "id":"func_auto_test_user"
+  "id":"masterdata-220005"
 }'
       output: '{
       "name": "$IGNORE$",

diff --git a/...ontests/src/main/resources/masterdata/MachineSpecification/CreateMachineSpecification.yml b/...ontests/src/main/resources/masterdata/MachineSpecification/CreateMachineSpecification.yml
@@ -509,7 +509,7 @@ CreateMachineSpecification:
   ]
 }'
 
-   Masterdata_CreateMachineSpecification_Dublicate_Neg:
+   Masterdata_CreateMachineSpecification_Duplicate_Neg:
       endPoint: /v1/masterdata/machinespecifications
       role: admin
       templateFields: ["description"]

diff --git a/automationtests/src/main/resources/masterdata/NilFilterResult.hbs b/automationtests/src/main/resources/masterdata/NilFilterResult.hbs
@@ -0,0 +1,6 @@
+{
+  "response": {
+    "filters": [],
+    "totalCount": "{{totalCount}}"
+  }
+}
diff --git a/automationtests/src/main/resources/masterdata/NilSearchResult.hbs b/automationtests/src/main/resources/masterdata/NilSearchResult.hbs
@@ -0,0 +1,7 @@
+{
+  "response": {
+    "fromRecord": {{fromRecord}},
+    "toRecord": {{toRecord}},
+    "totalRecord": {{totalRecord}}
+  }
+}
diff --git a/automationtests/src/main/resources/masterdata/RegCenterType/UpdateRegCenterType.yml b/automationtests/src/main/resources/masterdata/RegCenterType/UpdateRegCenterType.yml
@@ -109,23 +109,4 @@ UpdateRegCenterType:
       "message": "request.descr: size must be between 0 and 128"
     }
   ]
-}'
-
-   MasterData_UpdateRegCenterType_InputParameter_isActive_Missing:
-      endPoint: /v1/masterdata/registrationcentertypes
-      role: admin
-      templateFields: ["name","descr"]
-      restMethod: put
-      inputTemplate: masterdata/RegCenterType/regCenterType
-      outputTemplate: masterdata/RegCenterType/regCenterTypeResult
-      input: '{
-    "code": "ALT-3",
-    "langCode": "eng",
-    "name": "alternate",
-    "descr": "alternate center",
-    "isActive":"$REMOVE$",
-    "requesttime": "$TIMESTAMP$"
-  }'
-      output: '{
-    "code": "ALT-3"
-  }'
+}'