Convert account REST API acceptance tests to use Google Truth
Change-Id: Id5ac44804f137866acae5616c9204775ce33d513
diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/account/AccountAssert.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/account/AccountAssert.java
index 1cc9e5b..c90924d 100644
--- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/account/AccountAssert.java
+++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/account/AccountAssert.java
@@ -14,8 +14,7 @@
package com.google.gerrit.acceptance.rest.account;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static com.google.common.truth.Truth.assertThat;
import com.google.gerrit.acceptance.TestAccount;
import com.google.gerrit.extensions.common.AccountInfo;
@@ -23,8 +22,8 @@
public class AccountAssert {
public static void assertAccountInfo(TestAccount a, AccountInfo ai) {
- assertTrue(a.id.get() == ai._accountId);
- assertEquals(a.fullName, ai.name);
- assertEquals(a.email, ai.email);
+ assertThat(a.id.get()).isEqualTo(ai._accountId);
+ assertThat(a.fullName).isEqualTo(ai.name);
+ assertThat(a.email).isEqualTo(ai.email);
}
}
diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/account/CapabilitiesIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/account/CapabilitiesIT.java
index 0665d6c..5f484f4 100644
--- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/account/CapabilitiesIT.java
+++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/account/CapabilitiesIT.java
@@ -22,11 +22,8 @@
import static com.google.gerrit.common.data.GlobalCapability.PRIORITY;
import static com.google.gerrit.common.data.GlobalCapability.QUERY_LIMIT;
import static com.google.gerrit.common.data.GlobalCapability.RUN_AS;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static com.google.common.truth.Truth.assertThat;
+import static com.google.common.truth.Truth.assert_;
import com.google.gerrit.acceptance.AbstractDaemonTest;
import com.google.gerrit.acceptance.RestResponse;
@@ -41,6 +38,7 @@
import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
+import org.apache.http.HttpStatus;
import org.eclipse.jgit.errors.ConfigInvalidException;
import org.junit.Test;
@@ -53,24 +51,23 @@
grantAllCapabilities();
RestResponse r =
userSession.get("/accounts/self/capabilities");
- int code = r.getStatusCode();
- assertEquals(code, 200);
+ assertThat(r.getStatusCode()).isEqualTo(HttpStatus.SC_OK);
CapabilityInfo info = (new Gson()).fromJson(r.getReader(),
new TypeToken<CapabilityInfo>() {}.getType());
for (String c : GlobalCapability.getAllNames()) {
if (ADMINISTRATE_SERVER.equals(c)) {
- assertFalse(info.administrateServer);
+ assertThat(info.administrateServer).isFalse();
} else if (BATCH_CHANGES_LIMIT.equals(c)) {
- assertEquals(0, info.batchChangesLimit.min);
- assertEquals(DEFAULT_MAX_BATCH_CHANGES_LIMIT, info.batchChangesLimit.max);
+ assertThat(info.batchChangesLimit.min).isEqualTo((short) 0);
+ assertThat(info.batchChangesLimit.max).isEqualTo((short) DEFAULT_MAX_BATCH_CHANGES_LIMIT);
} else if (PRIORITY.equals(c)) {
- assertFalse(info.priority);
+ assertThat(info.priority).isFalse();
} else if (QUERY_LIMIT.equals(c)) {
- assertEquals(0, info.queryLimit.min);
- assertEquals(DEFAULT_MAX_QUERY_LIMIT, info.queryLimit.max);
+ assertThat(info.queryLimit.min).isEqualTo((short) 0);
+ assertThat(info.queryLimit.max).isEqualTo((short) DEFAULT_MAX_QUERY_LIMIT);
} else {
- assertTrue(String.format("capability %s was not granted", c),
- (Boolean) CapabilityInfo.class.getField(c).get(info));
+ assert_().withFailureMessage(String.format("capability %s was not granted", c))
+ .that((Boolean) CapabilityInfo.class.getField(c).get(info)).isTrue();
}
}
}
@@ -79,28 +76,28 @@
public void testCapabilitiesAdmin() throws Exception {
RestResponse r =
adminSession.get("/accounts/self/capabilities");
- int code = r.getStatusCode();
- assertEquals(code, 200);
+ assertThat(r.getStatusCode()).isEqualTo(HttpStatus.SC_OK);
CapabilityInfo info = (new Gson()).fromJson(r.getReader(),
new TypeToken<CapabilityInfo>() {}.getType());
for (String c : GlobalCapability.getAllNames()) {
if (BATCH_CHANGES_LIMIT.equals(c)) {
// It does not have default value for any user as it can override the
// 'receive.batchChangesLimit'. It needs to be granted explicitly.
- assertNull(info.batchChangesLimit);
+ assertThat(info.batchChangesLimit).isNull();
} else if (PRIORITY.equals(c)) {
- assertFalse(info.priority);
+ assertThat(info.priority).isFalse();
} else if (QUERY_LIMIT.equals(c)) {
- assertNotNull("missing queryLimit", info.queryLimit);
- assertEquals(0, info.queryLimit.min);
- assertEquals(DEFAULT_MAX_QUERY_LIMIT, info.queryLimit.max);
+ assert_().withFailureMessage("missing queryLimit")
+ .that(info.queryLimit).isNotNull();
+ assertThat(info.queryLimit.min).isEqualTo((short) 0);
+ assertThat(info.queryLimit.max).isEqualTo((short) DEFAULT_MAX_QUERY_LIMIT);
} else if (ACCESS_DATABASE.equals(c)) {
- assertFalse(info.accessDatabase);
+ assertThat(info.accessDatabase).isFalse();
} else if (RUN_AS.equals(c)) {
- assertFalse(info.runAs);
+ assertThat(info.runAs).isFalse();
} else {
- assertTrue(String.format("capability %s was not granted", c),
- (Boolean) CapabilityInfo.class.getField(c).get(info));
+ assert_().withFailureMessage(String.format("capability %s was not granted", c))
+ .that((Boolean) CapabilityInfo.class.getField(c).get(info)).isTrue();
}
}
}
diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/account/GetAccountIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/account/GetAccountIT.java
index 1e64860..63c6493 100644
--- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/account/GetAccountIT.java
+++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/account/GetAccountIT.java
@@ -14,8 +14,8 @@
package com.google.gerrit.acceptance.rest.account;
+import static com.google.common.truth.Truth.assertThat;
import static com.google.gerrit.acceptance.rest.account.AccountAssert.assertAccountInfo;
-import static org.junit.Assert.assertEquals;
import com.google.gerrit.acceptance.AbstractDaemonTest;
import com.google.gerrit.acceptance.RestResponse;
@@ -31,8 +31,8 @@
public class GetAccountIT extends AbstractDaemonTest {
@Test
public void getNonExistingAccount_NotFound() throws Exception {
- assertEquals(HttpStatus.SC_NOT_FOUND,
- adminSession.get("/accounts/non-existing").getStatusCode());
+ assertThat(adminSession.get("/accounts/non-existing").getStatusCode())
+ .isEqualTo(HttpStatus.SC_NOT_FOUND);
}
@Test
@@ -60,7 +60,7 @@
private void testGetAccount(String url, TestAccount expectedAccount)
throws IOException {
RestResponse r = adminSession.get(url);
- assertEquals(HttpStatus.SC_OK, r.getStatusCode());
+ assertThat(r.getStatusCode()).isEqualTo(HttpStatus.SC_OK);
assertAccountInfo(expectedAccount, newGson()
.fromJson(r.getReader(), AccountInfo.class));
}
diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/account/GetDiffPreferencesIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/account/GetDiffPreferencesIT.java
index bf286cf..02a94f8 100644
--- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/account/GetDiffPreferencesIT.java
+++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/account/GetDiffPreferencesIT.java
@@ -14,7 +14,7 @@
package com.google.gerrit.acceptance.rest.account;
-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.RestResponse;
@@ -28,34 +28,34 @@
@Test
public void getDiffPreferencesOfNonExistingAccount_NotFound()
throws Exception {
- assertEquals(HttpStatus.SC_NOT_FOUND,
- adminSession.get("/accounts/non-existing/preferences.diff").getStatusCode());
+ assertThat(adminSession.get("/accounts/non-existing/preferences.diff").getStatusCode())
+ .isEqualTo(HttpStatus.SC_NOT_FOUND);
}
@Test
public void getDiffPreferences() throws Exception {
RestResponse r = adminSession.get("/accounts/" + admin.email + "/preferences.diff");
- assertEquals(HttpStatus.SC_OK, r.getStatusCode());
+ assertThat(r.getStatusCode()).isEqualTo(HttpStatus.SC_OK);
DiffPreferencesInfo diffPreferences =
newGson().fromJson(r.getReader(), DiffPreferencesInfo.class);
assertDiffPreferences(new AccountDiffPreference(admin.id), diffPreferences);
}
private static void assertDiffPreferences(AccountDiffPreference expected, DiffPreferencesInfo actual) {
- assertEquals(expected.getContext(), actual.context);
- assertEquals(expected.isExpandAllComments(), toBoolean(actual.expandAllComments));
- assertEquals(expected.getIgnoreWhitespace(), actual.ignoreWhitespace);
- assertEquals(expected.isIntralineDifference(), toBoolean(actual.intralineDifference));
- assertEquals(expected.getLineLength(), actual.lineLength);
- assertEquals(expected.isManualReview(), toBoolean(actual.manualReview));
- assertEquals(expected.isRetainHeader(), toBoolean(actual.retainHeader));
- assertEquals(expected.isShowLineEndings(), toBoolean(actual.showLineEndings));
- assertEquals(expected.isShowTabs(), toBoolean(actual.showTabs));
- assertEquals(expected.isShowWhitespaceErrors(), toBoolean(actual.showWhitespaceErrors));
- assertEquals(expected.isSkipDeleted(), toBoolean(actual.skipDeleted));
- assertEquals(expected.isSkipUncommented(), toBoolean(actual.skipUncommented));
- assertEquals(expected.isSyntaxHighlighting(), toBoolean(actual.syntaxHighlighting));
- assertEquals(expected.getTabSize(), actual.tabSize);
+ assertThat(actual.context).isEqualTo(expected.getContext());
+ assertThat(toBoolean(actual.expandAllComments)).isEqualTo(expected.isExpandAllComments());
+ assertThat(actual.ignoreWhitespace).isEqualTo(expected.getIgnoreWhitespace());
+ assertThat(toBoolean(actual.intralineDifference)).isEqualTo(expected.isIntralineDifference());
+ assertThat(actual.lineLength).isEqualTo(expected.getLineLength());
+ assertThat(toBoolean(actual.manualReview)).isEqualTo(expected.isManualReview());
+ assertThat(toBoolean(actual.retainHeader)).isEqualTo(expected.isRetainHeader());
+ assertThat(toBoolean(actual.showLineEndings)).isEqualTo(expected.isShowLineEndings());
+ assertThat(toBoolean(actual.showTabs)).isEqualTo(expected.isShowTabs());
+ assertThat(toBoolean(actual.showWhitespaceErrors)).isEqualTo(expected.isShowWhitespaceErrors());
+ assertThat(toBoolean(actual.skipDeleted)).isEqualTo(expected.isSkipDeleted());
+ assertThat(toBoolean(actual.skipUncommented)).isEqualTo(expected.isSkipUncommented());
+ assertThat(toBoolean(actual.syntaxHighlighting)).isEqualTo(expected.isSyntaxHighlighting());
+ assertThat(actual.tabSize).isEqualTo(expected.getTabSize());
}
private static boolean toBoolean(Boolean b) {
diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/account/StarredChangesIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/account/StarredChangesIT.java
index c558df0..face299a 100644
--- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/account/StarredChangesIT.java
+++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/account/StarredChangesIT.java
@@ -14,15 +14,14 @@
package com.google.gerrit.acceptance.rest.account;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static com.google.common.truth.Truth.assertThat;
import com.google.gerrit.acceptance.AbstractDaemonTest;
import com.google.gerrit.acceptance.PushOneCommit.Result;
import com.google.gerrit.acceptance.RestResponse;
import com.google.gerrit.reviewdb.client.Change;
+import org.apache.http.HttpStatus;
import org.junit.Test;
import java.io.IOException;
@@ -33,26 +32,26 @@
public void starredChangeState() throws Exception {
Result c1 = createChange();
Result c2 = createChange();
- assertNull(getChange(c1.getChangeId()).starred);
- assertNull(getChange(c2.getChangeId()).starred);
+ assertThat(getChange(c1.getChangeId()).starred).isNull();
+ assertThat(getChange(c2.getChangeId()).starred).isNull();
starChange(true, c1.getPatchSetId().getParentKey());
starChange(true, c2.getPatchSetId().getParentKey());
- assertTrue(getChange(c1.getChangeId()).starred);
- assertTrue(getChange(c2.getChangeId()).starred);
+ assertThat(getChange(c1.getChangeId()).starred).isTrue();
+ assertThat(getChange(c2.getChangeId()).starred).isTrue();
starChange(false, c1.getPatchSetId().getParentKey());
starChange(false, c2.getPatchSetId().getParentKey());
- assertNull(getChange(c1.getChangeId()).starred);
- assertNull(getChange(c2.getChangeId()).starred);
+ assertThat(getChange(c1.getChangeId()).starred).isNull();
+ assertThat(getChange(c2.getChangeId()).starred).isNull();
}
private void starChange(boolean on, Change.Id id) throws IOException {
String url = "/accounts/self/starred.changes/" + id.get();
if (on) {
RestResponse r = adminSession.put(url);
- assertEquals(204, r.getStatusCode());
+ assertThat(r.getStatusCode()).isEqualTo(HttpStatus.SC_NO_CONTENT);
} else {
RestResponse r = adminSession.delete(url);
- assertEquals(204, r.getStatusCode());
+ assertThat(r.getStatusCode()).isEqualTo(HttpStatus.SC_NO_CONTENT);
}
}
}
