opendev/gerrit
Code Issues Proposed changes

NoteDbSchemaVersionManagerTest: Migrate from try-catch-fail to assertThrows

Browse Source 
Change-Id: Ie8c4f980fc4ba0b8d91c0a9a5a4662ced2e840e1
This commit is contained in:
David Pursehouse
2019-05-22 20:36:20 +09:00
parent e3c974a3d8
commit a20a890fb7
1 changed files with 9 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
javatests/com/google/gerrit/server/schema/NoteDbSchemaVersionManagerTest.java
View File

@@ -15,8 +15,8 @@
package com.google.gerrit.server.schema;
import static com.google.common.truth.Truth.assertThat;
import static com.google.common.truth.Truth.assert_;
import static com.google.gerrit.reviewdb.client.RefNames.REFS_VERSION;
import static com.google.gerrit.testing.GerritJUnit.assertThrows;
import com.google.gerrit.exceptions.StorageException;
import com.google.gerrit.server.config.AllProjectsName;
@@ -54,14 +54,10 @@ public class NoteDbSchemaVersionManagerTest {
public void readInvalid() throws Exception {
ObjectId blobId = tr.blob(" 1 2 3 ");
tr.update(REFS_VERSION, blobId);
try {
manager.read();
assert_().fail("expected StorageException");
} catch (StorageException e) {
assertThat(e)
.hasMessageThat()
.isEqualTo("invalid value in refs/meta/version blob at " + blobId.name());
}
StorageException thrown = assertThrows(StorageException.class, () -> manager.read());
assertThat(thrown)
.hasMessageThat()
.isEqualTo("invalid value in refs/meta/version blob at " + blobId.name());
}
@Test
@@ -80,13 +76,9 @@ public class NoteDbSchemaVersionManagerTest {
@Test
public void incrementWrongOldVersion() throws Exception {
tr.update(REFS_VERSION, tr.blob("123"));
try {
manager.increment(456);
assert_().fail("expected StorageException");
} catch (StorageException e) {
assertThat(e)
.hasMessageThat()
.isEqualTo("Expected old version 456 for refs/meta/version, found 123");
}
StorageException thrown = assertThrows(StorageException.class, () -> manager.increment(456));
assertThat(thrown)
.hasMessageThat()
.isEqualTo("Expected old version 456 for refs/meta/version, found 123");
}
}