Merge pull request nus-cs2103-AY2021S1#94 from luo-git/Branch-OpenCommand

Resolve a bug in the tag command

Author: anthony6401

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

@@ -1,7 +1,6 @@
 package seedu.address.logic.commands;
 
 import static java.util.Objects.requireNonNull;
-import static seedu.address.commons.util.AppUtil.checkArgument;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_FILE_ADDRESS;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_TAG_NAME;
 
@@ -39,9 +38,6 @@ public class TagCommand extends Command {
      */
     public TagCommand(Tag tag) {
         requireNonNull(tag);
-        // Check if file is present
-        checkArgument(filePresent(tag.getFileAddress()),
-                String.format(MESSAGE_FILE_NOT_FOUND, tag.getFileAddress().value));
         toTag = tag;
     }
 
@@ -65,6 +61,12 @@ public CommandResult execute(Model model) throws CommandException {
             throw new CommandException(MESSAGE_DUPLICATE_TAG);
         }
 
+        // Check if file is present
+        if (!filePresent(toTag.getFileAddress())) {
+            throw new CommandException(
+                    String.format(MESSAGE_FILE_NOT_FOUND, toTag.getFileAddress().value));
+        }
+
         model.addTag(toTag);
         return new CommandResult(String.format(MESSAGE_SUCCESS, toTag));
     }

src/test/java/seedu/address/logic/commands/TagCommandTest.java

@@ -38,7 +38,10 @@ public void execute_tagAcceptedByModel_tagSuccessful() throws Exception {
     @Test
     public void execute_tagAddressFileNotFound_throwsCommandException() {
         Tag tagInvalidAddress = new TagBuilder().withFileAddress("./somewhereOverTheRainbow").build();
-        assertThrows(IllegalArgumentException.class, () -> new TagCommand(tagInvalidAddress));
+        Tag validTag = new TagBuilder().build();
+        TagCommand tagCommand = new TagCommand(tagInvalidAddress);
+        ModelStub modelStub = new ModelStubWithTag(validTag);
+        assertThrows(CommandException.class, () -> tagCommand.execute(modelStub));
     }
 
     @Test