zydronium/google-nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus.git synced 2025-05-21 19:59:34 +02:00
Code Issues Projects Releases Packages Wiki Activity

Refactor the last usages of ExpectedException to assert/expectThrows

Browse source 
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=179095403
This commit is contained in:
mcilwain 2017-12-14 14:15:10 -08:00 • committed by Ben McIlwain
parent fbe11ff33c
commit 16a1d6d196
7 changed files with 127 additions and 154 deletions
Download patch file Download diff file Expand all files Collapse all files

18
javatests/google/registry/rde/imports/RdeHostInputTest.java
View file

@ -16,6 +16,7 @@ package google.registry.rde.imports;
import static com.google.common.truth.Truth.assertThat;
import static google.registry.rde.imports.RdeImportsTestData.loadBytes;
import static google.registry.testing.JUnitBackports.expectThrows;
import com.google.appengine.tools.cloudstorage.GcsFilename;
import com.google.appengine.tools.cloudstorage.GcsService;
@ -33,7 +34,6 @@ import java.util.List;
import java.util.Optional;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
@ -57,24 +57,20 @@ public class RdeHostInputTest {
public final AppEngineRule appEngine = AppEngineRule.builder()
.withDatastore()
.build();
@Rule
public final ExpectedException thrown = ExpectedException.none();
/** Number of shards cannot be negative */
@Test
public void testNegativeShards_throwsIllegalArgumentException() throws Exception {
thrown.expect(IllegalArgumentException.class);
thrown.expectMessage("Number of shards must be greater than zero");
getInput(Optional.of(-1));
IllegalArgumentException thrown =
expectThrows(IllegalArgumentException.class, () -> getInput(Optional.of(-1)));
assertThat(thrown).hasMessageThat().contains("Number of shards must be greater than zero");
}
/** Number of shards cannot be zero */
@Test
public void testZeroShards_throwsIllegalArgumentException() throws Exception {
thrown.expect(IllegalArgumentException.class);
thrown.expectMessage("Number of shards must be greater than zero");
getInput(Optional.of(0));
IllegalArgumentException thrown =
expectThrows(IllegalArgumentException.class, () -> getInput(Optional.of(0)));
assertThat(thrown).hasMessageThat().contains("Number of shards must be greater than zero");
}
/** Escrow file with zero hosts results in one reader */