Add mock suffix in Index*RestApiServletTest
This allows to easily identify which variables are mock and which ones
are not.
Change-Id: I1030efdf86f71bb161f2f85af41b3284dc78585a
diff --git a/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/IndexAccountRestApiServletTest.java b/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/IndexAccountRestApiServletTest.java
index 9893c0a..a2fcc99 100644
--- a/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/IndexAccountRestApiServletTest.java
+++ b/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/IndexAccountRestApiServletTest.java
@@ -40,9 +40,9 @@
public class IndexAccountRestApiServletTest {
private static final String ACCOUNT_NUMBER = "1";
- @Mock private AccountIndexer indexer;
- @Mock private HttpServletRequest req;
- @Mock private HttpServletResponse rsp;
+ @Mock private AccountIndexer indexerMock;
+ @Mock private HttpServletRequest requestMock;
+ @Mock private HttpServletResponse responseMock;
private Account.Id id;
private IndexAccountRestApiServlet servlet;
@@ -54,36 +54,36 @@
@Before
public void setUpMocks() {
- servlet = new IndexAccountRestApiServlet(indexer);
+ servlet = new IndexAccountRestApiServlet(indexerMock);
id = Account.Id.parse(ACCOUNT_NUMBER);
- when(req.getPathInfo()).thenReturn("/index/account/" + ACCOUNT_NUMBER);
+ when(requestMock.getPathInfo()).thenReturn("/index/account/" + ACCOUNT_NUMBER);
}
@Test
public void accountIsIndexed() throws Exception {
- servlet.doPost(req, rsp);
- verify(indexer, times(1)).index(id);
- verify(rsp).setStatus(SC_NO_CONTENT);
+ servlet.doPost(requestMock, responseMock);
+ verify(indexerMock, times(1)).index(id);
+ verify(responseMock).setStatus(SC_NO_CONTENT);
}
@Test
public void cannotDeleteAccount() throws Exception {
- servlet.doDelete(req, rsp);
- verify(rsp).sendError(SC_METHOD_NOT_ALLOWED, "cannot delete account from index");
+ servlet.doDelete(requestMock, responseMock);
+ verify(responseMock).sendError(SC_METHOD_NOT_ALLOWED, "cannot delete account from index");
}
@Test
public void indexerThrowsIOExceptionTryingToIndexAccount() throws Exception {
- doThrow(new IOException("io-error")).when(indexer).index(id);
- servlet.doPost(req, rsp);
- verify(rsp).sendError(SC_CONFLICT, "io-error");
+ doThrow(new IOException("io-error")).when(indexerMock).index(id);
+ servlet.doPost(requestMock, responseMock);
+ verify(responseMock).sendError(SC_CONFLICT, "io-error");
}
@Test
public void sendErrorThrowsIOException() throws Exception {
- doThrow(new IOException("io-error")).when(indexer).index(id);
- doThrow(new IOException("someError")).when(rsp).sendError(SC_CONFLICT, "io-error");
- servlet.doPost(req, rsp);
- verify(rsp).sendError(SC_CONFLICT, "io-error");
+ doThrow(new IOException("io-error")).when(indexerMock).index(id);
+ doThrow(new IOException("someError")).when(responseMock).sendError(SC_CONFLICT, "io-error");
+ servlet.doPost(requestMock, responseMock);
+ verify(responseMock).sendError(SC_CONFLICT, "io-error");
}
}
diff --git a/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/IndexChangeRestApiServletTest.java b/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/IndexChangeRestApiServletTest.java
index 2e63fa7..4348e27 100644
--- a/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/IndexChangeRestApiServletTest.java
+++ b/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/IndexChangeRestApiServletTest.java
@@ -54,11 +54,11 @@
private static final boolean THROW_ORM_EXCEPTION = true;
private static final String CHANGE_NUMBER = "1";
- @Mock private ChangeIndexer indexer;
- @Mock private SchemaFactory<ReviewDb> schemaFactory;
- @Mock private ReviewDb db;
- @Mock private HttpServletRequest req;
- @Mock private HttpServletResponse rsp;
+ @Mock private ChangeIndexer indexerMock;
+ @Mock private SchemaFactory<ReviewDb> schemaFactoryMock;
+ @Mock private ReviewDb dbMock;
+ @Mock private HttpServletRequest requestMock;
+ @Mock private HttpServletResponse responseMock;
private Change.Id id;
private Change change;
private IndexChangeRestApiServlet indexRestApiServlet;
@@ -70,82 +70,82 @@
@Before
public void setUpMocks() {
- indexRestApiServlet = new IndexChangeRestApiServlet(indexer, schemaFactory);
+ indexRestApiServlet = new IndexChangeRestApiServlet(indexerMock, schemaFactoryMock);
id = Change.Id.parse(CHANGE_NUMBER);
- when(req.getPathInfo()).thenReturn("/index/change/" + CHANGE_NUMBER);
+ when(requestMock.getPathInfo()).thenReturn("/index/change/" + CHANGE_NUMBER);
change = new Change(null, id, null, null, TimeUtil.nowTs());
}
@Test
public void changeIsIndexed() throws Exception {
setupPostMocks(CHANGE_EXISTS);
- indexRestApiServlet.doPost(req, rsp);
- verify(indexer, times(1)).index(db, change);
- verify(rsp).setStatus(SC_NO_CONTENT);
+ indexRestApiServlet.doPost(requestMock, responseMock);
+ verify(indexerMock, times(1)).index(dbMock, change);
+ verify(responseMock).setStatus(SC_NO_CONTENT);
}
@Test
public void changeToIndexDoNotExist() throws Exception {
setupPostMocks(CHANGE_DOES_NOT_EXIST);
- indexRestApiServlet.doPost(req, rsp);
- verify(indexer, times(1)).delete(id);
- verify(rsp).setStatus(SC_NO_CONTENT);
+ indexRestApiServlet.doPost(requestMock, responseMock);
+ verify(indexerMock, times(1)).delete(id);
+ verify(responseMock).setStatus(SC_NO_CONTENT);
}
@Test
public void schemaThrowsExceptionWhenLookingUpForChange() throws Exception {
setupPostMocks(CHANGE_EXISTS, THROW_ORM_EXCEPTION);
- indexRestApiServlet.doPost(req, rsp);
- verify(rsp).sendError(SC_NOT_FOUND, "Error trying to find change \n");
+ indexRestApiServlet.doPost(requestMock, responseMock);
+ verify(responseMock).sendError(SC_NOT_FOUND, "Error trying to find change \n");
}
@Test
public void indexerThrowsNoSuchChangeExceptionTryingToPostChange() throws Exception {
- doThrow(new NoSuchChangeException(id)).when(schemaFactory).open();
- indexRestApiServlet.doPost(req, rsp);
- verify(indexer, times(1)).delete(id);
- verify(rsp).setStatus(SC_NO_CONTENT);
+ doThrow(new NoSuchChangeException(id)).when(schemaFactoryMock).open();
+ indexRestApiServlet.doPost(requestMock, responseMock);
+ verify(indexerMock, times(1)).delete(id);
+ verify(responseMock).setStatus(SC_NO_CONTENT);
}
@Test
public void indexerThrowsNestedNoSuchChangeExceptionTryingToPostChange() throws Exception {
OrmException e = new OrmException("test", new NoSuchChangeException(id));
- doThrow(e).when(schemaFactory).open();
- indexRestApiServlet.doPost(req, rsp);
- verify(indexer, times(1)).delete(id);
- verify(rsp).setStatus(SC_NO_CONTENT);
+ doThrow(e).when(schemaFactoryMock).open();
+ indexRestApiServlet.doPost(requestMock, responseMock);
+ verify(indexerMock, times(1)).delete(id);
+ verify(responseMock).setStatus(SC_NO_CONTENT);
}
@Test
public void indexerThrowsIOExceptionTryingToIndexChange() throws Exception {
setupPostMocks(CHANGE_EXISTS, DO_NOT_THROW_ORM_EXCEPTION, THROW_IO_EXCEPTION);
- indexRestApiServlet.doPost(req, rsp);
- verify(rsp).sendError(SC_CONFLICT, "io-error");
+ indexRestApiServlet.doPost(requestMock, responseMock);
+ verify(responseMock).sendError(SC_CONFLICT, "io-error");
}
@Test
public void changeIsDeletedFromIndex() throws Exception {
- indexRestApiServlet.doDelete(req, rsp);
- verify(indexer, times(1)).delete(id);
- verify(rsp).setStatus(SC_NO_CONTENT);
+ indexRestApiServlet.doDelete(requestMock, responseMock);
+ verify(indexerMock, times(1)).delete(id);
+ verify(responseMock).setStatus(SC_NO_CONTENT);
}
@Test
public void indexerThrowsExceptionTryingToDeleteChange() throws Exception {
- doThrow(new IOException("io-error")).when(indexer).delete(id);
- indexRestApiServlet.doDelete(req, rsp);
- verify(rsp).sendError(SC_CONFLICT, "io-error");
+ doThrow(new IOException("io-error")).when(indexerMock).delete(id);
+ indexRestApiServlet.doDelete(requestMock, responseMock);
+ verify(responseMock).sendError(SC_CONFLICT, "io-error");
}
@Test
public void sendErrorThrowsIOException() throws Exception {
doThrow(new IOException("someError"))
- .when(rsp)
+ .when(responseMock)
.sendError(SC_NOT_FOUND, "Error trying to find change \n");
setupPostMocks(CHANGE_EXISTS, THROW_ORM_EXCEPTION);
- indexRestApiServlet.doPost(req, rsp);
- verify(rsp).sendError(SC_NOT_FOUND, "Error trying to find change \n");
- verifyZeroInteractions(indexer);
+ indexRestApiServlet.doPost(requestMock, responseMock);
+ verify(responseMock).sendError(SC_NOT_FOUND, "Error trying to find change \n");
+ verifyZeroInteractions(indexerMock);
}
private void setupPostMocks(boolean changeExist) throws Exception {
@@ -160,15 +160,15 @@
private void setupPostMocks(boolean changeExist, boolean ormException, boolean ioException)
throws OrmException, IOException {
if (ormException) {
- doThrow(new OrmException("")).when(schemaFactory).open();
+ doThrow(new OrmException("")).when(schemaFactoryMock).open();
} else {
- when(schemaFactory.open()).thenReturn(db);
+ when(schemaFactoryMock.open()).thenReturn(dbMock);
ChangeAccess ca = mock(ChangeAccess.class);
- when(db.changes()).thenReturn(ca);
+ when(dbMock.changes()).thenReturn(ca);
if (changeExist) {
when(ca.get(id)).thenReturn(change);
if (ioException) {
- doThrow(new IOException("io-error")).when(indexer).index(db, change);
+ doThrow(new IOException("io-error")).when(indexerMock).index(dbMock, change);
}
} else {
when(ca.get(id)).thenReturn(null);
diff --git a/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/IndexGroupRestApiServletTest.java b/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/IndexGroupRestApiServletTest.java
index 0994b9b..ffdd93e 100644
--- a/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/IndexGroupRestApiServletTest.java
+++ b/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/IndexGroupRestApiServletTest.java
@@ -40,9 +40,9 @@
public class IndexGroupRestApiServletTest {
private static final String UUID = "we235jdf92nfj2351";
- @Mock private GroupIndexer indexer;
- @Mock private HttpServletRequest req;
- @Mock private HttpServletResponse rsp;
+ @Mock private GroupIndexer indexerMock;
+ @Mock private HttpServletRequest requestMock;
+ @Mock private HttpServletResponse responseMock;
private AccountGroup.UUID uuid;
private IndexGroupRestApiServlet servlet;
@@ -54,36 +54,36 @@
@Before
public void setUpMocks() {
- servlet = new IndexGroupRestApiServlet(indexer);
+ servlet = new IndexGroupRestApiServlet(indexerMock);
uuid = AccountGroup.UUID.parse(UUID);
- when(req.getPathInfo()).thenReturn("/index/group/" + UUID);
+ when(requestMock.getPathInfo()).thenReturn("/index/group/" + UUID);
}
@Test
public void groupIsIndexed() throws Exception {
- servlet.doPost(req, rsp);
- verify(indexer, times(1)).index(uuid);
- verify(rsp).setStatus(SC_NO_CONTENT);
+ servlet.doPost(requestMock, responseMock);
+ verify(indexerMock, times(1)).index(uuid);
+ verify(responseMock).setStatus(SC_NO_CONTENT);
}
@Test
public void cannotDeleteGroup() throws Exception {
- servlet.doDelete(req, rsp);
- verify(rsp).sendError(SC_METHOD_NOT_ALLOWED, "cannot delete group from index");
+ servlet.doDelete(requestMock, responseMock);
+ verify(responseMock).sendError(SC_METHOD_NOT_ALLOWED, "cannot delete group from index");
}
@Test
public void indexerThrowsIOExceptionTryingToIndexGroup() throws Exception {
- doThrow(new IOException("io-error")).when(indexer).index(uuid);
- servlet.doPost(req, rsp);
- verify(rsp).sendError(SC_CONFLICT, "io-error");
+ doThrow(new IOException("io-error")).when(indexerMock).index(uuid);
+ servlet.doPost(requestMock, responseMock);
+ verify(responseMock).sendError(SC_CONFLICT, "io-error");
}
@Test
public void sendErrorThrowsIOException() throws Exception {
- doThrow(new IOException("io-error")).when(indexer).index(uuid);
- doThrow(new IOException("someError")).when(rsp).sendError(SC_CONFLICT, "io-error");
- servlet.doPost(req, rsp);
- verify(rsp).sendError(SC_CONFLICT, "io-error");
+ doThrow(new IOException("io-error")).when(indexerMock).index(uuid);
+ doThrow(new IOException("someError")).when(responseMock).sendError(SC_CONFLICT, "io-error");
+ servlet.doPost(requestMock, responseMock);
+ verify(responseMock).sendError(SC_CONFLICT, "io-error");
}
}
