unit test; javadocs

Author: hplahar

src/main/java/org/jbei/ice/lib/bulkupload/BulkUploadController.java

@@ -92,7 +92,7 @@ public BulkUploadInfo create(String userId, BulkUploadInfo info) {
         if (info.getEntryList() != null) {
             for (PartData data : info.getEntryList()) {
                 Entry entry = entryDAO.get(data.getId());
-                // todo if entry is in another bulk upload, then update (line 95) will fail
+                // todo if entry is in another bulk upload, then update will fail
                 if (entry == null)
                     continue;
 
@@ -159,6 +159,8 @@ public HashMap<String, ArrayList<BulkUploadInfo>> getPendingImports(String userI
      *
      * @param userId identifier for account of user requesting
      * @param id     unique identifier for bulk import
+     * @param offset offset for upload entries (start)
+     * @param limit  maximum number of entries to return with the upload
      * @return data transfer object with the retrieved bulk import data and associated entries
      * @throws PermissionException
      */
@@ -212,35 +214,6 @@ protected PartData setFileData(String userId, Entry entry, PartData partData) {
         return partData;
     }
 
-    protected ArrayList<PartData> convertParts(Account account, List<Entry> contents) {
-        ArrayList<PartData> addList = new ArrayList<>();
-        SequenceDAO sequenceDAO = DAOFactory.getSequenceDAO();
-
-        for (Entry entry : contents) {
-            ArrayList<Attachment> attachments = attachmentController.getByEntry(account.getEmail(), entry);
-            boolean hasSequence = sequenceDAO.hasSequence(entry.getId());
-            boolean hasOriginalSequence = sequenceDAO.hasOriginalSequence(entry.getId());
-            PartData info = ModelToInfoFactory.getInfo(entry);
-            ArrayList<AttachmentInfo> attachmentInfos = ModelToInfoFactory.getAttachments(attachments);
-            info.setAttachments(attachmentInfos);
-            info.setHasAttachment(!attachmentInfos.isEmpty());
-            info.setHasSequence(hasSequence);
-            info.setHasOriginalSequence(hasOriginalSequence);
-
-            // retrieve permission
-            Set<Permission> entryPermissions = entry.getPermissions();
-            if (entryPermissions != null && !entryPermissions.isEmpty()) {
-                for (Permission permission : entryPermissions) {
-                    info.getAccessPermissions().add(permission.toDataTransferObject());
-                }
-            }
-
-            addList.add(info);
-        }
-
-        return addList;
-    }
-
     /**
      * Retrieves list of user saved bulk imports. Only the owner or an administrator can retrieve it
      *

src/test/java/org/jbei/ice/lib/bulkupload/BulkUploadControllerTest.java

@@ -39,6 +39,18 @@ public void tearDown() throws Exception {
         HibernateUtil.commitTransaction();
     }
 
+    @Test
+    public void testCreate() throws Exception {
+        Account account = AccountCreator.createTestAccount("testBulkUploadCreate", false);
+
+        BulkUploadInfo info = new BulkUploadInfo();
+        info.setName("testCreateName");
+        info.setType(EntryType.PLASMID.getName());
+        info.setAccount(account.toDataTransferObject());
+        info = controller.create(account.getEmail(), info);
+        Assert.assertNotNull(info);
+    }
+
     @Test
     public void testGetBulkImport() throws Exception {
         Account account = AccountCreator.createTestAccount("testGetBulkImport", false);