From ce601d82002b0b79b813aee4f7cff9f92c3d70de Mon Sep 17 00:00:00 2001 From: GOKULRAJ136 <110164849+GOKULRAJ136@users.noreply.github.com> Date: Mon, 27 Apr 2026 15:27:55 +0530 Subject: [PATCH 1/3] Corrected decommissionRegCenterFail_WithMappedRegCenter testcase [MOSIP-44916] Signed-off-by: GOKULRAJ136 <110164849+GOKULRAJ136@users.noreply.github.com> --- .../RegistrationCenterControllerTest.java | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 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..de574a219b 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 @@ -29,6 +29,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; @@ -38,6 +39,7 @@ import java.util.List; import java.util.Map; +import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.doNothing; @RunWith(SpringRunner.class) @@ -509,14 +511,19 @@ public void decommissionRegCenter_WithDuplicateId_Fail() throws Exception { } - @Ignore @Test @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 ce11ccb9dbb9a19f8da5d9446c2a89b944373861 Mon Sep 17 00:00:00 2001 From: GOKULRAJ136 <110164849+GOKULRAJ136@users.noreply.github.com> Date: Mon, 27 Apr 2026 16:16:22 +0530 Subject: [PATCH 2/3] Update RegistrationCenterControllerTest.java Signed-off-by: GOKULRAJ136 <110164849+GOKULRAJ136@users.noreply.github.com> --- .../RegistrationCenterControllerTest.java | 14 +++----------- 1 file changed, 3 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 de574a219b..ae0a0cceb5 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 @@ -29,7 +29,6 @@ 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; @@ -39,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) @@ -515,15 +513,9 @@ public void decommissionRegCenter_WithDuplicateId_Fail() throws Exception { @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"); } From b7be2afe51c351a0a47b074549c6a8b0279d3a11 Mon Sep 17 00:00:00 2001 From: GOKULRAJ136 <110164849+GOKULRAJ136@users.noreply.github.com> Date: Mon, 27 Apr 2026 17:07:32 +0530 Subject: [PATCH 3/3] Update RegistrationCenterControllerTest.java Signed-off-by: GOKULRAJ136 <110164849+GOKULRAJ136@users.noreply.github.com> --- .../test/controller/RegistrationCenterControllerTest.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 ae0a0cceb5..a19a247ff6 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; @@ -27,6 +26,7 @@ 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.request.MockMvcRequestBuilders; @@ -511,6 +511,8 @@ public void decommissionRegCenter_WithDuplicateId_Fail() throws Exception { @Test @WithUserDetails("global-admin") + @Sql(statements = "DELETE FROM master.user_detail WHERE regcntr_id='10003'", + executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD) public void decommissionRegCenterFail_WithMappedRegCenter() throws Exception { MasterDataTest.checkResponse(