Merge "Migrate off the overload of StandardSubjectBuilder.fail(...) that accepts a message."
This commit is contained in:
@@ -17,7 +17,6 @@ package com.google.gerrit.acceptance.rest.change;
|
|||||||
import static com.google.common.collect.Iterables.getOnlyElement;
|
import static com.google.common.collect.Iterables.getOnlyElement;
|
||||||
import static com.google.common.truth.Truth.assertThat;
|
import static com.google.common.truth.Truth.assertThat;
|
||||||
import static com.google.common.truth.Truth.assertWithMessage;
|
import static com.google.common.truth.Truth.assertWithMessage;
|
||||||
import static com.google.common.truth.Truth.assert_;
|
|
||||||
import static com.google.common.truth.Truth8.assertThat;
|
import static com.google.common.truth.Truth8.assertThat;
|
||||||
import static com.google.common.truth.TruthJUnit.assume;
|
import static com.google.common.truth.TruthJUnit.assume;
|
||||||
import static com.google.gerrit.acceptance.testsuite.project.TestProjectUpdate.allow;
|
import static com.google.gerrit.acceptance.testsuite.project.TestProjectUpdate.allow;
|
||||||
@@ -266,7 +265,7 @@ public abstract class AbstractSubmit extends AbstractDaemonTest {
|
|||||||
break;
|
break;
|
||||||
case CHERRY_PICK:
|
case CHERRY_PICK:
|
||||||
default:
|
default:
|
||||||
assert_().fail("Should not reach here.");
|
assertWithMessage("Should not reach here.").fail();
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user