update DocumentControllerTest

Author: peggy-ntt

Diff for: jrcc-access-spring-boot-autoconfigure/src/main/java/ca/bc/gov/open/jrccaccess/autoconfigure/plugins/http/DocumentController.java

@@ -64,9 +64,7 @@ public ResponseEntity<DocumentReceivedResponse> postDocument(@NotNull @Valid Str
 		TransactionInfo transactionInfo = new TransactionInfo(body.getFilename(), sender, LocalDateTime.now());
 		try {
 			documentReadyHandler.handle(getContent(body.getInputStream()), transactionInfo);
-			
 		} catch (ServiceUnavailableException e) {
-			
 			Error error = new Error();
 			error.setCode(Integer.toString(HttpStatus.SERVICE_UNAVAILABLE.value()));
 			error.setMessage(e.getMessage());

Diff for: jrcc-access-spring-boot-autoconfigure/src/test/java/ca/bc/gov/open/jrccaccess/autoconfigure/plugins/http/DocumentControllerTester.java

@@ -4,6 +4,8 @@
 import static org.junit.Assert.assertTrue;
 
 import java.io.IOException;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
 
 import ca.bc.gov.open.jrccaccess.libs.TransactionInfo;
 import org.junit.Before;
@@ -21,8 +23,7 @@
 import ca.bc.gov.open.jrccaccess.libs.services.exceptions.ServiceUnavailableException;
 
 public class DocumentControllerTester {
-
-
+	
 	private static final String SERVICE_UNAVAILABLE = "service_unavailable";
 
 	private static final String VALID = "valid";
@@ -33,45 +34,47 @@ public class DocumentControllerTester {
 	private DocumentReadyHandler documentReadyHandler;
 
 	@Mock
-	private TransactionInfo transactionInfo;
-	@Mock
-	private Resource resource;
+	private TransactionInfo transactionInfoMock;
 
 	@Mock
-	private Resource resourceWithException;
-	
+	private Resource resourceWithException ;
 
 	@Before
 	public void init() throws Exception {
 
 		MockitoAnnotations.initMocks(this);
-		Mockito.doNothing().when(this.documentReadyHandler).handle("message", this.transactionInfo);
-		Mockito.doThrow(new ServiceUnavailableException(SERVICE_UNAVAILABLE)).when(this.documentReadyHandler).handle("message", this.transactionInfo);
+		Mockito.doNothing().when(this.documentReadyHandler).handle("message", this.transactionInfoMock);
+		Mockito.doThrow(new ServiceUnavailableException(SERVICE_UNAVAILABLE)).when(this.documentReadyHandler).handle(Mockito.eq(SERVICE_UNAVAILABLE), Mockito.any());
+		Mockito.doReturn("filename.txt").when(this.resourceWithException).getFilename();
 		Mockito.when(this.resourceWithException.getInputStream()).thenThrow(IOException.class);
 		sut = new DocumentController(this.documentReadyHandler);
 	}
 
 	@Test
 	public void post_with_valid_input_should_return_valid_response() {
 		ByteArrayResource bytes = new ByteArrayResource("awesome content".getBytes()){
-		@Override
-		public String getFilename(){
-			return "documentController.txt";
-		}
-	};
-	ResponseEntity<DocumentReceivedResponse> response = sut.postDocument(VALID, null, null, null, null, null, bytes);
-
-	assertEquals(HttpStatus.OK, response.getStatusCode());
-	assertTrue(response.getBody().getAcknowledge());
+			@Override
+			public String getFilename(){
+				return "documentController.txt";
+			}
+		};
+		ResponseEntity<DocumentReceivedResponse> response = sut.postDocument(VALID, null, null, null, null, null, bytes);
 
-}
+		assertEquals(HttpStatus.OK, response.getStatusCode());
+		assertTrue(response.getBody().getAcknowledge());
+	}
 
 	@Test
 	public void post_with_sevice_unavailable_input_should_return_503_response() {
-		
+		ByteArrayResource bytes = new ByteArrayResource(SERVICE_UNAVAILABLE.getBytes()){
+			@Override
+			public String getFilename(){
+				return "documentController.txt";
+			}
+		};
 		@SuppressWarnings("rawtypes")
-		ResponseEntity response = sut.postDocument(SERVICE_UNAVAILABLE, null, null, null, null, null, new ByteArrayResource("awesome content".getBytes()));
-		
+		ResponseEntity response = sut.postDocument(SERVICE_UNAVAILABLE, null, null, null, null, null, bytes);
+
 		assertEquals(HttpStatus.SERVICE_UNAVAILABLE, response.getStatusCode());
 		assertEquals(SERVICE_UNAVAILABLE, ((ca.bc.gov.open.api.model.Error)response.getBody()).getMessage());
 		assertEquals(Integer.toString(HttpStatus.SERVICE_UNAVAILABLE.value()), ((ca.bc.gov.open.api.model.Error)response.getBody()).getCode());
@@ -80,7 +83,6 @@ public void post_with_sevice_unavailable_input_should_return_503_response() {
 
 	@Test
 	public void post_with_io_exception_input_should_return_500_response() {
-		
 		@SuppressWarnings("rawtypes")
 		ResponseEntity response = sut.postDocument(VALID, null, null, null, null, null, this.resourceWithException);