Merge pull request #1129 from mohanachandran-s/develop

MOSIP-37943 - Fixed an automation failure
mosip · Dec 4, 2024 · 53d1a0d · 53d1a0d
2 parents 2f7f4bc + 601a701
commit 53d1a0d
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 14 deletions.
diff --git a/api-test/src/main/java/io/mosip/testrig/apirig/masterdata/testrunner/MosipTestRunner.java b/api-test/src/main/java/io/mosip/testrig/apirig/masterdata/testrunner/MosipTestRunner.java
@@ -99,8 +99,8 @@ public static void main(String[] arg) {
 			BaseTestCase.mapUserToZone();
 			BaseTestCase.mapZone();
 			AdminTestUtil.getLocationLevelData();
-			AdminTestUtil.getLocationData();
 			AdminTestUtil.getZoneName();
+			AdminTestUtil.getLeafZone();
 
 			for (int i = 0; i < localLanguageList.size(); i++) {
 				BaseTestCase.languageList.clear();
@@ -118,8 +118,6 @@ public static void main(String[] arg) {
 			LOGGER.error("Exception " + e.getMessage());
 		}
 
-		OTPListener.bTerminate = true;
-
 		if (BaseTestCase.isTargetEnvLTS())
 			HealthChecker.bTerminate = true;
 
@@ -144,8 +142,6 @@ public static void suiteSetup(String runType) {
 		BaseTestCase.currentModule = GlobalConstants.MASTERDATA;
 		BaseTestCase.setReportName(GlobalConstants.MASTERDATA);
 		AdminTestUtil.initiateMasterDataTest();
-		BaseTestCase.otpListener = new OTPListener();
-		BaseTestCase.otpListener.run();
 	}
 
 

diff --git a/api-test/src/main/resources/config/application.properties b/api-test/src/main/resources/config/application.properties
@@ -45,6 +45,7 @@ generateArgon2HashURL=/v1/keymanager/generateArgon2Hash
 appointmentavailabilityurl=/preregistration/v1/appointment/availability/
 validateSignatureUrl=v1/identity/validateSign
 vciContextURL=https://www.w3.org/2018/credentials/v1
+leafZoneUrl=/v1/masterdata/zones/leafzones/
 
 ## Auto generated properties while running the test rig(s)
 adminAutoGeneratedIdPropFileName=/admin/autoGeneratedId.properties

diff --git a/api-test/src/main/resources/masterdata/RegistrationCenter/CreateRegistrationCenter.yml b/api-test/src/main/resources/masterdata/RegistrationCenter/CreateRegistrationCenter.yml
@@ -29,7 +29,7 @@ CreateRegistrationCenter:
    "perKioskProcessTime":"00:30:00",
    "timeZone":"(GTM+01:00) CENTRAL EUROPEAN TIME",
    "workingHours":3.5,
-   "zoneCode":"$ZONE_CODE$",
+   "zoneCode":"$LEAF_ZONE_CODE$",
    "id":"",
    "isActive":"false",
    "numberOfKiosks":"1",
@@ -72,7 +72,7 @@ CreateRegistrationCenter:
     "perKioskProcessTime": "00:15:00",
     "timeZone": "Test Time zone",
     "workingHours": "8:00:00",
-    "zoneCode":"$ZONE_CODE$",
+    "zoneCode":"$LEAF_ZONE_CODE$",
     "id": "96874",
     "exceptionHolidayDate": "2020-11-16",
     "exceptionHolidayName": "TestHoliday",
@@ -118,7 +118,7 @@ CreateRegistrationCenter:
     "perKioskProcessTime": "00:15:00",
     "timeZone": "Test Time zone",
     "workingHours": "8:00:00",
-    "zoneCode":"$ZONE_CODE$",
+    "zoneCode":"$LEAF_ZONE_CODE$",
     "id": "96874",
     "exceptionHolidayDate": "2020-11-16",
     "exceptionHolidayName": "TestHoliday",
@@ -163,7 +163,7 @@ CreateRegistrationCenter:
     "perKioskProcessTime": "00:15:00",
     "timeZone": "Test Time zone",
     "workingHours": "8:00:00",
-    "zoneCode":"$ZONE_CODE$",
+    "zoneCode":"$LEAF_ZONE_CODE$",
     "id": "96874",
     "exceptionHolidayDate": "2020-11-16",
     "exceptionHolidayName": "TestHoliday",
@@ -208,7 +208,7 @@ CreateRegistrationCenter:
    "perKioskProcessTime":"00:30:00",
    "timeZone":"(GTM+01:00) CENTRAL EUROPEAN TIME",
    "workingHours":3.5,
-   "zoneCode":"$ZONE_CODE$",
+   "zoneCode":"$LEAF_ZONE_CODE$",
    "id":"",
    "isActive":"false",
    "numberOfKiosks":null,
@@ -257,7 +257,7 @@ CreateRegistrationCenter:
    "perKioskProcessTime":"00:30:00",
    "timeZone":"(GTM+01:00) CENTRAL EUROPEAN TIME",
    "workingHours":3.5,
-   "zoneCode":"$ZONE_CODE$",
+   "zoneCode":"$LEAF_ZONE_CODE$",
    "id":"",
    "isActive":"false",
    "numberOfKiosks":"-1",

diff --git a/api-test/src/main/resources/masterdata/SearchMachineSpec/SearchMachineSpec.yml b/api-test/src/main/resources/masterdata/SearchMachineSpec/SearchMachineSpec.yml
@@ -112,12 +112,11 @@ SearchMachineSpec:
       output: '{
 	"data": [{
 	"id": "$IGNORE$",
-	"name": "HP",
+	"name": "$IGNORE$",
 	"brand": "HP",
 	"model": "1234",
 	"machineTypeCode": "$IGNORE$",
 	"minDriverversion": "3.2",
-	"description": "HP brand",
 	"isActive": "$IGNORE$"
 	}]
 }'

diff --git a/api-test/src/main/resources/masterdata/SearchMachineSpec/searchMachineSpecResult.hbs b/api-test/src/main/resources/masterdata/SearchMachineSpec/searchMachineSpecResult.hbs
@@ -6,7 +6,6 @@
         "isActive": "{{isActive}}",
         "id": "{{id}}",
         "name": "{{name}}",
-        "description": "{{description}}",
         "model": "{{model}}",
         "brand": "{{brand}}",
         "machineTypeCode": "{{machineTypeCode}}",