Convert server acceptance tests to use Google Truth
Change-Id: I12cb75d43361f7cdc6c9350a76d5301a1c288406
diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/change/CommentsIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/change/CommentsIT.java
index f5a765f..9667c52 100644
--- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/change/CommentsIT.java
+++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/change/CommentsIT.java
@@ -14,8 +14,7 @@
package com.google.gerrit.acceptance.server.change;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static com.google.common.truth.Truth.assertThat;
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
@@ -54,7 +53,7 @@
"file1", Comment.Side.REVISION, 1, "comment 1");
addDraft(changeId, revId, comment);
Map<String, List<CommentInfo>> result = getDraftComments(changeId, revId);
- assertEquals(1, result.size());
+ assertThat(result).hasSize(1);
CommentInfo actual = Iterables.getOnlyElement(result.get(comment.path));
assertCommentInfo(comment, actual);
}
@@ -75,7 +74,7 @@
input.comments.put(comment.path, Lists.newArrayList(comment));
revision(r).review(input);
Map<String, List<CommentInfo>> result = getPublishedComments(changeId, revId);
- assertTrue(!result.isEmpty());
+ assertThat(result).isNotEmpty();
CommentInfo actual = Iterables.getOnlyElement(result.get(comment.path));
assertCommentInfo(comment, actual);
}
@@ -121,14 +120,14 @@
CommentInfo returned = addDraft(changeId, revId, comment);
deleteDraft(changeId, revId, returned.id);
Map<String, List<CommentInfo>> drafts = getDraftComments(changeId, revId);
- assertTrue(drafts.isEmpty());
+ assertThat(drafts).isEmpty();
}
private CommentInfo addDraft(String changeId, String revId,
ReviewInput.CommentInput c) throws IOException {
RestResponse r = userSession.put(
"/changes/" + changeId + "/revisions/" + revId + "/drafts", c);
- assertEquals(HttpStatus.SC_CREATED, r.getStatusCode());
+ assertThat(r.getStatusCode()).isEqualTo(HttpStatus.SC_CREATED);
return newGson().fromJson(r.getReader(), CommentInfo.class);
}
@@ -136,21 +135,21 @@
ReviewInput.CommentInput c, String uuid) throws IOException {
RestResponse r = userSession.put(
"/changes/" + changeId + "/revisions/" + revId + "/drafts/" + uuid, c);
- assertEquals(HttpStatus.SC_OK, r.getStatusCode());
+ assertThat(r.getStatusCode()).isEqualTo(HttpStatus.SC_OK);
}
private void deleteDraft(String changeId, String revId, String uuid)
throws IOException {
RestResponse r = userSession.delete(
"/changes/" + changeId + "/revisions/" + revId + "/drafts/" + uuid);
- assertEquals(HttpStatus.SC_NO_CONTENT, r.getStatusCode());
+ assertThat(r.getStatusCode()).isEqualTo(HttpStatus.SC_NO_CONTENT);
}
private Map<String, List<CommentInfo>> getPublishedComments(String changeId,
String revId) throws IOException {
RestResponse r = userSession.get(
"/changes/" + changeId + "/revisions/" + revId + "/comments/");
- assertEquals(HttpStatus.SC_OK, r.getStatusCode());
+ assertThat(r.getStatusCode()).isEqualTo(HttpStatus.SC_OK);
Type mapType = new TypeToken<Map<String, List<CommentInfo>>>() {}.getType();
return newGson().fromJson(r.getReader(), mapType);
}
@@ -159,7 +158,7 @@
String revId) throws IOException {
RestResponse r = userSession.get(
"/changes/" + changeId + "/revisions/" + revId + "/drafts/");
- assertEquals(HttpStatus.SC_OK, r.getStatusCode());
+ assertThat(r.getStatusCode()).isEqualTo(HttpStatus.SC_OK);
Type mapType = new TypeToken<Map<String, List<CommentInfo>>>() {}.getType();
return newGson().fromJson(r.getReader(), mapType);
}
@@ -168,17 +167,17 @@
String uuid) throws IOException {
RestResponse r = userSession.get(
"/changes/" + changeId + "/revisions/" + revId + "/drafts/" + uuid);
- assertEquals(HttpStatus.SC_OK, r.getStatusCode());
+ assertThat(r.getStatusCode()).isEqualTo(HttpStatus.SC_OK);
return newGson().fromJson(r.getReader(), CommentInfo.class);
}
private static void assertCommentInfo(ReviewInput.CommentInput expected,
CommentInfo actual) {
- assertEquals(expected.line, actual.line);
- assertEquals(expected.message, actual.message);
- assertEquals(expected.inReplyTo, actual.inReplyTo);
+ assertThat(actual.line).isEqualTo(expected.line);
+ assertThat(actual.message).isEqualTo(expected.message);
+ assertThat(actual.inReplyTo).isEqualTo(expected.inReplyTo);
if (actual.side == null) {
- assertEquals(expected.side, Comment.Side.REVISION);
+ assertThat(Comment.Side.REVISION).isEqualTo(expected.side);
}
}
diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/change/GetRelatedIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/change/GetRelatedIT.java
index b3bbc57..9693fb3 100644
--- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/change/GetRelatedIT.java
+++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/change/GetRelatedIT.java
@@ -14,10 +14,10 @@
package com.google.gerrit.acceptance.server.change;
+import static com.google.common.truth.Truth.assertThat;
import static com.google.gerrit.acceptance.GitUtil.add;
import static com.google.gerrit.acceptance.GitUtil.createCommit;
import static com.google.gerrit.acceptance.GitUtil.pushHead;
-import static org.junit.Assert.assertEquals;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Iterables;
@@ -51,7 +51,7 @@
PushOneCommit push = pushFactory.create(db, admin.getIdent());
PatchSet.Id ps = push.to(git, "refs/for/master").getPatchSetId();
List<ChangeAndCommit> related = getRelated(ps);
- assertEquals(0, related.size());
+ assertThat(related).isEmpty();
}
@Test
@@ -64,9 +64,11 @@
for (Commit c : ImmutableList.of(c2, c1)) {
List<ChangeAndCommit> related = getRelated(getPatchSetId(c));
- assertEquals(2, related.size());
- assertEquals("related to " + c.getChangeId(), c2.getChangeId(), related.get(0).changeId);
- assertEquals("related to " + c.getChangeId(), c1.getChangeId(), related.get(1).changeId);
+ assertThat(related).hasSize(2);
+ assertThat(related.get(0).changeId)
+ .named("related to " + c.getChangeId()).isEqualTo(c2.getChangeId());
+ assertThat(related.get(1).changeId)
+ .named("related to " + c.getChangeId()).isEqualTo(c1.getChangeId());
}
}
@@ -90,16 +92,20 @@
for (PatchSet.Id ps : ImmutableList.of(c2ps2, c1ps2)) {
List<ChangeAndCommit> related = getRelated(ps);
- assertEquals(2, related.size());
- assertEquals("related to " + ps, c1.getChangeId(), related.get(0).changeId);
- assertEquals("related to " + ps, c2.getChangeId(), related.get(1).changeId);
+ assertThat(related).hasSize(2);
+ assertThat(related.get(0).changeId).named("related to " + ps).isEqualTo(
+ c1.getChangeId());
+ assertThat(related.get(1).changeId).named("related to " + ps).isEqualTo(
+ c2.getChangeId());
}
for (PatchSet.Id ps : ImmutableList.of(c2ps1, c1ps1)) {
List<ChangeAndCommit> related = getRelated(ps);
- assertEquals(2, related.size());
- assertEquals("related to " + ps, c2.getChangeId(), related.get(0).changeId);
- assertEquals("related to " + ps, c1.getChangeId(), related.get(1).changeId);
+ assertThat(related).hasSize(2);
+ assertThat(related.get(0).changeId).named("related to " + ps).isEqualTo(
+ c2.getChangeId());
+ assertThat(related.get(1).changeId).named("related to " + ps).isEqualTo(
+ c1.getChangeId());
}
}
@@ -127,18 +133,24 @@
for (PatchSet.Id ps : ImmutableList.of(c3ps1, c2ps2, c1ps2)) {
List<ChangeAndCommit> related = getRelated(ps);
- assertEquals(3, related.size());
- assertEquals("related to " + ps, c3.getChangeId(), related.get(0).changeId);
- assertEquals("related to " + ps, c1.getChangeId(), related.get(1).changeId);
- assertEquals("related to " + ps, c2.getChangeId(), related.get(2).changeId);
+ assertThat(related).hasSize(3);
+ assertThat(related.get(0).changeId).named("related to " + ps).isEqualTo(
+ c3.getChangeId());
+ assertThat(related.get(1).changeId).named("related to " + ps).isEqualTo(
+ c1.getChangeId());
+ assertThat(related.get(2).changeId).named("related to " + ps).isEqualTo(
+ c2.getChangeId());
}
for (PatchSet.Id ps : ImmutableList.of(c2ps1, c1ps1)) {
List<ChangeAndCommit> related = getRelated(ps);
- assertEquals(3, related.size());
- assertEquals("related to " + ps, c3.getChangeId(), related.get(0).changeId);
- assertEquals("related to " + ps, c2.getChangeId(), related.get(1).changeId);
- assertEquals("related to " + ps, c1.getChangeId(), related.get(2).changeId);
+ assertThat(related).hasSize(3);
+ assertThat(related.get(0).changeId).named("related to " + ps).isEqualTo(
+ c3.getChangeId());
+ assertThat(related.get(1).changeId).named("related to " + ps).isEqualTo(
+ c2.getChangeId());
+ assertThat(related.get(2).changeId).named("related to " + ps).isEqualTo(
+ c1.getChangeId());
}
}
@@ -157,12 +169,17 @@
String editRev = editUtil.byChange(ch2).get().getRevision().get();
List<ChangeAndCommit> related = getRelated(ch2.getId(), 0);
- assertEquals(3, related.size());
- assertEquals("related to " + c2.getChangeId(), c3.getChangeId(), related.get(0).changeId);
- assertEquals("related to " + c2.getChangeId(), c2.getChangeId(), related.get(1).changeId);
- assertEquals("has edit revision number", 0, related.get(1)._revisionNumber.intValue());
- assertEquals("has edit revision " + editRev, editRev, related.get(1).commit.commit);
- assertEquals("related to " + c2.getChangeId(), c1.getChangeId(), related.get(2).changeId);
+ assertThat(related).hasSize(3);
+ assertThat(related.get(0).changeId).named("related to " + c2.getChangeId())
+ .isEqualTo(c3.getChangeId());
+ assertThat(related.get(1).changeId).named("related to " + c2.getChangeId())
+ .isEqualTo(c2.getChangeId());
+ assertThat(related.get(1)._revisionNumber.intValue()).named(
+ "has edit revision number").isEqualTo(0);
+ assertThat(related.get(1).commit.commit).named(
+ "has edit revision " + editRev).isEqualTo(editRev);
+ assertThat(related.get(2).changeId).named("related to " + c2.getChangeId())
+ .isEqualTo(c1.getChangeId());
}
private List<ChangeAndCommit> getRelated(PatchSet.Id ps) throws IOException {
diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/change/PatchListCacheIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/change/PatchListCacheIT.java
index 52aa84e..d598b06 100644
--- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/change/PatchListCacheIT.java
+++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/change/PatchListCacheIT.java
@@ -14,13 +14,12 @@
package com.google.gerrit.acceptance.server.change;
+import static com.google.common.truth.Truth.assertThat;
import static com.google.gerrit.acceptance.GitUtil.add;
import static com.google.gerrit.acceptance.GitUtil.amendCommit;
import static com.google.gerrit.acceptance.GitUtil.createCommit;
import static com.google.gerrit.acceptance.GitUtil.pushHead;
import static com.google.gerrit.acceptance.GitUtil.rm;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
import com.google.gerrit.acceptance.AbstractDaemonTest;
import com.google.gerrit.acceptance.GitUtil.Commit;
@@ -68,7 +67,7 @@
// Compare Change 1,1 with Base (+FILE_A, -FILE_D)
List<PatchListEntry> entries = getCurrentPatches(c.getChangeId());
- assertEquals(3, entries.size());
+ assertThat(entries).hasSize(3);
assertAdded(Patch.COMMIT_MSG, entries.get(0));
assertAdded(FILE_A, entries.get(1));
assertDeleted(FILE_D, entries.get(2));
@@ -80,7 +79,7 @@
entries = getCurrentPatches(c.getChangeId());
// Compare Change 1,2 with Base (+FILE_A, +FILE_B, -FILE_D)
- assertEquals(4, entries.size());
+ assertThat(entries).hasSize(4);
assertAdded(Patch.COMMIT_MSG, entries.get(0));
assertAdded(FILE_A, entries.get(1));
assertAdded(FILE_B, entries.get(2));
@@ -99,7 +98,7 @@
Commit c = createCommit(git, admin.getIdent(), SUBJECT_2);
pushHead(git, "refs/for/master", false);
List<PatchListEntry> entries = getCurrentPatches(c.getChangeId());
- assertEquals(3, entries.size());
+ assertThat(entries).hasSize(3);
assertAdded(Patch.COMMIT_MSG, entries.get(0));
assertAdded(FILE_A, entries.get(1));
assertDeleted(FILE_D, entries.get(2));
@@ -116,7 +115,7 @@
// Compare Change 1,2 with Base (+FILE_A, -FILE_D))
entries = getCurrentPatches(c.getChangeId());
- assertEquals(3, entries.size());
+ assertThat(entries).hasSize(3);
assertAdded(Patch.COMMIT_MSG, entries.get(0));
assertAdded(FILE_A, entries.get(1));
assertDeleted(FILE_D, entries.get(2));
@@ -145,7 +144,7 @@
// Compare Change 1,1 with Change 1,2 (+FILE_B)
List<PatchListEntry> entries = getPatches(a, b);
- assertEquals(2, entries.size());
+ assertThat(entries).hasSize(2);
assertModified(Patch.COMMIT_MSG, entries.get(0));
assertAdded(FILE_B, entries.get(1));
}
@@ -178,29 +177,29 @@
// Compare Change 1,1 with Change 1,2 (+FILE_C)
List<PatchListEntry> entries = getPatches(a, b);
- assertEquals(2, entries.size());
+ assertThat(entries).hasSize(2);
assertModified(Patch.COMMIT_MSG, entries.get(0));
assertAdded(FILE_C, entries.get(1));
}
private static void assertAdded(String expectedNewName, PatchListEntry e) {
assertName(expectedNewName, e);
- assertEquals(ChangeType.ADDED, e.getChangeType());
+ assertThat(e.getChangeType()).isEqualTo(ChangeType.ADDED);
}
private static void assertModified(String expectedNewName, PatchListEntry e) {
assertName(expectedNewName, e);
- assertEquals(ChangeType.MODIFIED, e.getChangeType());
+ assertThat(e.getChangeType()).isEqualTo(ChangeType.MODIFIED);
}
private static void assertDeleted(String expectedNewName, PatchListEntry e) {
assertName(expectedNewName, e);
- assertEquals(ChangeType.DELETED, e.getChangeType());
+ assertThat(e.getChangeType()).isEqualTo(ChangeType.DELETED);
}
private static void assertName(String expectedNewName, PatchListEntry e) {
- assertEquals(expectedNewName, e.getNewName());
- assertNull(e.getOldName());
+ assertThat(e.getNewName()).isEqualTo(expectedNewName);
+ assertThat(e.getOldName()).isNull();
}
private List<PatchListEntry> getCurrentPatches(String changeId)
diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/project/CustomLabelIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/project/CustomLabelIT.java
index f1d54cb..cd76c12 100644
--- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/project/CustomLabelIT.java
+++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/project/CustomLabelIT.java
@@ -14,13 +14,10 @@
package com.google.gerrit.acceptance.server.project;
+import static com.google.common.truth.Truth.assertThat;
import static com.google.gerrit.server.group.SystemGroupBackend.ANONYMOUS_USERS;
import static com.google.gerrit.server.project.Util.category;
import static com.google.gerrit.server.project.Util.value;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
import com.google.gerrit.acceptance.AbstractDaemonTest;
import com.google.gerrit.acceptance.NoHttpd;
@@ -65,9 +62,9 @@
revision(r).review(new ReviewInput().label(Q.getName(), -1));
ChangeInfo c = get(r.getChangeId());
LabelInfo q = c.labels.get(Q.getName());
- assertEquals(1, q.all.size());
- assertNotNull(q.rejected);
- assertNull(q.blocking);
+ assertThat(q.all).hasSize(1);
+ assertThat(q.rejected).isNotNull();
+ assertThat(q.blocking).isNull();
}
@Test
@@ -78,9 +75,9 @@
revision(r).review(new ReviewInput().label(Q.getName(), -1));
ChangeInfo c = get(r.getChangeId());
LabelInfo q = c.labels.get(Q.getName());
- assertEquals(1, q.all.size());
- assertNotNull(q.rejected);
- assertNull(q.blocking);
+ assertThat(q.all).hasSize(1);
+ assertThat(q.rejected).isNotNull();
+ assertThat(q.blocking).isNull();
}
@Test
@@ -91,9 +88,9 @@
revision(r).review(new ReviewInput().label(Q.getName(), -1));
ChangeInfo c = get(r.getChangeId());
LabelInfo q = c.labels.get(Q.getName());
- assertEquals(1, q.all.size());
- assertNotNull(q.rejected);
- assertNull(q.blocking);
+ assertThat(q.all).hasSize(1);
+ assertThat(q.rejected).isNotNull();
+ assertThat(q.blocking).isNull();
}
@Test
@@ -104,10 +101,10 @@
revision(r).review(new ReviewInput().label(Q.getName(), -1));
ChangeInfo c = get(r.getChangeId());
LabelInfo q = c.labels.get(Q.getName());
- assertEquals(1, q.all.size());
- assertNull(q.disliked);
- assertNotNull(q.rejected);
- assertTrue(q.blocking);
+ assertThat(q.all).hasSize(1);
+ assertThat(q.disliked).isNull();
+ assertThat(q.rejected).isNotNull();
+ assertThat(q.blocking).isTrue();
}
@Test
@@ -117,10 +114,10 @@
revision(r).review(new ReviewInput().label(Q.getName(), -1));
ChangeInfo c = get(r.getChangeId());
LabelInfo q = c.labels.get(Q.getName());
- assertEquals(1, q.all.size());
- assertNull(q.disliked);
- assertNotNull(q.rejected);
- assertTrue(q.blocking);
+ assertThat(q.all).hasSize(1);
+ assertThat(q.disliked).isNull();
+ assertThat(q.rejected).isNotNull();
+ assertThat(q.blocking).isTrue();
}
private void saveLabelConfig() throws Exception {
diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/project/LabelTypeIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/project/LabelTypeIT.java
index 0249621..e9e3ffb 100644
--- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/project/LabelTypeIT.java
+++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/project/LabelTypeIT.java
@@ -15,7 +15,7 @@
package com.google.gerrit.acceptance.server.project;
import static com.google.common.base.Preconditions.checkNotNull;
-import static org.junit.Assert.assertEquals;
+import static com.google.common.truth.Truth.assertThat;
import com.google.gerrit.acceptance.AbstractDaemonTest;
import com.google.gerrit.acceptance.NoHttpd;
@@ -288,8 +288,8 @@
revision(r).submit();
Repository repo = repoManager.openRepository(project);
try {
- assertEquals(r.getCommitId(),
- repo.getRef("refs/heads/master").getObjectId());
+ assertThat(repo.getRef("refs/heads/master").getObjectId()).isEqualTo(
+ r.getCommitId());
} finally {
repo.close();
}
@@ -309,9 +309,9 @@
private void doAssertApproval(int expected, ChangeInfo c) {
LabelInfo cr = c.labels.get("Code-Review");
- assertEquals(-1, (int) cr.defaultValue);
- assertEquals(1, cr.all.size());
- assertEquals("Administrator", cr.all.get(0).name);
- assertEquals(expected, cr.all.get(0).value.intValue());
+ assertThat((int) cr.defaultValue).isEqualTo(-1);
+ assertThat(cr.all).hasSize(1);
+ assertThat(cr.all.get(0).name).isEqualTo("Administrator");
+ assertThat(cr.all.get(0).value.intValue()).isEqualTo(expected);
}
}
