opendev/gerrit
Code Issues Proposed changes

Fix deprecation warnings from new Truth version

Browse Source 
Change-Id: Id0f976b2c0a4291eb946671a726f0775bc0c2487
This commit is contained in:
Dave Borowitz
2015-12-25 10:26:42 -08:00
parent 684ecf9ed7
commit 267a1bd435
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
gerrit-server/src/test/java/com/google/gerrit/server/notedb/ChangeNotesTest.java
View File

@@ -904,7 +904,7 @@ public class ChangeNotesTest extends AbstractChangeNotesTest {
update.upsertComment(commentForPS); update.upsertComment(commentForPS);
update.commit(); update.commit();
assertThat(newNotes(c).getComments()).containsExactly( assertThat(newNotes(c).getComments()).containsExactlyEntriesIn(
ImmutableMultimap.of( ImmutableMultimap.of(
new RevId(rev1), commentForBase, new RevId(rev1), commentForBase,
new RevId(rev2), commentForPS)); new RevId(rev2), commentForPS));
@@ -939,7 +939,7 @@ public class ChangeNotesTest extends AbstractChangeNotesTest {
update.upsertComment(comment2); update.upsertComment(comment2);
update.commit(); update.commit();
assertThat(newNotes(c).getComments()).containsExactly( assertThat(newNotes(c).getComments()).containsExactlyEntriesIn(
ImmutableMultimap.of( ImmutableMultimap.of(
new RevId(rev), comment1, new RevId(rev), comment1,
new RevId(rev), comment2)).inOrder(); new RevId(rev), comment2)).inOrder();
@@ -974,7 +974,7 @@ public class ChangeNotesTest extends AbstractChangeNotesTest {
update.upsertComment(comment2); update.upsertComment(comment2);
update.commit(); update.commit();
assertThat(newNotes(c).getComments()).containsExactly( assertThat(newNotes(c).getComments()).containsExactlyEntriesIn(
ImmutableMultimap.of( ImmutableMultimap.of(
new RevId(rev), comment1, new RevId(rev), comment1,
new RevId(rev), comment2)).inOrder(); new RevId(rev), comment2)).inOrder();
@@ -1012,7 +1012,7 @@ public class ChangeNotesTest extends AbstractChangeNotesTest {
update.upsertComment(comment2); update.upsertComment(comment2);
update.commit(); update.commit();
assertThat(newNotes(c).getComments()).containsExactly( assertThat(newNotes(c).getComments()).containsExactlyEntriesIn(
ImmutableMultimap.of( ImmutableMultimap.of(
new RevId(rev1), comment1, new RevId(rev1), comment1,
new RevId(rev2), comment2)); new RevId(rev2), comment2));
@@ -1038,7 +1038,7 @@ public class ChangeNotesTest extends AbstractChangeNotesTest {
update.commit(); update.commit();
ChangeNotes notes = newNotes(c); ChangeNotes notes = newNotes(c);
assertThat(notes.getDraftComments(otherUserId)).containsExactly( assertThat(notes.getDraftComments(otherUserId)).containsExactlyEntriesIn(
ImmutableMultimap.of(new RevId(rev), comment1)); ImmutableMultimap.of(new RevId(rev), comment1));
assertThat(notes.getComments()).isEmpty(); assertThat(notes.getComments()).isEmpty();
@@ -1050,7 +1050,7 @@ public class ChangeNotesTest extends AbstractChangeNotesTest {
notes = newNotes(c); notes = newNotes(c);
assertThat(notes.getDraftComments(otherUserId)).isEmpty(); assertThat(notes.getDraftComments(otherUserId)).isEmpty();
assertThat(notes.getComments()).containsExactly( assertThat(notes.getComments()).containsExactlyEntriesIn(
ImmutableMultimap.of(new RevId(rev), comment1)); ImmutableMultimap.of(new RevId(rev), comment1));
} }
@@ -1082,7 +1082,7 @@ public class ChangeNotesTest extends AbstractChangeNotesTest {
update.commit(); update.commit();
ChangeNotes notes = newNotes(c); ChangeNotes notes = newNotes(c);
assertThat(notes.getDraftComments(otherUserId)).containsExactly( assertThat(notes.getDraftComments(otherUserId)).containsExactlyEntriesIn(
ImmutableMultimap.of( ImmutableMultimap.of(
new RevId(rev), comment1, new RevId(rev), comment1,
new RevId(rev), comment2)).inOrder(); new RevId(rev), comment2)).inOrder();
@@ -1096,9 +1096,9 @@ public class ChangeNotesTest extends AbstractChangeNotesTest {
update.commit(); update.commit();
notes = newNotes(c); notes = newNotes(c);
assertThat(notes.getDraftComments(otherUserId)).containsExactly( assertThat(notes.getDraftComments(otherUserId)).containsExactlyEntriesIn(
ImmutableMultimap.of(new RevId(rev), comment2)); ImmutableMultimap.of(new RevId(rev), comment2));
assertThat(notes.getComments()).containsExactly( assertThat(notes.getComments()).containsExactlyEntriesIn(
ImmutableMultimap.of(new RevId(rev), comment1)); ImmutableMultimap.of(new RevId(rev), comment1));
} }
@@ -1131,7 +1131,7 @@ public class ChangeNotesTest extends AbstractChangeNotesTest {
update.commit(); update.commit();
ChangeNotes notes = newNotes(c); ChangeNotes notes = newNotes(c);
assertThat(notes.getDraftComments(otherUserId)).containsExactly( assertThat(notes.getDraftComments(otherUserId)).containsExactlyEntriesIn(
ImmutableMultimap.of( ImmutableMultimap.of(
new RevId(rev1), baseComment, new RevId(rev1), baseComment,
new RevId(rev2), psComment)); new RevId(rev2), psComment));
@@ -1149,7 +1149,7 @@ public class ChangeNotesTest extends AbstractChangeNotesTest {
notes = newNotes(c); notes = newNotes(c);
assertThat(notes.getDraftComments(otherUserId)).isEmpty(); assertThat(notes.getDraftComments(otherUserId)).isEmpty();
assertThat(notes.getComments()).containsExactly( assertThat(notes.getComments()).containsExactlyEntriesIn(
ImmutableMultimap.of( ImmutableMultimap.of(
new RevId(rev1), baseComment, new RevId(rev1), baseComment,
new RevId(rev2), psComment)); new RevId(rev2), psComment));
@@ -1259,7 +1259,7 @@ public class ChangeNotesTest extends AbstractChangeNotesTest {
update.upsertComment(comment); update.upsertComment(comment);
update.commit(); update.commit();
assertThat(newNotes(c).getComments()).containsExactly( assertThat(newNotes(c).getComments()).containsExactlyEntriesIn(
ImmutableMultimap.of(new RevId(rev), comment)); ImmutableMultimap.of(new RevId(rev), comment));
} }
@@ -1280,7 +1280,7 @@ public class ChangeNotesTest extends AbstractChangeNotesTest {
update.upsertComment(comment); update.upsertComment(comment);
update.commit(); update.commit();
assertThat(newNotes(c).getComments()).containsExactly( assertThat(newNotes(c).getComments()).containsExactlyEntriesIn(
ImmutableMultimap.of(new RevId(rev), comment)); ImmutableMultimap.of(new RevId(rev), comment));
} }