Merge pull request #105 from ral-facilities/refactor_setPriority

Refactor setPriority into createDownload in DownloadBuilder

Author: patrick-austin

src/main/java/org/icatproject/topcat/DownloadBuilder.java

@@ -143,6 +143,7 @@ private Download createDownload() {
 		download.setFullName(fullName);
 		download.setTransport(transport);
 		download.setEmail(email);
+		download.setPriority(priority);
 		download.setIsEmailSent(false);
 		download.setSize(0);
 		return download;
@@ -256,7 +257,6 @@ public DatafilesResponse extractLocations(List<String> files) throws TopcatExcep
 		}
 		download.setDownloadItems(downloadItems);
 		download.setSize(response.totalSize);
-		download.setPriority(priority);
 		downloads.add(download);
 
 		return response;

src/test/java/org/icatproject/topcat/UserResourceTest.java

@@ -262,6 +262,7 @@ public void testSubmitCart() throws Exception {
 		}
 		assertEquals(fileName, newDownload.getFileName());
 		assertFalse(newDownload.getIsDeleted());
+		assertEquals(1, newDownload.getPriority());
 
 		// Next, change the download status. Must be different from the current status!
 		String downloadStatus = "EXPIRED";
@@ -417,6 +418,7 @@ public void testQueueVisitId() throws Exception {
 				assertEquals("simple/root", download.getFullName());
 				assertNull(download.getEmail());
 				assertNotEquals(0L, download.getSize());
+				assertEquals(2, download.getPriority());
 				part += 1;
 			}
 		} finally {
@@ -487,6 +489,7 @@ public void testQueueFiles() throws Exception {
 			assertEquals("simple/root", download.getFullName());
 			assertNull(download.getEmail());
 			assertNotEquals(0L, download.getSize());
+			assertEquals(2, download.getPriority());
 		} finally {
 			if (downloadId != null) {
 				downloadRepository.removeDownload(downloadId);
@@ -618,6 +621,7 @@ public void testQueueDataCollection() throws Exception {
 			assertEquals("simple/root", download.getFullName());
 			assertNull(download.getEmail());
 			assertNotEquals(0L, download.getSize());
+			assertEquals(2, download.getPriority());
 
 			download = downloadRepository.getDownload(downloadIdDatafile);
 			assertNull(download.getPreparedId());
@@ -631,6 +635,7 @@ public void testQueueDataCollection() throws Exception {
 			assertEquals("simple/root", download.getFullName());
 			assertNull(download.getEmail());
 			assertNotEquals(0L, download.getSize());
+			assertEquals(2, download.getPriority());
 		} finally {
 			downloadRepository.removeDownload(downloadIdDataset);
 			downloadRepository.removeDownload(downloadIdDatafile);