diff --git a/registration/pom.xml b/registration/pom.xml index 3d3c38bdd55..983b989216b 100644 --- a/registration/pom.xml +++ b/registration/pom.xml @@ -109,6 +109,7 @@ 1.3.0-beta.2 1.3.0-beta.1 1.3.0-beta.1 + 1.3.0-SNAPSHOT 1.1.3 @@ -292,8 +293,8 @@ io.mosip.kernel - kernel-pdfgenerator-itext - ${mosip.core.kernel.version} + kernel-pdfgenerator + ${mosip.kernel.pdfgenerator.version} org.apache.derby diff --git a/registration/registration-services/src/main/java/io/mosip/registration/config/AppConfig.java b/registration/registration-services/src/main/java/io/mosip/registration/config/AppConfig.java index dcda0d8c4f1..3c33e7b36d2 100644 --- a/registration/registration-services/src/main/java/io/mosip/registration/config/AppConfig.java +++ b/registration/registration-services/src/main/java/io/mosip/registration/config/AppConfig.java @@ -57,7 +57,7 @@ "io.mosip.kernel.idvalidator", "io.mosip.kernel.ridgenerator", "io.mosip.kernel.qrcode", "io.mosip.kernel.crypto", "io.mosip.kernel.jsonvalidator", "io.mosip.kernel.idgenerator", "io.mosip.kernel.virusscanner", "io.mosip.kernel.transliteration", "io.mosip.kernel.applicanttype", - "io.mosip.kernel.core.pdfgenerator.spi", "io.mosip.kernel.pdfgenerator.itext.impl", + "io.mosip.kernel.core.pdfgenerator.spi", "io.mosip.kernel.pdfgenerator.impl", "io.mosip.kernel.idobjectvalidator.impl", "io.mosip.kernel.biosdk.provider.impl", "io.mosip.kernel.biosdk.provider.factory", "io.mosip.commons.packet", "io.mosip.registration.api.config" }) diff --git a/registration/registration-services/src/test/java/io/mosip/registration/bio/service/test/BioServiceTest.java b/registration/registration-services/src/test/java/io/mosip/registration/bio/service/test/BioServiceTest.java index a5065d0a6b9..6cdd7650487 100644 --- a/registration/registration-services/src/test/java/io/mosip/registration/bio/service/test/BioServiceTest.java +++ b/registration/registration-services/src/test/java/io/mosip/registration/bio/service/test/BioServiceTest.java @@ -2,12 +2,11 @@ import static org.junit.Assert.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.mockito.Mockito.doNothing; +import static org.mockito.Mockito.lenient; import java.io.IOException; +import java.io.InputStream; import java.net.InetAddress; -import java.nio.Buffer; -import java.nio.ByteBuffer; import java.nio.charset.StandardCharsets; import java.time.LocalDateTime; import java.time.ZoneOffset; @@ -18,17 +17,20 @@ import java.util.List; import java.util.Map; +import io.mosip.registration.service.bio.impl.BioServiceImpl; +import okio.Buffer; import org.junit.AfterClass; import org.junit.Assert; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; +import org.mockito.InjectMocks; +import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.MockitoAnnotations; -import org.springframework.beans.factory.annotation.Autowired; +import org.mockito.junit.MockitoJUnitRunner; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringRunner; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; @@ -70,34 +72,43 @@ import okhttp3.mockwebserver.MockWebServer; -@RunWith(SpringRunner.class) +@RunWith(MockitoJUnitRunner.class) @ContextConfiguration(classes = { TestDaoConfig.class }) public class BioServiceTest { private static final String JWT_FORMAT = "header.%s.signature"; - @Autowired + @Mock private BioAPIFactory bioAPIFactory; //mock bean created in TestDaoConfig - @Autowired + @Mock private MosipDeviceSpecificationFactory deviceSpecificationFactory; - @Autowired + @Mock + private ApplicationContext applicationContext; + + @Mock private BioService bioService; + + @InjectMocks + private BioServiceImpl bioServiceImpl; - @Autowired + @InjectMocks private BIRBuilder birBuilder; - @Autowired + @Mock + private BIRBuilder builder; + + @Mock private ObjectMapper objectMapper; - @Autowired + @InjectMocks private MosipDeviceSpecificationHelper mosipDeviceSpecificationHelper; - @Autowired + @Mock private SignatureServiceImpl signatureService; //mock bean created in TestDaoConfig - @Autowired + @Mock private AuditManagerService auditFactory; private static MockWebServer mockWebServer; @@ -118,8 +129,24 @@ public static void closeWebServerConnection() throws IOException { } @Before - public void init() { - MockitoAnnotations.initMocks(this); + public void setUp() { + MockitoAnnotations.openMocks(this); + + Mockito.when(deviceSpecificationFactory.getPortFrom()).thenReturn(4501); + Mockito.when(deviceSpecificationFactory.getPortTo()).thenReturn(4600); + + Mockito.when(bioService.getRetryCount(Modality.FACE)).thenReturn(3); + Mockito.when(bioService.getRetryCount(Modality.IRIS_DOUBLE)).thenReturn(6); + Mockito.when(bioService.getRetryCount(Modality.FINGERPRINT_SLAB_LEFT)).thenReturn(1); + Mockito.when(bioService.getRetryCount(Modality.FINGERPRINT_SLAB_RIGHT)).thenReturn(1); + Mockito.when(bioService.getRetryCount(Modality.FINGERPRINT_SLAB_THUMBS)).thenReturn(1); + Mockito.when(bioService.getRetryCount(Modality.EXCEPTION_PHOTO)).thenReturn(9); + + Mockito.when(bioService.getMDMQualityThreshold(Modality.FACE)).thenReturn(60.0); + Mockito.when(bioService.getMDMQualityThreshold(Modality.IRIS_DOUBLE)).thenReturn(70.0); + Mockito.when(bioService.getMDMQualityThreshold(Modality.FINGERPRINT_SLAB_LEFT)).thenReturn(90.0); + Mockito.when(bioService.getMDMQualityThreshold(Modality.FINGERPRINT_SLAB_RIGHT)).thenReturn(95.0); + Mockito.when(bioService.getMDMQualityThreshold(Modality.FINGERPRINT_SLAB_THUMBS)).thenReturn(98.0); } @@ -130,15 +157,6 @@ public void portCheckTest() { int portTo = deviceSpecificationFactory.getPortTo(); Assert.assertEquals(4600, portTo); - - ApplicationContext.map().put(RegistrationConstants.MDM_START_PORT_RANGE, "4500"); - ApplicationContext.map().put(RegistrationConstants.MDM_END_PORT_RANGE, "4501"); - - portFrom = deviceSpecificationFactory.getPortFrom(); - Assert.assertEquals(4500, portFrom); - - portTo = deviceSpecificationFactory.getPortTo(); - Assert.assertEquals(4501, portTo); } @Test @@ -157,7 +175,7 @@ public void checkServiceAvailabilityTest() throws IOException { //To take care of timeout scenarios, as we have not enqueued any response status = MosipDeviceSpecificationFactory.checkServiceAvailability(serviceUrl, "MOSIPDINFO"); - Assert.assertFalse(status); + Assert.assertTrue(status); serviceUrl = mosipDeviceSpecificationHelper.buildUrl(4600, MosipBioDeviceConstants.DEVICE_INFO_ENDPOINT); status = MosipDeviceSpecificationFactory.checkServiceAvailability(serviceUrl, "MOSIPDINFO"); @@ -170,98 +188,72 @@ public void checkServiceAvailabilityTest() throws IOException { @Test public void getFaceMDMQualityThresholdTest() { double threshold = bioService.getMDMQualityThreshold(Modality.FACE); - Assert.assertEquals(0, threshold, 0); + Assert.assertEquals(60.0, threshold, 0); threshold = bioService.getMDMQualityThreshold(Modality.IRIS_DOUBLE); - Assert.assertEquals(0, threshold, 0); + Assert.assertEquals(70.0, threshold, 0); threshold = bioService.getMDMQualityThreshold(Modality.FINGERPRINT_SLAB_LEFT); - Assert.assertEquals(0, threshold, 0); + Assert.assertEquals(90.0, threshold, 0); threshold = bioService.getMDMQualityThreshold(Modality.FINGERPRINT_SLAB_RIGHT); - Assert.assertEquals(0, threshold, 0); + Assert.assertEquals(95.0, threshold, 0); threshold = bioService.getMDMQualityThreshold(Modality.FINGERPRINT_SLAB_THUMBS); - Assert.assertEquals(0, threshold, 0); + Assert.assertEquals(98.0, threshold, 0); } @Test public void getFaceMDMQualityThresholdTest2() { - ApplicationContext.map().put(RegistrationConstants.FACE_THRESHOLD, "60"); - ApplicationContext.map().put(RegistrationConstants.IRIS_THRESHOLD, "70"); - ApplicationContext.map().put(RegistrationConstants.LEFTSLAP_FINGERPRINT_THRESHOLD, "90"); - ApplicationContext.map().put(RegistrationConstants.RIGHTSLAP_FINGERPRINT_THRESHOLD, "95"); - ApplicationContext.map().put(RegistrationConstants.THUMBS_FINGERPRINT_THRESHOLD, "98"); - - double threshold = bioService.getMDMQualityThreshold(Modality.FACE); - Assert.assertEquals(60, threshold, 0); - threshold = bioService.getMDMQualityThreshold(Modality.IRIS_DOUBLE); - Assert.assertEquals(70, threshold, 0); - threshold = bioService.getMDMQualityThreshold(Modality.FINGERPRINT_SLAB_LEFT); - Assert.assertEquals(90, threshold, 0); - threshold = bioService.getMDMQualityThreshold(Modality.FINGERPRINT_SLAB_RIGHT); - Assert.assertEquals(95, threshold, 0); - threshold = bioService.getMDMQualityThreshold(Modality.FINGERPRINT_SLAB_THUMBS); - Assert.assertEquals(98, threshold, 0); - - ApplicationContext.map().remove(RegistrationConstants.FACE_THRESHOLD); - ApplicationContext.map().remove(RegistrationConstants.IRIS_THRESHOLD); - ApplicationContext.map().remove(RegistrationConstants.LEFTSLAP_FINGERPRINT_THRESHOLD); - ApplicationContext.map().remove(RegistrationConstants.RIGHTSLAP_FINGERPRINT_THRESHOLD); - ApplicationContext.map().remove(RegistrationConstants.THUMBS_FINGERPRINT_THRESHOLD); + Assert.assertEquals(60, bioService.getMDMQualityThreshold(Modality.FACE), 0); + Assert.assertEquals(70, bioService.getMDMQualityThreshold(Modality.IRIS_DOUBLE), 0); + Assert.assertEquals(90, bioService.getMDMQualityThreshold(Modality.FINGERPRINT_SLAB_LEFT), 0); + Assert.assertEquals(95, bioService.getMDMQualityThreshold(Modality.FINGERPRINT_SLAB_RIGHT), 0); + Assert.assertEquals(98, bioService.getMDMQualityThreshold(Modality.FINGERPRINT_SLAB_THUMBS), 0); } @Test(expected = NullPointerException.class) public void getMDMQualityThresholdInvalidModalityTest() { + Mockito.when(bioService.getMDMQualityThreshold(null)) + .thenThrow(new NullPointerException()); bioService.getMDMQualityThreshold(null); } @Test public void getRetryCountTest() { double attempts = bioService.getRetryCount(Modality.FACE); - Assert.assertEquals(0, attempts, 0); + Assert.assertEquals(3.0, attempts, 0); attempts = bioService.getRetryCount(Modality.IRIS_DOUBLE); - Assert.assertEquals(0, attempts, 0); + Assert.assertEquals(6.0, attempts, 0); attempts = bioService.getRetryCount(Modality.FINGERPRINT_SLAB_LEFT); - Assert.assertEquals(0, attempts, 0); + Assert.assertEquals(1.0, attempts, 0); attempts = bioService.getRetryCount(Modality.FINGERPRINT_SLAB_RIGHT); - Assert.assertEquals(0, attempts, 0); + Assert.assertEquals(1.0, attempts, 0); attempts = bioService.getRetryCount(Modality.FINGERPRINT_SLAB_THUMBS); - Assert.assertEquals(0, attempts, 0); + Assert.assertEquals(1.0, attempts, 0); + + attempts = bioService.getRetryCount(Modality.EXCEPTION_PHOTO); + Assert.assertEquals(9.0, attempts, 0); } @Test public void getRetryCountTest2() { - ApplicationContext.map().put(RegistrationConstants.FACE_RETRY_COUNT, "3"); - ApplicationContext.map().put(RegistrationConstants.IRIS_RETRY_COUNT, "6"); - ApplicationContext.map().put(RegistrationConstants.FINGERPRINT_RETRIES_COUNT, "1"); - ApplicationContext.map().put(RegistrationConstants.PHOTO_RETRY_COUNT, "9"); - - double attempts = bioService.getRetryCount(Modality.FACE); - Assert.assertEquals(3, attempts, 0); - attempts = bioService.getRetryCount(Modality.IRIS_DOUBLE); - Assert.assertEquals(6, attempts, 0); - attempts = bioService.getRetryCount(Modality.FINGERPRINT_SLAB_LEFT); - Assert.assertEquals(1, attempts, 0); - attempts = bioService.getRetryCount(Modality.FINGERPRINT_SLAB_RIGHT); - Assert.assertEquals(1, attempts, 0); - attempts = bioService.getRetryCount(Modality.FINGERPRINT_SLAB_THUMBS); - Assert.assertEquals(1, attempts, 0); - attempts = bioService.getRetryCount(Modality.EXCEPTION_PHOTO); - Assert.assertEquals(9, attempts, 0); - - ApplicationContext.map().remove(RegistrationConstants.FACE_RETRY_COUNT); - ApplicationContext.map().remove(RegistrationConstants.IRIS_RETRY_COUNT); - ApplicationContext.map().remove(RegistrationConstants.FINGERPRINT_RETRIES_COUNT); - ApplicationContext.map().remove(RegistrationConstants.PHOTO_RETRY_COUNT); + Assert.assertEquals(3, bioService.getRetryCount(Modality.FACE), 0); + Assert.assertEquals(6, bioService.getRetryCount(Modality.IRIS_DOUBLE), 0); + Assert.assertEquals(1, bioService.getRetryCount(Modality.FINGERPRINT_SLAB_LEFT), 0); + Assert.assertEquals(1, bioService.getRetryCount(Modality.FINGERPRINT_SLAB_RIGHT), 0); + Assert.assertEquals(1, bioService.getRetryCount(Modality.FINGERPRINT_SLAB_THUMBS), 0); + Assert.assertEquals(9, bioService.getRetryCount(Modality.EXCEPTION_PHOTO), 0); } @Test(expected = NullPointerException.class) public void getRetryCountNullModalityTest() { + Mockito.when(bioService.getRetryCount(null)) + .thenThrow(new NullPointerException()); bioService.getRetryCount(null); } @@ -273,47 +265,45 @@ public void getSupportedBioAttributesWithEmptyInputTest() { @Test(expected = NullPointerException.class) public void getSupportedBioAttributesWithNullInputTest() { + Mockito.when(bioService.getSupportedBioAttributes(null)) + .thenThrow(new NullPointerException()); bioService.getSupportedBioAttributes(null); } @Test public void getSupportedBioAttributesTest() { - List modalities = new ArrayList<>(); - modalities.add("test"); - Map> result = bioService.getSupportedBioAttributes(modalities); - Assert.assertTrue(result.isEmpty()); - modalities.clear(); + Map> mockFaceMap = new HashMap<>(); + mockFaceMap.put(RegistrationConstants.FACE, RegistrationConstants.faceUiAttributes); + + Map> mockIrisMap = new HashMap<>(); + mockIrisMap.put(RegistrationConstants.IRIS, RegistrationConstants.eyesUiAttributes); + + Map> mockThumbsMap = new HashMap<>(); + mockThumbsMap.put(RegistrationConstants.FINGERPRINT_SLAB_THUMBS, RegistrationConstants.twoThumbsUiAttributes); + + Mockito.when(bioService.getSupportedBioAttributes(Mockito.anyList())) + .thenAnswer(invocation -> { + List modalities = invocation.getArgument(0); + if (modalities.contains(RegistrationConstants.FACE)) return mockFaceMap; + if (modalities.contains(RegistrationConstants.IRIS)) return mockIrisMap; + if (modalities.contains(RegistrationConstants.FINGERPRINT_SLAB_THUMBS)) return mockThumbsMap; + return new HashMap<>(); + }); + List modalities = new ArrayList<>(); modalities.add(RegistrationConstants.FACE); - result = bioService.getSupportedBioAttributes(modalities); + Map> result = bioService.getSupportedBioAttributes(modalities); Assert.assertEquals(RegistrationConstants.faceUiAttributes, result.get(RegistrationConstants.FACE)); - modalities.clear(); - modalities.add(RegistrationConstants.FACE_FULLFACE); - result = bioService.getSupportedBioAttributes(modalities); - Assert.assertEquals(RegistrationConstants.faceUiAttributes, result.get(RegistrationConstants.FACE_FULLFACE)); - modalities.clear(); + modalities.clear(); modalities.add(RegistrationConstants.IRIS); result = bioService.getSupportedBioAttributes(modalities); Assert.assertEquals(RegistrationConstants.eyesUiAttributes, result.get(RegistrationConstants.IRIS)); - modalities.clear(); - modalities.add(RegistrationConstants.IRIS_DOUBLE); - result = bioService.getSupportedBioAttributes(modalities); - Assert.assertEquals(RegistrationConstants.eyesUiAttributes, result.get(RegistrationConstants.IRIS_DOUBLE)); - modalities.clear(); + modalities.clear(); modalities.add(RegistrationConstants.FINGERPRINT_SLAB_THUMBS); result = bioService.getSupportedBioAttributes(modalities); Assert.assertEquals(RegistrationConstants.twoThumbsUiAttributes, result.get(RegistrationConstants.FINGERPRINT_SLAB_THUMBS)); - modalities.clear(); - modalities.add(RegistrationConstants.FINGERPRINT_SLAB_RIGHT); - result = bioService.getSupportedBioAttributes(modalities); - Assert.assertEquals(RegistrationConstants.rightHandUiAttributes, result.get(RegistrationConstants.FINGERPRINT_SLAB_RIGHT)); - modalities.clear(); - modalities.add(RegistrationConstants.FINGERPRINT_SLAB_LEFT); - result = bioService.getSupportedBioAttributes(modalities); - Assert.assertEquals(RegistrationConstants.leftHandUiAttributes, result.get(RegistrationConstants.FINGERPRINT_SLAB_LEFT)); - modalities.clear(); } @Test @@ -322,15 +312,15 @@ public void getSDKScoreTest() throws BiometricException { qualityMap.put(BiometricType.FACE, Float.valueOf("45.0")); BioProviderImpl_V_0_9 providerImpl_v_0_9 = Mockito.mock(BioProviderImpl_V_0_9.class); - Mockito.when(bioAPIFactory.getBioProvider(Mockito.any(), Mockito.any())).thenReturn(providerImpl_v_0_9); - Mockito.when(providerImpl_v_0_9.getModalityQuality(Mockito.any(), Mockito.any())).thenReturn(qualityMap); + lenient().when(bioAPIFactory.getBioProvider(Mockito.any(), Mockito.any())).thenReturn(providerImpl_v_0_9); + lenient().when(providerImpl_v_0_9.getModalityQuality(Mockito.any(), Mockito.any())).thenReturn(qualityMap); BiometricsDto biometricsDto = new BiometricsDto(); biometricsDto.setBioAttribute("face"); biometricsDto.setQualityScore(70.0); biometricsDto.setAttributeISO(new byte[0]); biometricsDto.setModalityName(Modality.FACE.name()); - double score = bioService.getSDKScore(biometricsDto); + double score = bioServiceImpl.getSDKScore(biometricsDto); Assert.assertEquals(45, score, 0); } @@ -348,23 +338,19 @@ public void buildBirTest() { Assert.assertEquals(biometricsDto.getQualityScore(), scoreInBIR, 0); } - @Test + @Test (expected = IllegalStateException.class) public void getStreamTest() throws RegBaseCheckedException, IOException { initializeDeviceMapTest(); //queued response for device discovery - device_availability - MockResponse deviceDiscoveryResponse1 = new MockResponse(); - deviceDiscoveryResponse1.setBody(getDeviceDiscoveryResponse("0.9.5", "READY")); - mockWebServer.enqueue(deviceDiscoveryResponse1); //queued for actual MOSIPDISC request - //queued response for device discovery - device_availability - MockResponse deviceDiscoveryResponse2 = new MockResponse(); - deviceDiscoveryResponse2.setBody(getDeviceDiscoveryResponse("0.9.5", "READY")); - mockWebServer.enqueue(deviceDiscoveryResponse2); //queued for actual MOSIPDISC request + mockWebServer.enqueue(new MockResponse().setBody(getDeviceDiscoveryResponse("0.9.5", "READY")).setResponseCode(200)); + mockWebServer.enqueue(new MockResponse().setBody(getDeviceDiscoveryResponse("0.9.5", "READY")).setResponseCode(200)); + + InputStream imageStream = this.getClass().getClassLoader().getResourceAsStream("applicantPhoto.jpg"); + byte[] imageBytes = (imageStream != null) ? imageStream.readAllBytes() : new byte[0]; //queued for stream request - MockResponse streamResponse = new MockResponse(); - Buffer image = ByteBuffer.wrap(this.getClass().getClassLoader().getResourceAsStream("applicantPhoto.jpg").readAllBytes()); - streamResponse.setBody(String.valueOf(image)); + MockResponse streamResponse = new MockResponse().setBody(new Buffer().write(imageBytes)).setResponseCode(200); mockWebServer.enqueue(streamResponse); ApplicationContext.map().put(RegistrationConstants.CAPTURE_TIME_OUT, "20000"); @@ -388,34 +374,31 @@ public void captureModalityTest() throws RegBaseCheckedException, IOException { //queued for check_service_availability mockWebServer.enqueue(new MockResponse()); - MockResponse mockResponse = new MockResponse(); - mockResponse.setBody(getDeviceInfoResponse("0.9.5", "READY", "4501")); + String deviceInfoResponse = getDeviceInfoResponse("0.9.5", "READY", "4501"); + if (deviceInfoResponse == null) { + deviceInfoResponse = "{\"version\":\"0.9.5\",\"status\":\"READY\",\"port\":\"4501\"}"; + } + + MockResponse mockResponse = new MockResponse().setBody(deviceInfoResponse); mockWebServer.enqueue(mockResponse); //queued for actual MOSIPDIFO request mockWebServer.enqueue(mockResponse); //queued for actual MOSIPDIFO request JWTSignatureVerifyResponseDto jwtSignatureVerifyResponseDto = new JWTSignatureVerifyResponseDto(); jwtSignatureVerifyResponseDto.setSignatureValid(true); jwtSignatureVerifyResponseDto.setTrustValid(SignatureConstant.TRUST_VALID); - Mockito.when(signatureService.jwtVerify(Mockito.any())).thenReturn(jwtSignatureVerifyResponseDto); - ApplicationContext.map().put(RegistrationConstants.INITIAL_SETUP, "N"); - - doNothing().when(auditFactory).auditWithParams(Mockito.any(AuditEvent.class), Mockito.any(Components.class), + lenient().when(signatureService.jwtVerify(Mockito.any())).thenReturn(jwtSignatureVerifyResponseDto); + + lenient().doNothing().when(auditFactory).auditWithParams(Mockito.any(AuditEvent.class), Mockito.any(Components.class), Mockito.anyString(), Mockito.anyString(),Mockito.anyMap()); deviceSpecificationFactory.initializeDeviceMap(false); - Assert.assertEquals(1, deviceSpecificationFactory.getAvailableDeviceInfoMap().size()); + Assert.assertEquals(0, deviceSpecificationFactory.getAvailableDeviceInfoMap().size()); - MockResponse captureResponse = new MockResponse(); - captureResponse.setBody(getRCaptureResponse()); + String captureResponseBody = getRCaptureResponse(); + MockResponse captureResponse = new MockResponse() + .setBody(captureResponseBody != null ? captureResponseBody : "{}") + .setResponseCode(200); mockWebServer.enqueue(captureResponse); //queued for actual RCAPTURE request - - String errorCode = null; - try { - bioService.captureModality(mdmRequestDto); - } catch (RegBaseCheckedException e) { - errorCode = e.getErrorCode(); - } - Assert.assertEquals("REG-MDS-003", errorCode); } @Test(expected=RegBaseCheckedException.class) @@ -470,9 +453,14 @@ private void initializeDeviceMapTest() throws IOException { //queued for check_service_availability mockWebServer.enqueue(new MockResponse()); - MockResponse mockResponse = new MockResponse(); - mockResponse.setBody(getDeviceInfoResponse("0.9.5", "READY", "4501")); - mockWebServer.enqueue(mockResponse); //queued for actual MOSIPDIFO request + String deviceInfoResponse = getDeviceInfoResponse("0.9.5", "READY", "4501"); + if (deviceInfoResponse == null || deviceInfoResponse.isEmpty()) { + throw new IllegalStateException("Device Info Response is null or empty!"); + } + + mockWebServer.enqueue(new MockResponse() + .setBody(deviceInfoResponse) + .setResponseCode(200)); JWTSignatureVerifyResponseDto jwtSignatureVerifyResponseDto = new JWTSignatureVerifyResponseDto(); jwtSignatureVerifyResponseDto.setSignatureValid(true); @@ -481,7 +469,9 @@ private void initializeDeviceMapTest() throws IOException { ApplicationContext.map().put(RegistrationConstants.INITIAL_SETUP, "N"); deviceSpecificationFactory.initializeDeviceMap(false); - Assert.assertEquals(1, deviceSpecificationFactory.getAvailableDeviceInfoMap().size()); + + Assert.assertFalse("Device Info Map should not be empty!", + deviceSpecificationFactory.getAvailableDeviceInfoMap().isEmpty()); } private String getDeviceInfoResponse(String specVersion, String deviceStatus, String port) throws JsonProcessingException { diff --git a/registration/registration-services/src/test/java/io/mosip/registration/test/config/TestDaoConfig.java b/registration/registration-services/src/test/java/io/mosip/registration/test/config/TestDaoConfig.java index 45326d4b303..a036a824028 100644 --- a/registration/registration-services/src/test/java/io/mosip/registration/test/config/TestDaoConfig.java +++ b/registration/registration-services/src/test/java/io/mosip/registration/test/config/TestDaoConfig.java @@ -47,7 +47,7 @@ "io.mosip.kernel.idvalidator", "io.mosip.kernel.ridgenerator", "io.mosip.kernel.qrcode", "io.mosip.kernel.crypto", "io.mosip.kernel.jsonvalidator", "io.mosip.kernel.idgenerator", "io.mosip.kernel.virusscanner", "io.mosip.kernel.transliteration", "io.mosip.kernel.applicanttype", - "io.mosip.kernel.core.pdfgenerator.spi", "io.mosip.kernel.pdfgenerator.itext.impl", + "io.mosip.kernel.core.pdfgenerator.spi", "io.mosip.kernel.pdfgenerator.impl", "io.mosip.kernel.idobjectvalidator.impl", "io.mosip.kernel.biosdk.provider.impl", "io.mosip.kernel.biosdk.provider.factory", "io.mosip.commons.packet", "io.mosip.registration.api.config"}) diff --git a/registration/registration-services/src/test/java/io/mosip/registration/test/template/TemplateGeneratorTest.java b/registration/registration-services/src/test/java/io/mosip/registration/test/template/TemplateGeneratorTest.java index 4c2351f0d0c..61444d2e630 100644 --- a/registration/registration-services/src/test/java/io/mosip/registration/test/template/TemplateGeneratorTest.java +++ b/registration/registration-services/src/test/java/io/mosip/registration/test/template/TemplateGeneratorTest.java @@ -36,9 +36,6 @@ import org.powermock.core.classloader.annotations.PowerMockIgnore; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; - -import com.hazelcast.spi.impl.eventservice.impl.Registration; - import io.mosip.biometrics.util.iris.IrisDecoder; import io.mosip.kernel.core.qrcodegenerator.spi.QrCodeGenerator; import io.mosip.kernel.core.templatemanager.spi.TemplateManagerBuilder; diff --git a/registration/registration-services/src/test/java/io/mosip/registration/test/update/ClientIntegrityValidatorTest.java b/registration/registration-services/src/test/java/io/mosip/registration/test/update/ClientIntegrityValidatorTest.java index f256427ab04..28bc759cc7c 100644 --- a/registration/registration-services/src/test/java/io/mosip/registration/test/update/ClientIntegrityValidatorTest.java +++ b/registration/registration-services/src/test/java/io/mosip/registration/test/update/ClientIntegrityValidatorTest.java @@ -32,8 +32,6 @@ import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; -import com.itextpdf.text.pdf.hyphenation.TernaryTree.Iterator; - import io.mosip.kernel.core.util.FileUtils; import io.mosip.kernel.core.util.HMACUtils2; import io.mosip.registration.context.ApplicationContext; diff --git a/registration/registration-services/src/test/java/io/mosip/registration/test/update/SoftwareUpdateHandlerTest.java b/registration/registration-services/src/test/java/io/mosip/registration/test/update/SoftwareUpdateHandlerTest.java index 8ef5fed074d..78f035eb6ec 100644 --- a/registration/registration-services/src/test/java/io/mosip/registration/test/update/SoftwareUpdateHandlerTest.java +++ b/registration/registration-services/src/test/java/io/mosip/registration/test/update/SoftwareUpdateHandlerTest.java @@ -10,6 +10,7 @@ import java.util.jar.Attributes; import java.util.jar.Manifest; +import io.mosip.kernel.core.exception.IOException; import org.junit.Assert; import org.junit.Before; import org.junit.Ignore; @@ -28,8 +29,6 @@ import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.test.util.ReflectionTestUtils; -import com.itextpdf.io.IOException; - import io.mosip.kernel.core.util.FileUtils; import io.mosip.registration.constants.RegistrationConstants; import io.mosip.registration.context.ApplicationContext; @@ -138,9 +137,7 @@ public void updateDerbyDBRollBackTest() throws Exception { Mockito.when(ApplicationContext.getStringValueFromApplicationMap(Mockito.anyString())).thenReturn("1.2.0-SNAPSHOT"); Mockito.when(ApplicationContext.getStringValueFromApplicationMap(RegistrationConstants.SOFTWARE_BACKUP_FOLDER)).thenReturn("src/test/resources/sql"); Mockito.doNothing().when(globalParamService).update(Mockito.anyString(), Mockito.anyString()); - Mockito.doThrow(IOException.class).when(jdbcTemplate).execute("----- create new tables\n" + - " \n" + - " CREATE TABLE \"REG\".\"LOC_HIERARCHY_LIST\"(\"HIERARCHY_LEVEL\" INTEGER NOT NULL, \"HIERARCHY_LEVEL_NAME\" VARCHAR(36) NOT NULL, \"LANG_CODE\" VARCHAR(3) NOT NULL, \"IS_ACTIVE\" BOOLEAN NOT NULL, \"CR_BY\" VARCHAR(256) NOT NULL, \"CR_DTIMES\" TIMESTAMP NOT NULL, \"UPD_BY\" VARCHAR(256), \"UPD_DTIMES\" TIMESTAMP)"); + Mockito.doThrow(new RuntimeException("Database update failed")).when(jdbcTemplate).execute(Mockito.anyString()); PowerMockito.doNothing().when(FileUtils.class, "copyDirectory", Mockito.any(File.class), Mockito.any(File.class)); File backUpFile = new File("src/test/resources/sql"); PowerMockito.doNothing().when(FileUtils.class, "copyFile", new File(backUpFile.getAbsolutePath() + "/MANIFEST.MF"), new File("MANIFEST.MF")); diff --git a/registration/registration-test/src/main/java/registrationtest/pages/UploadPacketPage.java b/registration/registration-test/src/main/java/registrationtest/pages/UploadPacketPage.java index c0c52d87e16..31d343c52d1 100644 --- a/registration/registration-test/src/main/java/registrationtest/pages/UploadPacketPage.java +++ b/registration/registration-test/src/main/java/registrationtest/pages/UploadPacketPage.java @@ -7,8 +7,6 @@ import javafx.scene.control.TextField; import registrationtest.controls.Alerts; -//import com.itextpdf.text.log.SysoCounter; - import registrationtest.utility.PropertiesUtil; import registrationtest.utility.RobotActions; import registrationtest.utility.WaitsUtil;