From f19204119aefc2c02e2f86b57ffbde9bc095546b Mon Sep 17 00:00:00 2001 From: GOKULRAJ136 <110164849+GOKULRAJ136@users.noreply.github.com> Date: Tue, 21 Apr 2026 13:47:40 +0530 Subject: [PATCH 1/6] Ignored decommissionRegCenterFail_WithMappedRegCenter testcase Signed-off-by: GOKULRAJ136 <110164849+GOKULRAJ136@users.noreply.github.com> --- .../test/controller/RegistrationCenterControllerTest.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/admin/kernel-masterdata-service/src/test/java/io/mosip/kernel/masterdata/test/controller/RegistrationCenterControllerTest.java b/admin/kernel-masterdata-service/src/test/java/io/mosip/kernel/masterdata/test/controller/RegistrationCenterControllerTest.java index 5c40b9ca8f..c4478d2808 100644 --- a/admin/kernel-masterdata-service/src/test/java/io/mosip/kernel/masterdata/test/controller/RegistrationCenterControllerTest.java +++ b/admin/kernel-masterdata-service/src/test/java/io/mosip/kernel/masterdata/test/controller/RegistrationCenterControllerTest.java @@ -15,6 +15,7 @@ import io.mosip.kernel.masterdata.utils.AuditUtil; import org.junit.Before; import org.junit.FixMethodOrder; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.MethodSorters; @@ -508,6 +509,7 @@ public void decommissionRegCenter_WithDuplicateId_Fail() throws Exception { } + @Ignore @Test @WithUserDetails("global-admin") public void decommissionRegCenterFail_WithMappedRegCenter() throws Exception { From 306a22413a4471a30d6f49028c06416431a16f1e Mon Sep 17 00:00:00 2001 From: GOKULRAJ136 <110164849+GOKULRAJ136@users.noreply.github.com> Date: Tue, 21 Apr 2026 17:39:03 +0530 Subject: [PATCH 2/6] Update RegistrationCenterControllerTest.java Signed-off-by: GOKULRAJ136 <110164849+GOKULRAJ136@users.noreply.github.com> --- .../test/controller/RegistrationCenterControllerTest.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/admin/kernel-masterdata-service/src/test/java/io/mosip/kernel/masterdata/test/controller/RegistrationCenterControllerTest.java b/admin/kernel-masterdata-service/src/test/java/io/mosip/kernel/masterdata/test/controller/RegistrationCenterControllerTest.java index c4478d2808..d141dec03e 100644 --- a/admin/kernel-masterdata-service/src/test/java/io/mosip/kernel/masterdata/test/controller/RegistrationCenterControllerTest.java +++ b/admin/kernel-masterdata-service/src/test/java/io/mosip/kernel/masterdata/test/controller/RegistrationCenterControllerTest.java @@ -15,7 +15,6 @@ import io.mosip.kernel.masterdata.utils.AuditUtil; import org.junit.Before; import org.junit.FixMethodOrder; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.MethodSorters; @@ -509,10 +508,9 @@ public void decommissionRegCenter_WithDuplicateId_Fail() throws Exception { } - @Ignore @Test @WithUserDetails("global-admin") - public void decommissionRegCenterFail_WithMappedRegCenter() throws Exception { + public void A_decommissionRegCenterFail_WithMappedRegCenter() throws Exception { MasterDataTest.checkResponse( mockMvc.perform(MockMvcRequestBuilders.put("/registrationcenters/decommission/10003")).andReturn(), From 36595e620df6cf38141bcf69187b8c4a073ab7ff Mon Sep 17 00:00:00 2001 From: GOKULRAJ136 <110164849+GOKULRAJ136@users.noreply.github.com> Date: Tue, 21 Apr 2026 18:06:06 +0530 Subject: [PATCH 3/6] corrected test data Signed-off-by: GOKULRAJ136 <110164849+GOKULRAJ136@users.noreply.github.com> --- .../test/controller/RegistrationCenterControllerTest.java | 2 +- admin/kernel-masterdata-service/src/test/resources/data.sql | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/admin/kernel-masterdata-service/src/test/java/io/mosip/kernel/masterdata/test/controller/RegistrationCenterControllerTest.java b/admin/kernel-masterdata-service/src/test/java/io/mosip/kernel/masterdata/test/controller/RegistrationCenterControllerTest.java index d141dec03e..5c40b9ca8f 100644 --- a/admin/kernel-masterdata-service/src/test/java/io/mosip/kernel/masterdata/test/controller/RegistrationCenterControllerTest.java +++ b/admin/kernel-masterdata-service/src/test/java/io/mosip/kernel/masterdata/test/controller/RegistrationCenterControllerTest.java @@ -510,7 +510,7 @@ public void decommissionRegCenter_WithDuplicateId_Fail() throws Exception { @Test @WithUserDetails("global-admin") - public void A_decommissionRegCenterFail_WithMappedRegCenter() throws Exception { + public void decommissionRegCenterFail_WithMappedRegCenter() throws Exception { MasterDataTest.checkResponse( mockMvc.perform(MockMvcRequestBuilders.put("/registrationcenters/decommission/10003")).andReturn(), diff --git a/admin/kernel-masterdata-service/src/test/resources/data.sql b/admin/kernel-masterdata-service/src/test/resources/data.sql index 61b4159d32..3fceecdbc9 100644 --- a/admin/kernel-masterdata-service/src/test/resources/data.sql +++ b/admin/kernel-masterdata-service/src/test/resources/data.sql @@ -259,7 +259,7 @@ INSERT INTO MASTER.machine_master_h(id, name, mac_address, serial_num, ip_addres DELETE FROM MASTER.user_detail_h; INSERT INTO MASTER.user_detail_h(id, name, status_code, regcntr_id, lang_code, last_login_dtimes, last_login_method, is_active, cr_by, cr_dtimes, upd_by, upd_dtimes, is_deleted, del_dtimes, eff_dtimes) VALUES ('1','abc','ACT','10001','eng',NULL,'PWD', true,'superadmin', TIMESTAMP '2018-12-10 11:42:52.994',NULL, NULL, NULL, NULL, TIMESTAMP '2023-12-10 11:42:52.994'), -('100','abc','ACT','10003','eng',NULL,'PWD', true,'superadmin', TIMESTAMP '2018-12-10 11:42:52.994',NULL, NULL, NULL, NULL, TIMESTAMP '2023-12-10 11:42:52.994'); +('100','abc','ACT','10001','eng',NULL,'PWD', true,'superadmin', TIMESTAMP '2018-12-10 11:42:52.994',NULL, NULL, NULL, NULL, TIMESTAMP '2023-12-10 11:42:52.994'); DELETE FROM MASTER.zone_user; INSERT INTO MASTER.zone_user(zone_code, usr_id, lang_code, is_active, cr_by, cr_dtimes, upd_by, upd_dtimes, is_deleted, del_dtimes) values From dc9ca2ea502867d8620cf78d9c63a488323cb383 Mon Sep 17 00:00:00 2001 From: GOKULRAJ136 <110164849+GOKULRAJ136@users.noreply.github.com> Date: Tue, 21 Apr 2026 18:50:01 +0530 Subject: [PATCH 4/6] corrected test case Signed-off-by: GOKULRAJ136 <110164849+GOKULRAJ136@users.noreply.github.com> --- .../RegistrationCenterControllerTest.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/admin/kernel-masterdata-service/src/test/java/io/mosip/kernel/masterdata/test/controller/RegistrationCenterControllerTest.java b/admin/kernel-masterdata-service/src/test/java/io/mosip/kernel/masterdata/test/controller/RegistrationCenterControllerTest.java index 5c40b9ca8f..61ac5af576 100644 --- a/admin/kernel-masterdata-service/src/test/java/io/mosip/kernel/masterdata/test/controller/RegistrationCenterControllerTest.java +++ b/admin/kernel-masterdata-service/src/test/java/io/mosip/kernel/masterdata/test/controller/RegistrationCenterControllerTest.java @@ -28,6 +28,7 @@ import org.springframework.security.test.context.support.WithUserDetails; import org.springframework.test.context.junit4.SpringRunner; import org.springframework.test.web.servlet.MockMvc; +import org.springframework.test.web.servlet.MvcResult; import org.springframework.test.web.servlet.request.MockMvcRequestBuilders; import java.time.LocalDate; @@ -37,6 +38,7 @@ import java.util.List; import java.util.Map; +import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.doNothing; @RunWith(SpringRunner.class) @@ -512,9 +514,15 @@ public void decommissionRegCenter_WithDuplicateId_Fail() throws Exception { @WithUserDetails("global-admin") public void decommissionRegCenterFail_WithMappedRegCenter() throws Exception { - MasterDataTest.checkResponse( - mockMvc.perform(MockMvcRequestBuilders.put("/registrationcenters/decommission/10003")).andReturn(), - "KER-MSD-351"); + MvcResult result = mockMvc + .perform(MockMvcRequestBuilders.put("/registrationcenters/decommission/10003")) + .andReturn(); + + String body = result.getResponse().getContentAsString(); + assertTrue( + "Expected KER-MSD-351 (machine mapped) or KER-MSD-352 (user mapped), got: " + body, + body.contains("KER-MSD-351") || body.contains("KER-MSD-352") + ); } From 085224bcba5692c8ce6c6e6e1c83c549c94088f9 Mon Sep 17 00:00:00 2001 From: GOKULRAJ136 <110164849+GOKULRAJ136@users.noreply.github.com> Date: Tue, 21 Apr 2026 19:01:33 +0530 Subject: [PATCH 5/6] Reverted test data.sql Signed-off-by: GOKULRAJ136 <110164849+GOKULRAJ136@users.noreply.github.com> --- admin/kernel-masterdata-service/src/test/resources/data.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/kernel-masterdata-service/src/test/resources/data.sql b/admin/kernel-masterdata-service/src/test/resources/data.sql index 3fceecdbc9..61b4159d32 100644 --- a/admin/kernel-masterdata-service/src/test/resources/data.sql +++ b/admin/kernel-masterdata-service/src/test/resources/data.sql @@ -259,7 +259,7 @@ INSERT INTO MASTER.machine_master_h(id, name, mac_address, serial_num, ip_addres DELETE FROM MASTER.user_detail_h; INSERT INTO MASTER.user_detail_h(id, name, status_code, regcntr_id, lang_code, last_login_dtimes, last_login_method, is_active, cr_by, cr_dtimes, upd_by, upd_dtimes, is_deleted, del_dtimes, eff_dtimes) VALUES ('1','abc','ACT','10001','eng',NULL,'PWD', true,'superadmin', TIMESTAMP '2018-12-10 11:42:52.994',NULL, NULL, NULL, NULL, TIMESTAMP '2023-12-10 11:42:52.994'), -('100','abc','ACT','10001','eng',NULL,'PWD', true,'superadmin', TIMESTAMP '2018-12-10 11:42:52.994',NULL, NULL, NULL, NULL, TIMESTAMP '2023-12-10 11:42:52.994'); +('100','abc','ACT','10003','eng',NULL,'PWD', true,'superadmin', TIMESTAMP '2018-12-10 11:42:52.994',NULL, NULL, NULL, NULL, TIMESTAMP '2023-12-10 11:42:52.994'); DELETE FROM MASTER.zone_user; INSERT INTO MASTER.zone_user(zone_code, usr_id, lang_code, is_active, cr_by, cr_dtimes, upd_by, upd_dtimes, is_deleted, del_dtimes) values From 18e337883fb563bc62b0562fe083914f962080b0 Mon Sep 17 00:00:00 2001 From: GOKULRAJ136 <110164849+GOKULRAJ136@users.noreply.github.com> Date: Mon, 27 Apr 2026 17:54:07 +0530 Subject: [PATCH 6/6] corrected test case Signed-off-by: GOKULRAJ136 <110164849+GOKULRAJ136@users.noreply.github.com> --- .../RegistrationCenterControllerTest.java | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/admin/kernel-masterdata-service/src/test/java/io/mosip/kernel/masterdata/test/controller/RegistrationCenterControllerTest.java b/admin/kernel-masterdata-service/src/test/java/io/mosip/kernel/masterdata/test/controller/RegistrationCenterControllerTest.java index 61ac5af576..8220fc682c 100644 --- a/admin/kernel-masterdata-service/src/test/java/io/mosip/kernel/masterdata/test/controller/RegistrationCenterControllerTest.java +++ b/admin/kernel-masterdata-service/src/test/java/io/mosip/kernel/masterdata/test/controller/RegistrationCenterControllerTest.java @@ -26,9 +26,9 @@ import org.springframework.http.HttpHeaders; import org.springframework.http.MediaType; import org.springframework.security.test.context.support.WithUserDetails; +import org.springframework.test.context.jdbc.Sql; import org.springframework.test.context.junit4.SpringRunner; import org.springframework.test.web.servlet.MockMvc; -import org.springframework.test.web.servlet.MvcResult; import org.springframework.test.web.servlet.request.MockMvcRequestBuilders; import java.time.LocalDate; @@ -38,7 +38,6 @@ import java.util.List; import java.util.Map; -import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.doNothing; @RunWith(SpringRunner.class) @@ -511,18 +510,14 @@ public void decommissionRegCenter_WithDuplicateId_Fail() throws Exception { } @Test + @Sql(statements = "DELETE FROM master.user_detail WHERE regcntr_id='10003'", + executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD) @WithUserDetails("global-admin") public void decommissionRegCenterFail_WithMappedRegCenter() throws Exception { - MvcResult result = mockMvc - .perform(MockMvcRequestBuilders.put("/registrationcenters/decommission/10003")) - .andReturn(); - - String body = result.getResponse().getContentAsString(); - assertTrue( - "Expected KER-MSD-351 (machine mapped) or KER-MSD-352 (user mapped), got: " + body, - body.contains("KER-MSD-351") || body.contains("KER-MSD-352") - ); + MasterDataTest.checkResponse( + mockMvc.perform(MockMvcRequestBuilders.put("/registrationcenters/decommission/10003")).andReturn(), + "KER-MSD-351"); }