Migrate from "expected = " to assertThrows
By using assertThrows we make it more explicit on which statements the
exception is expected to be thrown. Particularly in the ConfigUtil test
this makes the code more readable; the current implementation has calls
to the assertThat methods that are never actually executed because the
exception is thrown.
Change-Id: I5db0f469af6b2fe4857dd8134a9acb21ee997361
diff --git a/src/test/java/com/ericsson/gerrit/plugins/gcconductor/executor/ConfigUtilTest.java b/src/test/java/com/ericsson/gerrit/plugins/gcconductor/executor/ConfigUtilTest.java
index c99201a..1485d72 100644
--- a/src/test/java/com/ericsson/gerrit/plugins/gcconductor/executor/ConfigUtilTest.java
+++ b/src/test/java/com/ericsson/gerrit/plugins/gcconductor/executor/ConfigUtilTest.java
@@ -15,6 +15,7 @@
package com.ericsson.gerrit.plugins.gcconductor.executor;
import static com.google.common.truth.Truth.assertThat;
+import static com.google.gerrit.testing.GerritJUnit.assertThrows;
import static java.util.concurrent.TimeUnit.DAYS;
import static java.util.concurrent.TimeUnit.HOURS;
import static java.util.concurrent.TimeUnit.MILLISECONDS;
@@ -52,22 +53,24 @@
.isEqualTo(DEFAULT_VALUE);
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void testGetTimeThrowsExceptionIfNegativeValue() {
when(config.getString("", null, "")).thenReturn("-1");
- assertThat(ConfigUtil.getTimeUnit(config, "", "", DEFAULT_VALUE, DAYS))
- .isEqualTo(DEFAULT_VALUE);
+ assertThrows(
+ IllegalArgumentException.class,
+ () -> ConfigUtil.getTimeUnit(config, "", "", DEFAULT_VALUE, DAYS));
when(config.getString("", null, "")).thenReturn("");
assertThat(ConfigUtil.getTimeUnit(config, "", "", DEFAULT_VALUE, DAYS))
.isEqualTo(DEFAULT_VALUE);
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void testGetTimeThrowsExceptionIfBadTimeUnit() {
when(config.getString("", null, "")).thenReturn("1s");
- assertThat(ConfigUtil.getTimeUnit(config, "", "", DEFAULT_VALUE, DAYS))
- .isEqualTo(DEFAULT_VALUE);
+ assertThrows(
+ IllegalArgumentException.class,
+ () -> ConfigUtil.getTimeUnit(config, "", "", DEFAULT_VALUE, DAYS));
}
@Test
@@ -99,9 +102,9 @@
assertEquals(ms(1, MILLISECONDS), parse(""));
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void testUnsupportedTimeUnit() {
- parse("1 min");
+ assertThrows(IllegalArgumentException.class, () -> parse("1 min"));
}
private static long ms(int cnt, TimeUnit unit) {
diff --git a/src/test/java/com/ericsson/gerrit/plugins/gcconductor/executor/ScheduledEvaluationTaskTest.java b/src/test/java/com/ericsson/gerrit/plugins/gcconductor/executor/ScheduledEvaluationTaskTest.java
index c560fbf..302c4c8 100644
--- a/src/test/java/com/ericsson/gerrit/plugins/gcconductor/executor/ScheduledEvaluationTaskTest.java
+++ b/src/test/java/com/ericsson/gerrit/plugins/gcconductor/executor/ScheduledEvaluationTaskTest.java
@@ -14,6 +14,7 @@
package com.ericsson.gerrit.plugins.gcconductor.executor;
+import static com.google.gerrit.testing.GerritJUnit.assertThrows;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyZeroInteractions;
@@ -50,10 +51,12 @@
periodicEvaluator = new ScheduledEvaluationTask(evaluationTaskFactory, config);
}
- @Test(expected = ProvisionException.class)
- public void shouldThrowAnExceptionOnInvalidrepositoryPath() {
+ @Test
+ public void shouldThrowAnExceptionOnInvalidrepositoryPath() throws Exception {
when(config.getRepositoriesPath()).thenReturn("unexistingPath");
- periodicEvaluator = new ScheduledEvaluationTask(evaluationTaskFactory, config);
+ assertThrows(
+ ProvisionException.class,
+ () -> periodicEvaluator = new ScheduledEvaluationTask(evaluationTaskFactory, config));
}
@Test
diff --git a/src/test/java/com/ericsson/gerrit/plugins/gcconductor/postgresqueue/PostgresModuleTest.java b/src/test/java/com/ericsson/gerrit/plugins/gcconductor/postgresqueue/PostgresModuleTest.java
index cb177c2..a9d4001 100644
--- a/src/test/java/com/ericsson/gerrit/plugins/gcconductor/postgresqueue/PostgresModuleTest.java
+++ b/src/test/java/com/ericsson/gerrit/plugins/gcconductor/postgresqueue/PostgresModuleTest.java
@@ -17,6 +17,7 @@
import static com.ericsson.gerrit.plugins.gcconductor.postgresqueue.TestUtil.configMockFor;
import static com.ericsson.gerrit.plugins.gcconductor.postgresqueue.TestUtil.invalidConfigMockFor;
import static com.google.common.truth.Truth.assertThat;
+import static com.google.gerrit.testing.GerritJUnit.assertThrows;
import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.mock;
@@ -72,9 +73,10 @@
assertThat(dataSource.isClosed()).isFalse();
}
- @Test(expected = SQLException.class)
- public void shouldFailIfDatabaseNameIsInvalid() throws SQLException {
- module.provideGcDatabaseAccess(invalidConfigMockFor(container));
+ @Test
+ public void shouldFailIfDatabaseNameIsInvalid() throws Exception {
+ assertThrows(
+ SQLException.class, () -> module.provideGcDatabaseAccess(invalidConfigMockFor(container)));
}
@Test
@@ -86,11 +88,11 @@
assertThat(dataSource.isClosed()).isTrue();
}
- @Test(expected = RuntimeException.class)
- public void shouldThrowExceptionIfFailsToCloseDatabaseAccess() throws SQLException {
+ @Test
+ public void shouldThrowExceptionIfFailsToCloseDatabaseAccess() throws Exception {
BasicDataSource dataSouceMock = mock(BasicDataSource.class);
doThrow(new SQLException("somme error")).when(dataSouceMock).close();
DatabaseAccessCleanUp dbCleanUp = new DatabaseAccessCleanUp(dataSouceMock);
- dbCleanUp.onShutdown();
+ assertThrows(RuntimeException.class, () -> dbCleanUp.onShutdown());
}
}
diff --git a/src/test/java/com/ericsson/gerrit/plugins/gcconductor/postgresqueue/PostgresQueueTest.java b/src/test/java/com/ericsson/gerrit/plugins/gcconductor/postgresqueue/PostgresQueueTest.java
index dea751d..8777f18 100644
--- a/src/test/java/com/ericsson/gerrit/plugins/gcconductor/postgresqueue/PostgresQueueTest.java
+++ b/src/test/java/com/ericsson/gerrit/plugins/gcconductor/postgresqueue/PostgresQueueTest.java
@@ -16,6 +16,7 @@
import static com.ericsson.gerrit.plugins.gcconductor.postgresqueue.TestUtil.configMockFor;
import static com.google.common.truth.Truth.assertThat;
+import static com.google.gerrit.testing.GerritJUnit.assertThrows;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -68,11 +69,11 @@
assertThat(queue.list()).isEmpty();
}
- @Test(expected = SQLException.class)
+ @Test
public void shouldThrowExceptionIfFailsToCreateSchemaOnInit() throws Exception {
BasicDataSource dataSouceMock = mock(BasicDataSource.class);
when(dataSouceMock.getConnection()).thenThrow(new SQLException("some message"));
- queue = new PostgresQueue(dataSouceMock);
+ assertThrows(SQLException.class, () -> queue = new PostgresQueue(dataSouceMock));
}
@Test
@@ -113,64 +114,64 @@
assertThat(queue.contains(repoPath)).isFalse();
}
- @Test(expected = GcQueueException.class)
+ @Test
public void testAddThatFailsWhenGettingConnection() throws Exception {
queue = new PostgresQueue(createDataSourceThatFailsWhenGettingConnection());
- queue.add("repo", "hostname");
+ assertThrows(GcQueueException.class, () -> queue.add("repo", "hostname"));
}
- @Test(expected = GcQueueException.class)
+ @Test
public void testAddThatFailsWhenCreatingStatement() throws Exception {
queue = new PostgresQueue(createDataSourceThatFailsWhenCreatingStatement());
- queue.add("repo", "hostname");
+ assertThrows(GcQueueException.class, () -> queue.add("repo", "hostname"));
}
- @Test(expected = GcQueueException.class)
+ @Test
public void testAddThatFailsWhenExecutingQuery() throws Exception {
queue = new PostgresQueue(createDataSourceThatFailsWhenExecutingQuery());
- queue.add("repo", "hostname");
+ assertThrows(GcQueueException.class, () -> queue.add("repo", "hostname"));
}
- @Test(expected = GcQueueException.class)
+ @Test
public void testContainsThatFailsWhenGettingConnection() throws Exception {
queue = new PostgresQueue(createDataSourceThatFailsWhenGettingConnection());
- queue.contains("repo");
+ assertThrows(GcQueueException.class, () -> queue.contains("repo"));
}
- @Test(expected = GcQueueException.class)
+ @Test
public void testContainsThatFailsWhenCreatingStatement() throws Exception {
queue = new PostgresQueue(createDataSourceThatFailsWhenCreatingStatement());
- queue.contains("repo");
+ assertThrows(GcQueueException.class, () -> queue.contains("repo"));
}
- @Test(expected = GcQueueException.class)
+ @Test
public void testContainsThatFailsWhenExecutingQuery() throws Exception {
queue = new PostgresQueue(createDataSourceThatFailsWhenExecutingQuery());
- queue.contains("repo");
+ assertThrows(GcQueueException.class, () -> queue.contains("repo"));
}
- @Test(expected = GcQueueException.class)
+ @Test
public void testContainsThatFailsWhenIteratingResults() throws Exception {
queue = new PostgresQueue(createDataSourceThatFailsWhenIteratingResults());
- queue.contains("repo");
+ assertThrows(GcQueueException.class, () -> queue.contains("repo"));
}
- @Test(expected = GcQueueException.class)
+ @Test
public void testRemoveThatFailsWhenGettingConnection() throws Exception {
queue = new PostgresQueue(createDataSourceThatFailsWhenGettingConnection());
- queue.remove("repo");
+ assertThrows(GcQueueException.class, () -> queue.remove("repo"));
}
- @Test(expected = GcQueueException.class)
+ @Test
public void testRemoveThatFailsWhenCreatingStatement() throws Exception {
queue = new PostgresQueue(createDataSourceThatFailsWhenCreatingStatement());
- queue.remove("repo");
+ assertThrows(GcQueueException.class, () -> queue.remove("repo"));
}
- @Test(expected = GcQueueException.class)
+ @Test
public void testRemoveThatFailsWhenExecutingQuery() throws Exception {
queue = new PostgresQueue(createDataSourceThatFailsWhenExecutingQuery());
- queue.remove("repo");
+ assertThrows(GcQueueException.class, () -> queue.remove("repo"));
}
@Test
@@ -206,28 +207,28 @@
assertThat(timestampDiff).isAtMost(TimeUnit.SECONDS.toMillis(1));
}
- @Test(expected = GcQueueException.class)
+ @Test
public void testListThatFailsWhenGettingConnection() throws Exception {
queue = new PostgresQueue(createDataSourceThatFailsWhenGettingConnection());
- queue.list();
+ assertThrows(GcQueueException.class, () -> queue.list());
}
- @Test(expected = GcQueueException.class)
+ @Test
public void testListThatFailsWhenCreatingStatement() throws Exception {
queue = new PostgresQueue(createDataSourceThatFailsWhenCreatingStatement());
- queue.list();
+ assertThrows(GcQueueException.class, () -> queue.list());
}
- @Test(expected = GcQueueException.class)
+ @Test
public void testListThatFailsWhenExecutingQuery() throws Exception {
queue = new PostgresQueue(createDataSourceThatFailsWhenExecutingQuery());
- queue.list();
+ assertThrows(GcQueueException.class, () -> queue.list());
}
- @Test(expected = GcQueueException.class)
+ @Test
public void testListThatFailsWhenIteratingResults() throws Exception {
queue = new PostgresQueue(createDataSourceThatFailsWhenIteratingResults());
- queue.list();
+ assertThrows(GcQueueException.class, () -> queue.list());
}
@Test
@@ -308,28 +309,28 @@
assertThat(picked.getExecutor()).isEqualTo(executor);
}
- @Test(expected = GcQueueException.class)
+ @Test
public void testPickThatFailsWhenGettingConnection() throws Exception {
queue = new PostgresQueue(createDataSourceThatFailsWhenGettingConnection());
- queue.pick("executor", 0, Optional.empty());
+ assertThrows(GcQueueException.class, () -> queue.pick("executor", 0, Optional.empty()));
}
- @Test(expected = GcQueueException.class)
+ @Test
public void testPickThatFailsWhenCreatingStatement() throws Exception {
queue = new PostgresQueue(createDataSourceThatFailsWhenCreatingStatement());
- queue.pick("executor", 0, Optional.empty());
+ assertThrows(GcQueueException.class, () -> queue.pick("executor", 0, Optional.empty()));
}
- @Test(expected = GcQueueException.class)
+ @Test
public void testPickThatFailsWhenExecutingQuery() throws Exception {
queue = new PostgresQueue(createDataSourceThatFailsWhenExecutingQuery());
- queue.pick("executor", 0, Optional.empty());
+ assertThrows(GcQueueException.class, () -> queue.pick("executor", 0, Optional.empty()));
}
- @Test(expected = GcQueueException.class)
+ @Test
public void testPickThatFailsWhenIteratingResults() throws Exception {
queue = new PostgresQueue(createDataSourceThatFailsWhenIteratingResults());
- queue.pick("executor", 0, Optional.empty());
+ assertThrows(GcQueueException.class, () -> queue.pick("executor", 0, Optional.empty()));
}
@Test
@@ -352,22 +353,22 @@
assertThat(picked.getExecutor()).isEqualTo(executor);
}
- @Test(expected = GcQueueException.class)
+ @Test
public void testUnpickThatFailsWhenGettingConnection() throws Exception {
queue = new PostgresQueue(createDataSourceThatFailsWhenGettingConnection());
- queue.unpick("/some/path/to/some/repository.git");
+ assertThrows(GcQueueException.class, () -> queue.unpick("/some/path/to/some/repository.git"));
}
- @Test(expected = GcQueueException.class)
+ @Test
public void testUnpickFailsWhenCreatingStatement() throws Exception {
queue = new PostgresQueue(createDataSourceThatFailsWhenCreatingStatement());
- queue.unpick("/some/path/to/some/repository.git");
+ assertThrows(GcQueueException.class, () -> queue.unpick("/some/path/to/some/repository.git"));
}
- @Test(expected = GcQueueException.class)
+ @Test
public void testUnpickThatFailsWhenExecutingQuery() throws Exception {
queue = new PostgresQueue(createDataSourceThatFailsWhenExecutingQuery());
- queue.unpick("/some/path/to/some/repository.git");
+ assertThrows(GcQueueException.class, () -> queue.unpick("/some/path/to/some/repository.git"));
}
@Test
@@ -387,22 +388,22 @@
assertThat(queue.list().get(1).getQueuedFrom()).isEqualTo(otherHostname);
}
- @Test(expected = GcQueueException.class)
+ @Test
public void testResetQueuedFromThatFailsWhenGettingConnection() throws Exception {
queue = new PostgresQueue(createDataSourceThatFailsWhenGettingConnection());
- queue.resetQueuedFrom("someHostname");
+ assertThrows(GcQueueException.class, () -> queue.resetQueuedFrom("someHostname"));
}
- @Test(expected = GcQueueException.class)
+ @Test
public void testResetQueuedFromFailsWhenCreatingStatement() throws Exception {
queue = new PostgresQueue(createDataSourceThatFailsWhenCreatingStatement());
- queue.resetQueuedFrom("someHostname");
+ assertThrows(GcQueueException.class, () -> queue.resetQueuedFrom("someHostname"));
}
- @Test(expected = GcQueueException.class)
+ @Test
public void testResetQueuedFromThatFailsWhenExecutingQuery() throws Exception {
queue = new PostgresQueue(createDataSourceThatFailsWhenExecutingQuery());
- queue.resetQueuedFrom("someHostname");
+ assertThrows(GcQueueException.class, () -> queue.resetQueuedFrom("someHostname"));
}
@Test
@@ -437,22 +438,22 @@
assertThat(queue.list().get(2).getPath()).isEqualTo(repoPath2);
}
- @Test(expected = GcQueueException.class)
+ @Test
public void testBumpToFirstThatFailsWhenGettingConnection() throws Exception {
queue = new PostgresQueue(createDataSourceThatFailsWhenGettingConnection());
- queue.bumpToFirst("someHostname");
+ assertThrows(GcQueueException.class, () -> queue.bumpToFirst("someHostname"));
}
- @Test(expected = GcQueueException.class)
+ @Test
public void testBumpToFirstFailsWhenCreatingStatement() throws Exception {
queue = new PostgresQueue(createDataSourceThatFailsWhenCreatingStatement());
- queue.bumpToFirst("someHostname");
+ assertThrows(GcQueueException.class, () -> queue.bumpToFirst("someHostname"));
}
- @Test(expected = GcQueueException.class)
+ @Test
public void testBumpToFirstThatFailsWhenExecutingQuery() throws Exception {
queue = new PostgresQueue(createDataSourceThatFailsWhenExecutingQuery());
- queue.bumpToFirst("someHostname");
+ assertThrows(GcQueueException.class, () -> queue.bumpToFirst("someHostname"));
}
private BasicDataSource createDataSourceThatFailsWhenGettingConnection() throws Exception {
