Merge pull request #50 from gerhean/add-storage-tests

Add storage tests

Author: wxwxwxwx9

src/main/java/seedu/address/logic/commands/EditCommand.java

@@ -11,7 +11,7 @@
 import static seedu.address.logic.parser.CliSyntax.PREFIX_STATUS;
 import static seedu.address.model.Model.PREDICATE_SHOW_ALL_INTERNSHIPS;
 
-import java.util.Date;
+import java.time.LocalDate;
 import java.util.List;
 import java.util.Optional;
 
@@ -108,7 +108,7 @@ private static InternshipApplication createEditedInternship(InternshipApplicatio
         Address updatedAddress = editInternshipDescriptor.getAddress().orElse(internshipToEdit.getAddress());
         Phone updatedPhone = editInternshipDescriptor.getPhone().orElse(internshipToEdit.getPhone());
         Email updatedEmail = editInternshipDescriptor.getEmail().orElse(internshipToEdit.getEmail());
-        Date updatedDate = editInternshipDescriptor.getDate().orElse(internshipToEdit.getApplicationDate());
+        LocalDate updatedDate = editInternshipDescriptor.getDate().orElse(internshipToEdit.getApplicationDate());
         Priority updatedPriority = editInternshipDescriptor.getPriority().orElse(internshipToEdit.getPriority());
         Status updatedStatus = editInternshipDescriptor.getStatus().orElse(internshipToEdit.getStatus());
 
@@ -144,7 +144,7 @@ public static class EditInternshipDescriptor {
         private Address address;
         private Phone phone;
         private Email email;
-        private Date date;
+        private LocalDate date;
         private Priority priority;
         private Status status;
 
@@ -212,11 +212,11 @@ public Optional<Email> getEmail() {
             return Optional.ofNullable(email);
         }
 
-        public void setDate(Date date) {
+        public void setDate(LocalDate date) {
             this.date = date;
         }
 
-        public Optional<Date> getDate() {
+        public Optional<LocalDate> getDate() {
             return Optional.ofNullable(date);
         }
 

src/main/java/seedu/address/logic/parser/AddCommandParser.java

@@ -10,7 +10,7 @@
 import static seedu.address.logic.parser.CliSyntax.PREFIX_ROLE;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_STATUS;
 
-import java.util.Date;
+import java.time.LocalDate;
 import java.util.stream.Stream;
 
 import seedu.address.logic.commands.AddCommand;
@@ -50,7 +50,7 @@ public AddCommand parse(String args) throws ParseException {
         Address address = ParserUtil.parseAddress(argMultimap.getValue(PREFIX_ADDRESS).get());
         Phone phone = ParserUtil.parsePhone(argMultimap.getValue(PREFIX_PHONE).get());
         Email email = ParserUtil.parseEmail(argMultimap.getValue(PREFIX_EMAIL).get());
-        Date date = ParserUtil.parseDate(argMultimap.getValue(PREFIX_DATE).get());
+        LocalDate date = ParserUtil.parseDate(argMultimap.getValue(PREFIX_DATE).get());
         Priority priority = ParserUtil.parsePriority(argMultimap.getValue(PREFIX_PRIORITY).get());
         Status status = ParserUtil.parseStatus(argMultimap.getValue(PREFIX_STATUS).get());
 

src/main/java/seedu/address/logic/parser/ParserUtil.java

@@ -2,8 +2,9 @@
 
 import static java.util.Objects.requireNonNull;
 
-import java.text.SimpleDateFormat;
-import java.util.Date;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeParseException;
 
 import seedu.address.commons.core.index.Index;
 import seedu.address.commons.util.StringUtil;
@@ -117,12 +118,12 @@ public static Role parseRole(String role) throws ParseException {
      *
      * @throws ParseException if the given {@code date} is invalid.
      */
-    public static Date parseDate(String date) throws ParseException {
+    public static LocalDate parseDate(String date) throws ParseException {
         requireNonNull(date);
         String trimmedDate = date.trim();
         try {
-            return new SimpleDateFormat("dd MM yyyy").parse(trimmedDate);
-        } catch (java.text.ParseException e) {
+            return LocalDate.parse(trimmedDate, DateTimeFormatter.ofPattern("dd MM yyyy"));
+        } catch (DateTimeParseException e) {
             throw new ParseException("Date should be in the form: DD MM YYYY");
         }
     }

src/main/java/seedu/address/model/internship/InternshipApplication.java

@@ -2,7 +2,7 @@
 
 import static seedu.address.commons.util.CollectionUtil.requireAllNonNull;
 
-import java.util.Date;
+import java.time.LocalDate;
 import java.util.Objects;
 
 import seedu.address.model.status.Status;
@@ -18,15 +18,15 @@ public class InternshipApplication {
     private final Address address;
     private final Phone phone;
     private final Email email;
-    private final Date applicationDate;
+    private final LocalDate applicationDate;
     private final Priority priority;
     private final Status status;
 
     /**
      * Every field must be present and not null.
      */
     public InternshipApplication(Company company, Role role, Address address, Phone phone, Email email,
-            Date applicationDate, Priority priority, Status status) {
+            LocalDate applicationDate, Priority priority, Status status) {
         requireAllNonNull(company, phone, email, address, status);
         this.company = company;
         this.role = role;
@@ -58,7 +58,7 @@ public seedu.address.model.internship.Email getEmail() {
         return email;
     }
 
-    public Date getApplicationDate() {
+    public LocalDate getApplicationDate() {
         return applicationDate;
     }
 

src/main/java/seedu/address/storage/AddressBookStorage.java

@@ -1,8 +1,8 @@
 package seedu.address.storage;
 
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeParseException;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -23,7 +23,7 @@
 class JsonAdaptedInternship {
 
     public static final String MISSING_FIELD_MESSAGE_FORMAT = "Internship's %s field is missing!";
-    private static final String DATE_TIME_PATTERN = "dd/MM/yyyy";
+    public static final String DATE_TIME_PATTERN = "dd/MM/yyyy";
     private static final String ERROR_MESSAGE_PLACEHOLDER = "Error message.";
 
     private final String company;
@@ -35,9 +35,6 @@ class JsonAdaptedInternship {
     private final String priority;
     private final String status;
 
-    // Company company, Role role, Address address, Phone phone, Email email,
-    // Date applicationDate, Priority priority, Status status
-
     /**
      * Constructs a {@code JsonAdaptedInternship} with the given person details.
      */
@@ -65,7 +62,7 @@ public JsonAdaptedInternship(InternshipApplication source) {
         address = source.getAddress().value;
         phone = source.getPhone().value;
         email = source.getEmail().value;
-        applicationDate = (new SimpleDateFormat(DATE_TIME_PATTERN)).format(source.getApplicationDate());
+        applicationDate = source.getApplicationDate().format(DateTimeFormatter.ofPattern(DATE_TIME_PATTERN));
         priority = Integer.toString(source.getPriority().fullPriority);
         status = source.getStatus().name();
     }
@@ -116,18 +113,20 @@ public InternshipApplication toModelType() throws IllegalValueException {
         }
         final Address modelAddress = new Address(address);
 
-        Date modelDate = null;
+        LocalDate modelDate = null;
         if (applicationDate == null) {
-            throw new IllegalValueException(String.format(MISSING_FIELD_MESSAGE_FORMAT, Date.class.getSimpleName()));
+            throw new IllegalValueException(String.format(MISSING_FIELD_MESSAGE_FORMAT,
+                    LocalDate.class.getSimpleName()));
         }
-        SimpleDateFormat dateFormat = new SimpleDateFormat(DATE_TIME_PATTERN);
+        DateTimeFormatter dateFormat = DateTimeFormatter.ofPattern(DATE_TIME_PATTERN);
         try {
-            modelDate = dateFormat.parse(applicationDate);
-        } catch (ParseException e) {
+            modelDate = LocalDate.parse(applicationDate, dateFormat);
+        } catch (DateTimeParseException e) {
             throw new IllegalValueException(ERROR_MESSAGE_PLACEHOLDER);
         }
         if (modelDate == null) {
-            throw new IllegalValueException(String.format(MISSING_FIELD_MESSAGE_FORMAT, Date.class.getSimpleName()));
+            throw new IllegalValueException(String.format(MISSING_FIELD_MESSAGE_FORMAT,
+                    LocalDate.class.getSimpleName()));
         }
 
         if (priority == null) {
@@ -149,7 +148,7 @@ public InternshipApplication toModelType() throws IllegalValueException {
         try {
             Status.valueOf(status);
         } catch (IllegalArgumentException e) {
-            throw new IllegalValueException(ERROR_MESSAGE_PLACEHOLDER);
+            throw new IllegalValueException(Status.MESSAGE_CONSTRAINTS);
         }
         final Status modelStatus = Status.valueOf(status);