DP: fixed DP unit test (#318)

* fixed DB unit test

* clean up

Author: ndduc01

data-processing-service/src/test/java/gov/cdc/dataprocessing/service/implementation/manager/ManagerServiceTest.java

@@ -46,7 +46,6 @@
 import org.mockito.MockitoAnnotations;
 
 import java.util.ArrayList;
-import java.util.NoSuchElementException;
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
 
@@ -316,7 +315,7 @@ void initiatingInvestigationAndPublicHealthCase_Exception()  {
 
 
 
-        assertThrows(NoSuchElementException.class, () -> managerService.initiatingInvestigationAndPublicHealthCase(publicHealthCaseFlowContainer));
+        assertThrows(DataProcessingException.class, () -> managerService.initiatingInvestigationAndPublicHealthCase(publicHealthCaseFlowContainer));
 
         verify(nbsInterfaceRepository, times(1)).findByNbsInterfaceUid(any());
 

data-processing-service/src/test/java/gov/cdc/dataprocessing/service/implementation/observation/ObservationCodeServiceTest.java

@@ -204,7 +204,7 @@ void deriveTheConditionCodeList_Test_4() throws DataProcessingException {
         orderTest.setTheParticipationDtoCollection(patCol);
 
         when(observationUtil.getUid(any(), any(), any(), any(),
-                any(), any(), any())).thenThrow(new DataProcessingException("TEST"));
+                any(), any(), any())).thenReturn(-1L);
 
         OrganizationContainer orgConn =new OrganizationContainer();
         var enCol = new ArrayList<EntityIdDto>();
@@ -218,11 +218,10 @@ void deriveTheConditionCodeList_Test_4() throws DataProcessingException {
         when(organizationRepositoryUtil.loadObject(10L, null)).thenReturn(orgConn);
 
 
-        DataProcessingException thrown = assertThrows(DataProcessingException.class, () -> {
-            observationCodeService.deriveTheConditionCodeList(labResultProxyVO, orderTest);
-        });
+        var test = observationCodeService.deriveTheConditionCodeList(labResultProxyVO, orderTest);
+
 
-        assertNotNull(thrown);
+        assertNotNull(test);
     }