Skip to content

Commit a337dcc

Browse files
Merge pull request #326 from nottiffchan/refactor-code
Update test cases for CommandResult
2 parents fdc2b8d + bf0f030 commit a337dcc

File tree

4 files changed

+23
-7
lines changed

4 files changed

+23
-7
lines changed

src/main/java/trackitnus/logic/commands/CommandResult.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import static java.util.Objects.requireNonNull;
44

55
import java.util.Objects;
6+
67
import trackitnus.model.module.Module;
78

89
/**

src/test/java/trackitnus/logic/commands/CommandResultTest.java

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,18 @@
77

88
import org.junit.jupiter.api.Test;
99

10+
import trackitnus.model.commons.Code;
11+
import trackitnus.model.commons.Name;
12+
import trackitnus.model.module.Module;
13+
1014
public class CommandResultTest {
1115
@Test
1216
public void equals() {
1317
CommandResult commandResult = new CommandResult("feedback");
1418

1519
// same values -> returns true
1620
assertTrue(commandResult.equals(new CommandResult("feedback")));
17-
assertTrue(commandResult.equals(new CommandResult("feedback", false, false, "")));
21+
assertTrue(commandResult.equals(new CommandResult("feedback", false, false, null, null, "")));
1822

1923
// same object -> returns true
2024
assertTrue(commandResult.equals(commandResult));
@@ -29,10 +33,18 @@ public void equals() {
2933
assertFalse(commandResult.equals(new CommandResult("different")));
3034

3135
// different showHelp value -> returns false
32-
assertFalse(commandResult.equals(new CommandResult("feedback", true, false, "")));
36+
assertFalse(commandResult.equals(new CommandResult("feedback", true, false, null, null, "")));
3337

3438
// different exit value -> returns false
35-
assertFalse(commandResult.equals(new CommandResult("feedback", false, true, "")));
39+
assertFalse(commandResult.equals(new CommandResult("feedback", false, true, null, null, "")));
40+
41+
// edited module -> returns true
42+
assertTrue(commandResult.equals(new CommandResult("feedback", false, false,
43+
new Module(new Code("AA0000"), new Name("not edited")), new Module(new Code("AA0000"), new Name("after " +
44+
"edited")), "")));
45+
46+
// deleted module -> returns true
47+
assertTrue(commandResult.equals(new CommandResult("feedback", false, false, null, null, "AA0000")));
3648
}
3749

3850
@Test
@@ -46,9 +58,11 @@ public void hashcode() {
4658
assertNotEquals(commandResult.hashCode(), new CommandResult("different").hashCode());
4759

4860
// different showHelp value -> returns different hashcode
49-
assertNotEquals(commandResult.hashCode(), new CommandResult("feedback", true, false, "").hashCode());
61+
assertNotEquals(commandResult.hashCode(),
62+
new CommandResult("feedback", true, false, null, null, "").hashCode());
5063

5164
// different exit value -> returns different hashcode
52-
assertNotEquals(commandResult.hashCode(), new CommandResult("feedback", false, true, "").hashCode());
65+
assertNotEquals(commandResult.hashCode(),
66+
new CommandResult("feedback", false, true, null, null, "").hashCode());
5367
}
5468
}

src/test/java/trackitnus/logic/commands/ExitCommandTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ public class ExitCommandTest {
1414

1515
@Test
1616
public void execute_exit_success() {
17-
CommandResult expectedCommandResult = new CommandResult(MESSAGE_EXIT_ACKNOWLEDGEMENT, false, true, "");
17+
CommandResult expectedCommandResult = new CommandResult(MESSAGE_EXIT_ACKNOWLEDGEMENT, false, true, null, null,
18+
"");
1819
assertCommandSuccess(new ExitCommand(), model, expectedCommandResult, expectedModel);
1920
}
2021
}

src/test/java/trackitnus/logic/commands/HelpCommandTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public class HelpCommandTest {
1414

1515
@Test
1616
public void execute_help_success() {
17-
CommandResult expectedCommandResult = new CommandResult(SHOWING_HELP_MESSAGE, true, false, "");
17+
CommandResult expectedCommandResult = new CommandResult(SHOWING_HELP_MESSAGE, true, false, null, null, "");
1818
assertCommandSuccess(new HelpCommand(), model, expectedCommandResult, expectedModel);
1919
}
2020
}

0 commit comments

Comments
 (0)