zydronium/google-nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus.git synced 2025-07-22 02:36:03 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge JUnitBackport's expectThrows into assertThrows

Browse source 
More information: https://github.com/junit-team/junit5/issues/531

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=187034408
This commit is contained in:
cushon 2018-02-26 09:38:17 -08:00 • committed by jianglai
parent f96a0b7da9
commit 606b470cd0
180 changed files with 1325 additions and 1381 deletions
Download patch file Download diff file Expand all files Collapse all files

4
javatests/google/registry/reporting/ReportingModuleTest.java
View file

@ -15,7 +15,7 @@
package google.registry.reporting;
import static com.google.common.truth.Truth.assertThat;
import static google.registry.testing.JUnitBackports.expectThrows;
import static google.registry.testing.JUnitBackports.assertThrows;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@ -52,7 +52,7 @@ public class ReportingModuleTest {
public void testInvalidYearMonthParameter_throwsException() {
when(req.getParameter("yearMonth")).thenReturn("201705");
BadRequestException thrown =
expectThrows(
assertThrows(
BadRequestException.class, () -> ReportingModule.provideYearMonthOptional(req));
assertThat(thrown)
.hasMessageThat()

4
javatests/google/registry/reporting/billing/BillingEmailUtilsTest.java
View file

@ -16,7 +16,7 @@ package google.registry.reporting.billing;
import static com.google.common.truth.Truth.assertThat;
import static com.google.common.truth.Truth.assertWithMessage;
import static google.registry.testing.JUnitBackports.expectThrows;
import static google.registry.testing.JUnitBackports.assertThrows;
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.mock;
@ -144,7 +144,7 @@ public class BillingEmailUtilsTest {
}
);
RuntimeException thrown =
expectThrows(RuntimeException.class, () -> emailUtils.emailOverallInvoice());
assertThrows(RuntimeException.class, () -> emailUtils.emailOverallInvoice());
assertThat(thrown).hasMessageThat().isEqualTo("javax.mail.MessagingException: expected");
// Verify we sent an e-mail alert
verify(emailService).sendMessage(msgCaptor.capture());

4
javatests/google/registry/reporting/billing/CopyDetailReportsActionTest.java
View file

@ -18,7 +18,7 @@ import static com.google.common.truth.Truth.assertThat;
import static google.registry.testing.DatastoreHelper.loadRegistrar;
import static google.registry.testing.DatastoreHelper.persistResource;
import static google.registry.testing.GcsTestingUtils.writeGcsFile;
import static google.registry.testing.JUnitBackports.expectThrows;
import static google.registry.testing.JUnitBackports.assertThrows;
import static java.nio.charset.StandardCharsets.UTF_8;
import static javax.servlet.http.HttpServletResponse.SC_OK;
import static org.mockito.Matchers.any;
@ -169,7 +169,7 @@ public class CopyDetailReportsActionTest {
when(driveConnection.createFile(any(), any(), any(), any()))
.thenThrow(new IOException("expected"));
RuntimeException thrown = expectThrows(RuntimeException.class, action::run);
RuntimeException thrown = assertThrows(RuntimeException.class, action::run);
assertThat(thrown).hasMessageThat().isEqualTo("java.io.IOException: expected");
verify(driveConnection, times(3))
.createFile(

10
javatests/google/registry/reporting/icann/IcannHttpReporterTest.java
View file

@ -18,7 +18,7 @@ import static com.google.common.net.MediaType.CSV_UTF_8;
import static com.google.common.net.MediaType.PLAIN_TEXT_UTF_8;
import static com.google.common.truth.Truth.assertThat;
import static google.registry.testing.DatastoreHelper.createTld;
import static google.registry.testing.JUnitBackports.expectThrows;
import static google.registry.testing.JUnitBackports.assertThrows;
import static java.nio.charset.StandardCharsets.UTF_8;
import com.google.api.client.http.LowLevelHttpRequest;
@ -125,7 +125,7 @@ public class IcannHttpReporterTest {
@Test
public void testFail_invalidFilename_nonSixDigitYearMonth() throws Exception {
IllegalArgumentException thrown =
expectThrows(
assertThrows(
IllegalArgumentException.class,
() -> {
IcannHttpReporter reporter = createReporter();
@ -141,7 +141,7 @@ public class IcannHttpReporterTest {
@Test
public void testFail_invalidFilename_notActivityOrTransactions() throws Exception {
IllegalArgumentException thrown =
expectThrows(
assertThrows(
IllegalArgumentException.class,
() -> {
IcannHttpReporter reporter = createReporter();
@ -156,7 +156,7 @@ public class IcannHttpReporterTest {
@Test
public void testFail_invalidFilename_invalidTldName() throws Exception {
IllegalArgumentException thrown =
expectThrows(
assertThrows(
IllegalArgumentException.class,
() -> {
IcannHttpReporter reporter = createReporter();
@ -172,7 +172,7 @@ public class IcannHttpReporterTest {
@Test
public void testFail_invalidFilename_tldDoesntExist() throws Exception {
IllegalArgumentException thrown =
expectThrows(
assertThrows(
IllegalArgumentException.class,
() -> {
IcannHttpReporter reporter = createReporter();

4
javatests/google/registry/reporting/icann/IcannReportingModuleTest.java
View file

@ -15,7 +15,7 @@
package google.registry.reporting.icann;
import static com.google.common.truth.Truth.assertThat;
import static google.registry.testing.JUnitBackports.expectThrows;
import static google.registry.testing.JUnitBackports.assertThrows;
import google.registry.reporting.icann.IcannReportingModule.ReportType;
import google.registry.request.HttpException.BadRequestException;
@ -45,7 +45,7 @@ public class IcannReportingModuleTest {
@Test
public void testInvalidSubdir_throwsException() {
BadRequestException thrown =
expectThrows(
assertThrows(
BadRequestException.class,
() ->
IcannReportingModule.provideSubdir(Optional.of("/whoops"), new YearMonth(2017, 6)));

4
javatests/google/registry/reporting/icann/IcannReportingStagingActionTest.java
View file

@ -15,7 +15,7 @@
package google.registry.reporting.icann;
import static com.google.common.truth.Truth.assertThat;
import static google.registry.testing.JUnitBackports.expectThrows;
import static google.registry.testing.JUnitBackports.assertThrows;
import static google.registry.testing.TaskQueueHelper.assertNoTasksEnqueued;
import static google.registry.testing.TaskQueueHelper.assertTasksEnqueued;
import static org.mockito.Mockito.mock;
@ -134,7 +134,7 @@ public class IcannReportingStagingActionTest {
when(stager.stageReports(ReportType.ACTIVITY))
.thenThrow(new BigqueryJobFailureException("Expected failure", null, null, null));
BigqueryJobFailureException thrown =
expectThrows(BigqueryJobFailureException.class, action::run);
assertThrows(BigqueryJobFailureException.class, action::run);
assertThat(thrown).hasMessageThat().isEqualTo("Expected failure");
verify(stager, times(3)).stageReports(ReportType.ACTIVITY);
verify(emailUtils)

4
javatests/google/registry/reporting/icann/IcannReportingUploadActionTest.java
View file

@ -16,7 +16,7 @@ package google.registry.reporting.icann;
import static com.google.common.truth.Truth.assertThat;
import static google.registry.testing.GcsTestingUtils.writeGcsFile;
import static google.registry.testing.JUnitBackports.expectThrows;
import static google.registry.testing.JUnitBackports.assertThrows;
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
@ -144,7 +144,7 @@ public class IcannReportingUploadActionTest {
public void testFail_FileNotFound() throws Exception {
IcannReportingUploadAction action = createAction();
action.subdir = "somewhere/else";
IllegalArgumentException thrown = expectThrows(IllegalArgumentException.class, action::run);
IllegalArgumentException thrown = assertThrows(IllegalArgumentException.class, action::run);
assertThat(thrown)
.hasMessageThat()
.isEqualTo("Object MANIFEST.txt in bucket basin/somewhere/else not found");