Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor AddressBookParserTest #92

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
/**
* Parses user input.
*/
public class AddressBookParser {
public abstract class AddressBookParser {

Check warning on line 19 in src/main/java/seedu/address/logic/util/AddressBookParser.java

View check run for this annotation

Codecov / codecov/patch

src/main/java/seedu/address/logic/util/AddressBookParser.java#L19

Added line #L19 was not covered by tests

/**
* Used for initial separation of command word and args.
Expand Down
34 changes: 17 additions & 17 deletions src/test/java/seedu/address/logic/util/AddressBookParserTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -31,24 +31,22 @@

public class AddressBookParserTest {

private final AddressBookParser parser = new AddressBookParser();

@Test
public void parseCommand_add() throws Exception {
Person person = new PersonBuilder().build();
AddCommand command = (AddCommand) parser.parseCommand(PersonUtil.getAddCommand(person));
AddCommand command = (AddCommand) AddressBookParser.parseCommand(PersonUtil.getAddCommand(person));
assertEquals(new AddCommand(person), command);
}

@Test
public void parseCommand_clear() throws Exception {
assertTrue(parser.parseCommand(ClearCommand.COMMAND_WORD) instanceof ClearCommand);
assertTrue(parser.parseCommand(ClearCommand.COMMAND_WORD + " 3") instanceof ClearCommand);
assertTrue(AddressBookParser.parseCommand(ClearCommand.COMMAND_WORD) instanceof ClearCommand);
assertTrue(AddressBookParser.parseCommand(ClearCommand.COMMAND_WORD + " 3") instanceof ClearCommand);
}

@Test
public void parseCommand_delete() throws Exception {
DeleteCommand command = (DeleteCommand) parser.parseCommand(
DeleteCommand command = (DeleteCommand) AddressBookParser.parseCommand(
DeleteCommand.COMMAND_WORD + " " + INDEX_FIRST_PERSON.getOneBased());
assertEquals(new DeleteCommand(INDEX_FIRST_PERSON), command);
}
Expand All @@ -57,52 +55,54 @@ public void parseCommand_delete() throws Exception {
public void parseCommand_edit() throws Exception {
Person person = new PersonBuilder().build();
EditPersonDescriptor descriptor = new EditPersonDescriptorBuilder(person).build();
EditCommand command = (EditCommand) parser.parseCommand(EditCommand.COMMAND_WORD + " "
EditCommand command = (EditCommand) AddressBookParser.parseCommand(EditCommand.COMMAND_WORD + " "
+ INDEX_FIRST_PERSON.getOneBased() + " " + PersonUtil.getEditPersonDescriptorDetails(descriptor));
assertEquals(new EditCommand(INDEX_FIRST_PERSON, descriptor), command);
}

@Test
public void parseCommand_exit() throws Exception {
assertTrue(parser.parseCommand(ExitCommand.COMMAND_WORD) instanceof ExitCommand);
assertTrue(parser.parseCommand(ExitCommand.COMMAND_WORD + " 3") instanceof ExitCommand);
assertTrue(AddressBookParser.parseCommand(ExitCommand.COMMAND_WORD) instanceof ExitCommand);
assertTrue(AddressBookParser.parseCommand(ExitCommand.COMMAND_WORD + " 3") instanceof ExitCommand);
}

@Test
public void parseCommand_find() throws Exception {
List<String> keywords = Arrays.asList("foo", "bar", "baz");
FindCommand command = (FindCommand) parser.parseCommand(
FindCommand command = (FindCommand) AddressBookParser.parseCommand(
FindCommand.COMMAND_WORD + " " + keywords.stream().collect(Collectors.joining(" ")));
assertEquals(new FindCommand(new NameContainsKeywordsPredicate(keywords)), command);
}

@Test
public void parseCommand_help() throws Exception {
assertTrue(parser.parseCommand(HelpCommand.COMMAND_WORD) instanceof HelpCommand);
assertTrue(parser.parseCommand(HelpCommand.COMMAND_WORD + " 3") instanceof HelpCommand);
assertTrue(AddressBookParser.parseCommand(HelpCommand.COMMAND_WORD) instanceof HelpCommand);
assertTrue(AddressBookParser.parseCommand(HelpCommand.COMMAND_WORD + " 3") instanceof HelpCommand);
}

@Test
public void parseCommand_list() throws Exception {
assertTrue(parser.parseCommand(ListCommand.COMMAND_WORD) instanceof ListCommand);
assertTrue(parser.parseCommand(ListCommand.COMMAND_WORD + " 3") instanceof ListCommand);
assertTrue(AddressBookParser.parseCommand(ListCommand.COMMAND_WORD) instanceof ListCommand);
assertTrue(AddressBookParser.parseCommand(ListCommand.COMMAND_WORD + " 3") instanceof ListCommand);
}

@Test
public void parseCommand_unrecognisedInput_throwsParseException() {
assertThrows(ParseException.class, String.format(MESSAGE_INVALID_COMMAND_FORMAT, HelpCommand.MESSAGE_USAGE), ()
-> parser.parseCommand(""));
-> AddressBookParser.parseCommand(""));
}

@Test
public void parseCommand_unknownCommand_throwsParseException() {
assertThrows(ParseException.class, MESSAGE_UNKNOWN_COMMAND, () -> parser.parseCommand("unknownCommand"));
assertThrows(ParseException.class, MESSAGE_UNKNOWN_COMMAND, ()
-> AddressBookParser.parseCommand("unknownCommand"));
}

@Test
public void parseCommand_invalidArguments_throwsParseException() {
assertThrows(ParseException.class,
String.format(MESSAGE_INVALID_COMMAND_FORMAT, DeleteCommand.MESSAGE_USAGE), () ->
parser.parseCommand("delete unknown"));
AddressBookParser.parseCommand("delete unknown"));
}

}