FixReplacementInterpreterTest: Migrate from easymock to mockito
Bug: Issue 5057
Change-Id: Ia9f2b802bca412635ca9c12ed07285a9c4d3772b
diff --git a/javatests/com/google/gerrit/server/fixes/FixReplacementInterpreterTest.java b/javatests/com/google/gerrit/server/fixes/FixReplacementInterpreterTest.java
index c8df548..2174927 100644
--- a/javatests/com/google/gerrit/server/fixes/FixReplacementInterpreterTest.java
+++ b/javatests/com/google/gerrit/server/fixes/FixReplacementInterpreterTest.java
@@ -16,8 +16,8 @@
import static com.google.gerrit.server.edit.tree.TreeModificationSubject.assertThatList;
import static com.google.gerrit.testing.GerritJUnit.assertThrows;
-import static org.easymock.EasyMock.createMock;
-import static org.easymock.EasyMock.replay;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
import com.google.common.collect.ImmutableList;
import com.google.gerrit.extensions.restapi.BinaryResult;
@@ -30,17 +30,16 @@
import java.util.ArrayList;
import java.util.Comparator;
import java.util.List;
-import org.easymock.EasyMock;
import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.lib.Repository;
import org.junit.Before;
import org.junit.Test;
public class FixReplacementInterpreterTest {
- private final FileContentUtil fileContentUtil = createMock(FileContentUtil.class);
- private final Repository repository = createMock(Repository.class);
- private final ProjectState projectState = createMock(ProjectState.class);
- private final ObjectId patchSetCommitId = createMock(ObjectId.class);
+ private final FileContentUtil fileContentUtil = mock(FileContentUtil.class);
+ private final Repository repository = mock(Repository.class);
+ private final ProjectState projectState = mock(ProjectState.class);
+ private final ObjectId patchSetCommitId = mock(ObjectId.class);
private final String filePath1 = "an/arbitrary/file.txt";
private final String filePath2 = "another/arbitrary/file.txt";
@@ -68,7 +67,6 @@
new FixReplacement(filePath2, new Range(2, 0, 3, 0), "Another modified content");
mockFileContent(filePath2, "1st line\n2nd line\n3rd line\n");
- replay(fileContentUtil);
List<TreeModification> treeModifications =
toTreeModifications(fixReplacement, fixReplacement3, fixReplacement2);
List<TreeModification> sortedTreeModifications = getSortedCopy(treeModifications);
@@ -99,7 +97,6 @@
FixReplacement fixReplacement = new FixReplacement(filePath1, new Range(2, 0, 3, 0), "");
mockFileContent(filePath1, "First line\nSecond line\nThird line\n");
- replay(fileContentUtil);
List<TreeModification> treeModifications = toTreeModifications(fixReplacement);
assertThatList(treeModifications)
.onlyElement()
@@ -114,7 +111,6 @@
new FixReplacement(filePath1, new Range(2, 0, 2, 0), "A new line\n");
mockFileContent(filePath1, "First line\nSecond line\nThird line\n");
- replay(fileContentUtil);
List<TreeModification> treeModifications = toTreeModifications(fixReplacement);
assertThatList(treeModifications)
.onlyElement()
@@ -128,7 +124,6 @@
FixReplacement fixReplacement = new FixReplacement(filePath1, new Range(1, 6, 3, 1), "and t");
mockFileContent(filePath1, "First line\nSecond line\nThird line\n");
- replay(fileContentUtil);
List<TreeModification> treeModifications = toTreeModifications(fixReplacement);
assertThatList(treeModifications)
.onlyElement()
@@ -144,7 +139,6 @@
new FixReplacement(filePath1, new Range(2, 7, 2, 11), "modification");
mockFileContent(filePath1, "First line\nSecond line\nThird line\n");
- replay(fileContentUtil);
List<TreeModification> treeModifications =
toTreeModifications(fixReplacement1, fixReplacement2);
assertThatList(treeModifications)
@@ -162,7 +156,6 @@
new FixReplacement(filePath1, new Range(2, 7, 3, 5), "content");
mockFileContent(filePath1, "First line\nSecond line\nThird line\n");
- replay(fileContentUtil);
List<TreeModification> treeModifications =
toTreeModifications(fixReplacement1, fixReplacement2);
assertThatList(treeModifications)
@@ -178,7 +171,6 @@
new FixReplacement(filePath1, new Range(4, 0, 4, 0), "New content");
mockFileContent(filePath1, "First line\nSecond line\nThird line\n");
- replay(fileContentUtil);
List<TreeModification> treeModifications = toTreeModifications(fixReplacement);
assertThatList(treeModifications)
.onlyElement()
@@ -198,7 +190,6 @@
new FixReplacement(filePath2, new Range(3, 0, 4, 0), "Second modification\n");
mockFileContent(filePath2, "1st line\n2nd line\n3rd line\n");
- replay(fileContentUtil);
List<TreeModification> treeModifications =
toTreeModifications(fixReplacement3, fixReplacement1, fixReplacement2);
List<TreeModification> sortedTreeModifications = getSortedCopy(treeModifications);
@@ -219,7 +210,6 @@
FixReplacement fixReplacement = new FixReplacement(filePath1, new Range(2, 11, 3, 0), "\r");
mockFileContent(filePath1, "First line\nSecond line\nThird line\n");
- replay(fileContentUtil);
List<TreeModification> treeModifications = toTreeModifications(fixReplacement);
assertThatList(treeModifications)
.onlyElement()
@@ -238,7 +228,6 @@
new FixReplacement(filePath1, new Range(4, 0, 5, 0), "3rd modification\n");
mockFileContent(filePath1, "First line\nSecond line\nThird line\nFourth line\nFifth line\n");
- replay(fileContentUtil);
List<TreeModification> treeModifications =
toTreeModifications(fixReplacement2, fixReplacement1, fixReplacement3);
assertThatList(treeModifications)
@@ -255,7 +244,6 @@
new FixReplacement(filePath1, new Range(5, 0, 5, 0), "A new line\n");
mockFileContent(filePath1, "First line\nSecond line\nThird line\n");
- replay(fileContentUtil);
assertThrows(ResourceConflictException.class, () -> toTreeModifications(fixReplacement));
}
@@ -265,8 +253,6 @@
new FixReplacement(filePath1, new Range(0, 0, 0, 0), "A new line\n");
mockFileContent(filePath1, "First line\nSecond line\nThird line\n");
- replay(fileContentUtil);
-
assertThrows(ResourceConflictException.class, () -> toTreeModifications(fixReplacement));
}
@@ -276,7 +262,6 @@
new FixReplacement(filePath1, new Range(1, 0, 1, 11), "modified");
mockFileContent(filePath1, "First line\nSecond line\nThird line\n");
- replay(fileContentUtil);
assertThrows(ResourceConflictException.class, () -> toTreeModifications(fixReplacement));
}
@@ -286,8 +271,6 @@
new FixReplacement(filePath1, new Range(3, 0, 3, 11), "modified");
mockFileContent(filePath1, "First line\nSecond line\nThird line\n");
- replay(fileContentUtil);
-
assertThrows(ResourceConflictException.class, () -> toTreeModifications(fixReplacement));
}
@@ -297,14 +280,12 @@
new FixReplacement(filePath1, new Range(1, -1, 1, 5), "modified");
mockFileContent(filePath1, "First line\nSecond line\nThird line\n");
- replay(fileContentUtil);
assertThrows(ResourceConflictException.class, () -> toTreeModifications(fixReplacement));
}
private void mockFileContent(String filePath, String fileContent) throws Exception {
- EasyMock.expect(
- fileContentUtil.getContent(repository, projectState, patchSetCommitId, filePath))
- .andReturn(BinaryResult.create(fileContent));
+ when(fileContentUtil.getContent(repository, projectState, patchSetCommitId, filePath))
+ .thenReturn(BinaryResult.create(fileContent));
}
private List<TreeModification> toTreeModifications(FixReplacement... fixReplacements)
