mirrors/nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus synced 2026-09-18 05:54:39 +00:00
Code Issues Releases Wiki Activity

Automatically refactor some exception testing to use new JUnit rules

Browse Source 
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=176550995
This commit is contained in:
mcilwain
2017-11-21 18:56:04 -05:00
committed by jianglai
parent f041b1bac0
commit c7484b25e0
13 changed files with 199 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files
javatests/google/registry/keyring/api/ComparatorKeyringTest.java
+3 -11
View File
@@ -15,9 +15,9 @@
package google.registry.keyring.api;
import static com.google.common.truth.Truth.assertThat;
import static google.registry.testing.JUnitBackports.assertThrows;
import static google.registry.testing.LogsSubject.assertAboutLogs;
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.junit.Assert.fail;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -242,11 +242,7 @@ public class ComparatorKeyringTest {
when(secondKeyring.getRdeSigningKey()).thenReturn(keyPair);
Keyring comparatorKeyring = ComparatorKeyring.create(actualKeyring, secondKeyring);
try {
comparatorKeyring.getRdeSigningKey();
fail("Should have thrown KeyringException");
} catch (KeyringException expected) {
}
assertThrows(KeyringException.class, () -> comparatorKeyring.getRdeSigningKey());
assertAboutLogs()
.that(testLogHandler)
@@ -282,11 +278,7 @@ public class ComparatorKeyringTest {
when(secondKeyring.getRdeSigningKey()).thenThrow(new KeyringException("message"));
Keyring comparatorKeyring = ComparatorKeyring.create(actualKeyring, secondKeyring);
try {
comparatorKeyring.getRdeSigningKey();
fail("Should have thrown KeyringException");
} catch (KeyringException expected) {
}
assertThrows(KeyringException.class, () -> comparatorKeyring.getRdeSigningKey());
assertAboutLogs().that(testLogHandler).hasNoLogsAtLevel(Level.SEVERE);
}