opendev/gerrit
Code Issues Proposed changes

Upgrade Truth to 0.26

Browse Source 
Un-deprecates CollectionSubject, removing the need for many Iterable
casts. Removes the Subject.is() method, which is replaced by either
isEqualTo or isSameAs.

Change-Id: I58d725b3cc84947e98a1f9b18cc8d2d160f01c97
This commit is contained in:
Dave Borowitz
2015-04-29 14:27:31 -07:00
parent 9d8b1361ca
commit 2d726dd3d2
16 changed files with 64 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/git/AbstractPushForReview.java
View File

@@ -175,7 +175,7 @@ public abstract class AbstractPushForReview extends AbstractDaemonTest {
LabelInfo cr = ci.labels.get("Code-Review");
assertThat(cr.all).hasSize(1);
assertThat(cr.all.get(0).name).isEqualTo("Administrator");
assertThat(cr.all.get(0).value).is(1);
assertThat(cr.all.get(0).value).isEqualTo(1);
PushOneCommit push =
pushFactory.create(db, admin.getIdent(), testRepo, PushOneCommit.SUBJECT,
@@ -186,7 +186,7 @@ public abstract class AbstractPushForReview extends AbstractDaemonTest {
cr = ci.labels.get("Code-Review");
assertThat(cr.all).hasSize(1);
assertThat(cr.all.get(0).name).isEqualTo("Administrator");
assertThat(cr.all.get(0).value).is(2);
assertThat(cr.all.get(0).value).isEqualTo(2);
}
@Test
@@ -233,7 +233,7 @@ public abstract class AbstractPushForReview extends AbstractDaemonTest {
r.assertChange(Change.Status.NEW, null);
Set<String> hashtags = gApi.changes().id(r.getChangeId()).getHashtags();
assertThat((Iterable<?>)hashtags).containsExactlyElementsIn(expected);
assertThat(hashtags).containsExactlyElementsIn(expected);
// specify a single hashtag as option in new patch set
String hashtag2 = "tag2";
@@ -244,7 +244,7 @@ public abstract class AbstractPushForReview extends AbstractDaemonTest {
r.assertOkStatus();
expected = ImmutableSet.of(hashtag1, hashtag2);
hashtags = gApi.changes().id(r.getChangeId()).getHashtags();
assertThat((Iterable<?>)hashtags).containsExactlyElementsIn(expected);
assertThat(hashtags).containsExactlyElementsIn(expected);
}
@Test
@@ -263,7 +263,7 @@ public abstract class AbstractPushForReview extends AbstractDaemonTest {
r.assertChange(Change.Status.NEW, null);
Set<String> hashtags = gApi.changes().id(r.getChangeId()).getHashtags();
assertThat((Iterable<?>)hashtags).containsExactlyElementsIn(expected);
assertThat(hashtags).containsExactlyElementsIn(expected);
// specify multiple hashtags as options in new patch set
String hashtag3 = "tag3";
@@ -275,7 +275,7 @@ public abstract class AbstractPushForReview extends AbstractDaemonTest {
r.assertOkStatus();
expected = ImmutableSet.of(hashtag1, hashtag2, hashtag3, hashtag4);
hashtags = gApi.changes().id(r.getChangeId()).getHashtags();
assertThat((Iterable<?>)hashtags).containsExactlyElementsIn(expected);
assertThat(hashtags).containsExactlyElementsIn(expected);
}
@Test