Merge branch 'stable-3.0' into stable-3.1
* stable-3.0:
Replace ExpectedException with assertThrows
Change-Id: Ia0894e859af350687826b3d449beb2bed7b1ed1c
diff --git a/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/ForwardedCacheEvictionHandlerTest.java b/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/ForwardedCacheEvictionHandlerTest.java
index 155d523..e09adae 100644
--- a/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/ForwardedCacheEvictionHandlerTest.java
+++ b/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/ForwardedCacheEvictionHandlerTest.java
@@ -15,6 +15,7 @@
package com.ericsson.gerrit.plugins.highavailability.forwarder;
import static com.google.common.truth.Truth.assertThat;
+import static com.google.gerrit.testing.GerritJUnit.assertThrows;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.verify;
@@ -24,9 +25,7 @@
import com.google.gerrit.entities.Account;
import com.google.gerrit.extensions.registration.DynamicMap;
import org.junit.Before;
-import org.junit.Rule;
import org.junit.Test;
-import org.junit.rules.ExpectedException;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
@@ -35,7 +34,6 @@
@RunWith(MockitoJUnitRunner.class)
public class ForwardedCacheEvictionHandlerTest {
- @Rule public ExpectedException exception = ExpectedException.none();
@Mock private DynamicMap<Cache<?, ?>> cacheMapMock;
@Mock private Cache<?, ?> cacheMock;
private ForwardedCacheEvictionHandler handler;
@@ -48,11 +46,11 @@
@Test
public void shouldThrowAnExceptionWhenCacheNotFound() throws Exception {
CacheEntry entry = new CacheEntry("somePlugin", "unexistingCache", null);
-
- exception.expect(CacheNotFoundException.class);
- exception.expectMessage(
- String.format("cache %s.%s not found", entry.getPluginName(), entry.getCacheName()));
- handler.evict(entry);
+ String expectedMessage =
+ String.format("cache %s.%s not found", entry.getPluginName(), entry.getCacheName());
+ CacheNotFoundException thrown =
+ assertThrows(CacheNotFoundException.class, () -> handler.evict(entry));
+ assertThat(thrown).hasMessageThat().contains(expectedMessage);
}
@Test
diff --git a/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/ForwardedEventHandlerTest.java b/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/ForwardedEventHandlerTest.java
index c83b803..3e1f8fd 100644
--- a/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/ForwardedEventHandlerTest.java
+++ b/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/ForwardedEventHandlerTest.java
@@ -24,9 +24,7 @@
import com.google.gerrit.server.events.ProjectCreatedEvent;
import com.google.gerrit.server.permissions.PermissionBackendException;
import org.junit.Before;
-import org.junit.Rule;
import org.junit.Test;
-import org.junit.rules.ExpectedException;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
@@ -35,7 +33,6 @@
@RunWith(MockitoJUnitRunner.class)
public class ForwardedEventHandlerTest {
- @Rule public ExpectedException exception = ExpectedException.none();
@Mock private EventDispatcher dispatcherMock;
private ForwardedEventHandler handler;
diff --git a/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/ForwardedIndexAccountHandlerTest.java b/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/ForwardedIndexAccountHandlerTest.java
index bd3390a..33ca11c 100644
--- a/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/ForwardedIndexAccountHandlerTest.java
+++ b/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/ForwardedIndexAccountHandlerTest.java
@@ -27,9 +27,7 @@
import java.io.IOException;
import java.util.Optional;
import org.junit.Before;
-import org.junit.Rule;
import org.junit.Test;
-import org.junit.rules.ExpectedException;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
@@ -38,7 +36,6 @@
@RunWith(MockitoJUnitRunner.class)
public class ForwardedIndexAccountHandlerTest {
- @Rule public ExpectedException exception = ExpectedException.none();
@Mock private AccountIndexer indexerMock;
@Mock private Configuration configMock;
@Mock private Configuration.Index indexMock;
@@ -61,9 +58,11 @@
@Test
public void deleteIsNotSupported() throws Exception {
- exception.expect(UnsupportedOperationException.class);
- exception.expectMessage("Delete from account index not supported");
- handler.index(id, Operation.DELETE, Optional.empty());
+ UnsupportedOperationException thrown =
+ assertThrows(
+ UnsupportedOperationException.class,
+ () -> handler.index(id, Operation.DELETE, Optional.empty()));
+ assertThat(thrown).hasMessageThat().contains("Delete from account index not supported");
}
@Test
diff --git a/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/ForwardedIndexChangeHandlerTest.java b/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/ForwardedIndexChangeHandlerTest.java
index 66eb206..9d852f2 100644
--- a/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/ForwardedIndexChangeHandlerTest.java
+++ b/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/ForwardedIndexChangeHandlerTest.java
@@ -35,9 +35,7 @@
import java.util.Optional;
import java.util.concurrent.ScheduledExecutorService;
import org.junit.Before;
-import org.junit.Rule;
import org.junit.Test;
-import org.junit.rules.ExpectedException;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
@@ -54,7 +52,6 @@
private static final boolean CHANGE_UP_TO_DATE = true;
private static final boolean CHANGE_OUTDATED = false;
- @Rule public ExpectedException exception = ExpectedException.none();
@Mock private ChangeIndexer indexerMock;
@Mock private ChangeNotes changeNotes;
@Mock private Configuration configMock;
diff --git a/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/ForwardedIndexGroupHandlerTest.java b/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/ForwardedIndexGroupHandlerTest.java
index 3b476af..b4f887c 100644
--- a/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/ForwardedIndexGroupHandlerTest.java
+++ b/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/ForwardedIndexGroupHandlerTest.java
@@ -27,9 +27,7 @@
import java.io.IOException;
import java.util.Optional;
import org.junit.Before;
-import org.junit.Rule;
import org.junit.Test;
-import org.junit.rules.ExpectedException;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
@@ -38,7 +36,6 @@
@RunWith(MockitoJUnitRunner.class)
public class ForwardedIndexGroupHandlerTest {
- @Rule public ExpectedException exception = ExpectedException.none();
@Mock private GroupIndexer indexerMock;
@Mock private Configuration configMock;
@Mock private Configuration.Index indexMock;
@@ -61,9 +58,11 @@
@Test
public void deleteIsNotSupported() throws Exception {
- exception.expect(UnsupportedOperationException.class);
- exception.expectMessage("Delete from group index not supported");
- handler.index(uuid, Operation.DELETE, Optional.empty());
+ UnsupportedOperationException thrown =
+ assertThrows(
+ UnsupportedOperationException.class,
+ () -> handler.index(uuid, Operation.DELETE, Optional.empty()));
+ assertThat(thrown).hasMessageThat().contains("Delete from group index not supported");
}
@Test
diff --git a/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/ForwardedIndexProjectHandlerTest.java b/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/ForwardedIndexProjectHandlerTest.java
index 0ba223f..5e05fd6 100644
--- a/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/ForwardedIndexProjectHandlerTest.java
+++ b/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/ForwardedIndexProjectHandlerTest.java
@@ -27,9 +27,7 @@
import java.io.IOException;
import java.util.Optional;
import org.junit.Before;
-import org.junit.Rule;
import org.junit.Test;
-import org.junit.rules.ExpectedException;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
@@ -38,7 +36,6 @@
@RunWith(MockitoJUnitRunner.class)
public class ForwardedIndexProjectHandlerTest {
- @Rule public ExpectedException exception = ExpectedException.none();
@Mock private ProjectIndexer indexerMock;
@Mock private Configuration configMock;
@Mock private Configuration.Index indexMock;
@@ -61,9 +58,11 @@
@Test
public void deleteIsNotSupported() throws Exception {
- exception.expect(UnsupportedOperationException.class);
- exception.expectMessage("Delete from project index not supported");
- handler.index(nameKey, Operation.DELETE, Optional.empty());
+ UnsupportedOperationException thrown =
+ assertThrows(
+ UnsupportedOperationException.class,
+ () -> handler.index(nameKey, Operation.DELETE, Optional.empty()));
+ assertThat(thrown).hasMessageThat().contains("Delete from project index not supported");
}
@Test
diff --git a/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/ForwardedProjectListUpdateHandlerTest.java b/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/ForwardedProjectListUpdateHandlerTest.java
index c3176fd..2067265 100644
--- a/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/ForwardedProjectListUpdateHandlerTest.java
+++ b/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/ForwardedProjectListUpdateHandlerTest.java
@@ -22,9 +22,7 @@
import com.google.gerrit.entities.Project;
import com.google.gerrit.server.project.ProjectCache;
import org.junit.Before;
-import org.junit.Rule;
import org.junit.Test;
-import org.junit.rules.ExpectedException;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
@@ -36,7 +34,6 @@
private static final String PROJECT_NAME = "someProject";
private static final String SOME_MESSAGE = "someMessage";
private static final Project.NameKey PROJECT_KEY = Project.nameKey(PROJECT_NAME);
- @Rule public ExpectedException exception = ExpectedException.none();
@Mock private ProjectCache projectCacheMock;
private ForwardedProjectListUpdateHandler handler;
diff --git a/src/test/java/com/ericsson/gerrit/plugins/highavailability/peers/jgroups/MyUrlProviderTest.java b/src/test/java/com/ericsson/gerrit/plugins/highavailability/peers/jgroups/MyUrlProviderTest.java
index f3e8b7d..c337947 100644
--- a/src/test/java/com/ericsson/gerrit/plugins/highavailability/peers/jgroups/MyUrlProviderTest.java
+++ b/src/test/java/com/ericsson/gerrit/plugins/highavailability/peers/jgroups/MyUrlProviderTest.java
@@ -15,6 +15,7 @@
package com.ericsson.gerrit.plugins.highavailability.peers.jgroups;
import static com.google.common.truth.Truth.assertThat;
+import static com.google.gerrit.testing.GerritJUnit.assertThrows;
import static java.net.InetAddress.getLocalHost;
import static org.mockito.Answers.RETURNS_DEEP_STUBS;
import static org.mockito.Mockito.when;
@@ -23,9 +24,7 @@
import com.google.inject.ProvisionException;
import org.eclipse.jgit.lib.Config;
import org.junit.Before;
-import org.junit.Rule;
import org.junit.Test;
-import org.junit.rules.ExpectedException;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
@@ -38,8 +37,6 @@
private static final String HTTPS = "https://";
private static final String LISTEN_URL = "listenUrl";
- @Rule public ExpectedException exception = ExpectedException.none();
-
@Mock(answer = RETURNS_DEEP_STUBS)
private Configuration configurationMock;
@@ -70,33 +67,29 @@
@Test
public void testGetJGroupsMyUrlFromListenUrlWhenNoListenUrlSpecified() throws Exception {
- exception.expect(ProvisionException.class);
- exception.expectMessage("exactly 1 value configured; found 0");
- getMyUrlProvider();
+ ProvisionException thrown = assertThrows(ProvisionException.class, () -> getMyUrlProvider());
+ assertThat(thrown).hasMessageThat().contains("exactly 1 value configured; found 0");
}
@Test
public void testGetJGroupsMyUrlFromListenUrlWhenMultipleListenUrlsSpecified() throws Exception {
gerritServerConfig.setStringList(HTTPD, null, LISTEN_URL, Lists.newArrayList("a", "b"));
- exception.expect(ProvisionException.class);
- exception.expectMessage("exactly 1 value configured; found 2");
- getMyUrlProvider();
+ ProvisionException thrown = assertThrows(ProvisionException.class, () -> getMyUrlProvider());
+ assertThat(thrown).hasMessageThat().contains("exactly 1 value configured; found 2");
}
@Test
public void testGetJGroupsMyUrlFromListenUrlWhenReverseProxyConfigured() throws Exception {
gerritServerConfig.setString(HTTPD, null, LISTEN_URL, "proxy-https://foo");
- exception.expect(ProvisionException.class);
- exception.expectMessage("when configured as reverse-proxy");
- getMyUrlProvider();
+ ProvisionException thrown = assertThrows(ProvisionException.class, () -> getMyUrlProvider());
+ assertThat(thrown).hasMessageThat().contains("when configured as reverse-proxy");
}
@Test
public void testGetJGroupsMyUrlFromListenUrlWhenWildcardConfigured() throws Exception {
gerritServerConfig.setString(HTTPD, null, LISTEN_URL, "https://*");
- exception.expect(ProvisionException.class);
- exception.expectMessage("when configured with wildcard");
- getMyUrlProvider();
+ ProvisionException thrown = assertThrows(ProvisionException.class, () -> getMyUrlProvider());
+ assertThat(thrown).hasMessageThat().contains("when configured with wildcard");
}
@Test
