zydronium/google-nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus.git synced 2025-05-30 17:24: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

6
javatests/google/registry/request/lock/LockHandlerImplTest.java
View file

@ -15,7 +15,7 @@
package google.registry.request.lock;
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.times;
import static org.mockito.Mockito.verify;
@ -97,7 +97,7 @@ public final class LockHandlerImplTest {
Lock lock = mock(Lock.class);
Exception expectedException = new RuntimeException("test");
RuntimeException exception =
expectThrows(
assertThrows(
RuntimeException.class,
() -> executeWithLocks(new ThrowingCallable(expectedException), lock));
assertThat(exception).isSameAs(expectedException);
@ -109,7 +109,7 @@ public final class LockHandlerImplTest {
Lock lock = mock(Lock.class);
Exception expectedException = new Exception("test");
RuntimeException exception =
expectThrows(
assertThrows(
RuntimeException.class,
() -> executeWithLocks(new ThrowingCallable(expectedException), lock));
assertThat(exception).hasCauseThat().isSameAs(expectedException);