Merge 919d788 into a47c6a4

AY1920S1-CS2103-T16-3 · Nov 6, 2019 · f55c795 · f55c795
2 parents a47c6a4 + 919d788
commit f55c795
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/test/java/seedu/weme/logic/commands/memecommand/MemeClearCommandTest.java b/src/test/java/seedu/weme/logic/commands/memecommand/MemeClearCommandTest.java
@@ -2,7 +2,7 @@
 
 import static seedu.weme.logic.commands.CommandTestUtil.assertCommandFailure;
 import static seedu.weme.logic.commands.CommandTestUtil.assertCommandSuccess;
-import static seedu.weme.testutil.TypicalIndexes.INDEX_SECOND_MEME;
+import static seedu.weme.testutil.TypicalIndexes.INDEX_SECOND;
 import static seedu.weme.testutil.TypicalWeme.getTypicalWeme;
 
 import org.junit.jupiter.api.Test;
@@ -37,7 +37,7 @@ public void execute_nonEmptyWeme_success() {
     @Test
     public void execute_deleteStagedMeme_failure() {
         Model model = new ModelManager(getTypicalWeme(), new UserPrefs());
-        Meme memeInList = model.getWeme().getMemeList().get(INDEX_SECOND_MEME.getZeroBased());
+        Meme memeInList = model.getWeme().getMemeList().get(INDEX_SECOND.getZeroBased());
         model.stageMeme(memeInList);
         assertCommandFailure(new MemeClearCommand(), model, MemeClearCommand.MESSAGE_NON_EMPTY_STAGING_AREA);
     }

diff --git a/src/test/java/seedu/weme/logic/commands/memecommand/MemeDeleteCommandTest.java b/src/test/java/seedu/weme/logic/commands/memecommand/MemeDeleteCommandTest.java
@@ -81,9 +81,9 @@ public void execute_invalidIndexFilteredList_throwsCommandException() {
 
     @Test
     public void execute_deleteStagedMeme_failure() {
-        Meme memeInList = model.getWeme().getMemeList().get(INDEX_SECOND_MEME.getZeroBased());
+        Meme memeInList = model.getWeme().getMemeList().get(INDEX_SECOND.getZeroBased());
         model.stageMeme(memeInList);
-        MemeDeleteCommand memeDeleteCommand = new MemeDeleteCommand(INDEX_SECOND_MEME);
+        MemeDeleteCommand memeDeleteCommand = new MemeDeleteCommand(INDEX_SECOND);
         assertCommandFailure(memeDeleteCommand, model, MemeDeleteCommand.MESSAGE_STAGED_MEME);
     }
 

diff --git a/src/test/java/seedu/weme/logic/commands/memecommand/MemeEditCommandTest.java b/src/test/java/seedu/weme/logic/commands/memecommand/MemeEditCommandTest.java
@@ -154,9 +154,9 @@ public void execute_invalidMemeIndexFilteredList_failure() {
 
     @Test
     public void execute_editStagedMeme_failure() {
-        Meme memeInList = model.getWeme().getMemeList().get(INDEX_SECOND_MEME.getZeroBased());
+        Meme memeInList = model.getWeme().getMemeList().get(INDEX_SECOND.getZeroBased());
         model.stageMeme(memeInList);
-        MemeEditCommand memeEditCommand = new MemeEditCommand(INDEX_SECOND_MEME,
+        MemeEditCommand memeEditCommand = new MemeEditCommand(INDEX_SECOND,
                 new EditMemeDescriptorBuilder(memeInList).build());
 
         assertCommandFailure(memeEditCommand, model, MemeEditCommand.MESSAGE_STAGED_MEME);