summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEdwin Kempin <edwin.kempin@gmail.com>2015-08-04 09:35:46 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2015-08-04 09:35:46 +0000
commit4a5deb521ddde271ad6d122284dd083b754beed4 (patch)
treec36197108400c13f15428b2c892ce992114974bf
parent766ed98f6bb2c4f441c45d9c2432bb22865fc74b (diff)
parent4d13333d608dac49357f1bbc0b5d2aa5b28eacf2 (diff)
Merge "PushOneCommit: Fix usage of assertThat" into stable-2.11
-rw-r--r--gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/PushOneCommit.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/PushOneCommit.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/PushOneCommit.java
index 6cd8031b92..67b6f518c2 100644
--- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/PushOneCommit.java
+++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/PushOneCommit.java
@@ -282,10 +282,10 @@ public class PushOneCommit {
private void assertStatus(Status expectedStatus, String expectedMessage) {
RemoteRefUpdate refUpdate = result.getRemoteUpdate(ref);
- assertThat(expectedStatus)
+ assertThat(refUpdate.getStatus())
.named(message(refUpdate))
- .isEqualTo(refUpdate.getStatus());
- assertThat(expectedMessage).isEqualTo(refUpdate.getMessage());
+ .isEqualTo(expectedStatus);
+ assertThat(refUpdate.getMessage()).isEqualTo(expectedMessage);
}
public void assertMessage(String expectedMessage) {